diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:39:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:39:48 -0800 |
| commit | 07301eaa766efac7818eac7a4a6db0d0c3948d66 (patch) | |
| tree | e8d278300591713f61fbdcc5213dedb7d742c0f2 /t/t6032-merge-large-rename.sh | |
| parent | Merge branch 'bk/fix-relative-gitdir-file' (diff) | |
| parent | transport-helper.c::push_refs(): emit "no refs" error message (diff) | |
| download | tgif-07301eaa766efac7818eac7a4a6db0d0c3948d66.tar.xz | |
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
Diffstat (limited to 't/t6032-merge-large-rename.sh')
0 files changed, 0 insertions, 0 deletions