diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-04-10 19:07:11 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-11 09:04:39 -0700 |
| commit | 5034fdea3017304fa37e50b3bd40c392503ebfd2 (patch) | |
| tree | 725f4871b7dc9314e5d74ee4896e1f78b54fc171 | |
| parent | c096955c5bb8e20186cc7c07d4d12b77ddcd01c6 (diff) | |
| download | git-5034fdea3017304fa37e50b3bd40c392503ebfd2.tar.gz git-5034fdea3017304fa37e50b3bd40c392503ebfd2.tar.xz | |
transport-helper: improve push messages
If there's already a remote-helper tracking ref, we can fetch the SHA-1
to report proper push messages (as opposed to always reporting
[new branch]).
The remote-helper currently can specify the old SHA-1 to avoid this
problem, but there's no point in forcing all remote-helpers to be aware
of git commit ids; they should be able to be agnostic of them.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t5801-remote-helpers.sh | 14 | ||||
| -rw-r--r-- | transport-helper.c | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index 8b2cb68ec..ff5fb852f 100755 --- a/t/t5801-remote-helpers.sh +++ b/t/t5801-remote-helpers.sh @@ -186,4 +186,18 @@ test_expect_success 'proper failure checks for pushing' ' ) ' +test_expect_success 'push messages' ' + (cd local && + git checkout -b new_branch master && + echo new >>file && + git commit -a -m new && + git push origin new_branch && + git fetch origin && + echo new >>file && + git commit -a -m new && + git push origin new_branch 2> msg && + ! grep "\[new branch\]" msg + ) +' + test_done diff --git a/transport-helper.c b/transport-helper.c index 3fc43b97f..56207eae2 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -801,6 +801,7 @@ static int push_refs_with_export(struct transport *transport, if (private && !get_sha1(private, sha1)) { strbuf_addf(&buf, "^%s", private); string_list_append(&revlist_args, strbuf_detach(&buf, NULL)); + hashcpy(ref->old_sha1, sha1); } free(private); |