| commit | 07301eaa766efac7818eac7a4a6db0d0c3948d66 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 22:39:48 +0000 (20 14:39 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 22:39:48 +0000 (20 14:39 -0800) | ||
| tree | e8d278300591713f61fbdcc5213dedb7d742c0f2 | treesnapshot (tar.gz zip) |
| parent | bd0d1916de221425fc22b69940ff71b0ce6aad9c | commitdiff |
| parent | c1ceea1d273925fe6ecb0824e7ea08eb6e6e2635 | commitdiff |
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
* 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 | blobhistory |
| transport.c | diff1 | diff2 | blobhistory |