undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

push: support pushing HEAD to real branch name

Browse Source 
This teaches "push <remote> HEAD" to resolve HEAD on the local
side to its real branch name, e.g. master, and then act as if
the real branch name was specified. So we have a shorthand for
pushing the current branch. Besides HEAD, no other symbolic ref
is resolved.

Thanks to Daniel Barkalow <barkalow@iabervon.org> for suggesting
this implementation, which is much simpler than the
implementation proposed before.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Steffen Prohaska 2007-11-11 15:35:07 +01:00 committed by Junio C Hamano
parent ea55960518
commit 47d996a20c
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin-push.c
View File

@ -44,6 +44,15 @@ static void set_refspecs(const char **refs, int nr)
strcat(tag, refs[i]); strcat(tag, refs[i]);
ref = tag; ref = tag;
} }
if (!strcmp("HEAD", ref)) {
unsigned char sha1_dummy[20];
ref = resolve_ref(ref, sha1_dummy, 1, NULL);
if (!ref)
die("HEAD cannot be resolved.");
if (prefixcmp(ref, "refs/heads/"))
die("HEAD cannot be resolved to branch.");
ref = xstrdup(ref + 11);
}
add_refspec(ref); add_refspec(ref);
} }
} }

17
t/t5516-fetch-push.sh
View File

@ -244,6 +244,23 @@ test_expect_success 'push with colon-less refspec (4)' '
' '
test_expect_success 'push with HEAD' '
mk_test heads/master &&
git checkout master &&
git push testrepo HEAD &&
check_push_result $the_commit heads/master
'
test_expect_success 'push with HEAD nonexisting at remote' '
mk_test heads/master &&
git checkout -b local master &&
git push testrepo HEAD &&
check_push_result $the_commit heads/local
'
test_expect_success 'push with dry-run' ' test_expect_success 'push with dry-run' '
mk_test heads/master && mk_test heads/master &&