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>
Felipe Contreras committed
Apr 10, 2013 at 19:07 UTC
5034fdea3017304fa37e50b3bd40c392503ebfd2
2 files changed
+15
t/t5801-remote-helpers.sh
+14
@@ -186,4 +186,18 @@ test_expect_success 'proper failure checks for pushing' '
186
)
187
'
188
189
+test_expect_success 'push messages' '
190
+ (cd local &&
191
+ git checkout -b new_branch master &&
192
+ echo new >>file &&
193
+ git commit -a -m new &&
194
+ git push origin new_branch &&
195
+ git fetch origin &&
196
+ echo new >>file &&
197
+ git commit -a -m new &&
198
+ git push origin new_branch 2> msg &&
199
+ ! grep "\[new branch\]" msg
200
+ )
201
+'
202
+
203
test_done
transport-helper.c
+1
@@ -801,6 +801,7 @@ static int push_refs_with_export(struct transport *transport,
801
if (private && !get_sha1(private, sha1)) {
802
strbuf_addf(&buf, "^%s", private);
803
string_list_append(&revlist_args, strbuf_detach(&buf, NULL));
804
+ hashcpy(ref->old_sha1, sha1);
805
}
806
free(private);
807