git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bd0d191 c1ceea1)
Merge branch 'tr/http-push-ref-status'
authorJunio C Hamano <redacted>
Wed, 20 Jan 2010 22:39:48 +0000 (14:39 -0800)
committerJunio C Hamano <redacted>
Wed, 20 Jan 2010 22:39:48 +0000 (14:39 -0800)
commit07301eaa766efac7818eac7a4a6db0d0c3948d66
treee8d278300591713f61fbdcc5213dedb7d742c0f2tree | snapshot
parentbd0d1916de221425fc22b69940ff71b0ce6aad9ccommit | diff
parentc1ceea1d273925fe6ecb0824e7ea08eb6e6e2635commit | diff
Merge branch 'tr/http-push-ref-status'

* tr/http-push-ref-status:
  transport-helper.c::push_refs(): emit "no refs" error message
  transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed
  transport.c::transport_push(): make ref status affect return value
  refactor ref status logic for pushing
  t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs
  t5541-http-push.sh: add tests for non-fast-forward pushes

Conflicts:
transport-helper.c
transport-helper.c diff1 | diff2 | blob | history
transport.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT