development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-03 23:29:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mh/deref-symref-over-helper-transport' into maint

Browse source 
"git fetch" over a remote-helper that cannot respond to "list"
command could not fetch from a symbolic reference e.g. HEAD.

* mh/deref-symref-over-helper-transport:
  transport-helper: do not request symbolic refs to remote helpers
This commit is contained in:
Junio C Hamano 2015-03-05 13:12:57 -08:00
parent aaa90f5f07 33cae5428a
commit 6db0497e1a
3 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
git-remote-testgit.sh
View file

@ -1,7 +1,13 @@
#!/bin/sh
# Copyright (c) 2012 Felipe Contreras
alias=$1
# The first argument can be a url when the fetch/push command was a url
# instead of a configured remote. In this case, use a generic alias.
if test "$1" = "testgit::$2"; then
alias=_
else
alias=$1
fi
url=$2
dir="$GIT_DIR/testgit/$alias"

24
t/t5801-remote-helpers.sh
View file

@ -281,4 +281,28 @@ test_expect_success 'push messages' '
)
'
test_expect_success 'fetch HEAD' '
(cd server &&
git checkout master &&
echo more >>file &&
git commit -a -m more
) &&
(cd local &&
git fetch origin HEAD
) &&
compare_refs server HEAD local FETCH_HEAD
'
test_expect_success 'fetch url' '
(cd server &&
git checkout master &&
echo more >>file &&
git commit -a -m more
) &&
(cd local &&
git fetch "testgit::${PWD}/../server"
) &&
compare_refs server HEAD local FETCH_HEAD
'
test_done

13
transport-helper.c
View file

@ -355,7 +355,8 @@ static int fetch_with_fetch(struct transport *transport,
continue;
strbuf_addf(&buf, "fetch %s %s\n",
sha1_to_hex(posn->old_sha1), posn->name);
sha1_to_hex(posn->old_sha1),
posn->symref ? posn->symref : posn->name);
}
strbuf_addch(&buf, '\n');
@ -453,7 +454,8 @@ static int fetch_with_import(struct transport *transport,
if (posn->status & REF_STATUS_UPTODATE)
continue;
strbuf_addf(&buf, "import %s\n", posn->name);
strbuf_addf(&buf, "import %s\n",
posn->symref ? posn->symref : posn->name);
sendline(data, &buf);
strbuf_reset(&buf);
}
@ -486,14 +488,15 @@ static int fetch_with_import(struct transport *transport,
* fast-forward or this is a forced update.
*/
for (i = 0; i < nr_heads; i++) {
char *private;
char *private, *name;
posn = to_fetch[i];
if (posn->status & REF_STATUS_UPTODATE)
continue;
name = posn->symref ? posn->symref : posn->name;
if (data->refspecs)
private = apply_refspecs(data->refspecs, data->refspec_nr, posn->name);
private = apply_refspecs(data->refspecs, data->refspec_nr, name);
else
private = xstrdup(posn->name);
private = xstrdup(name);
if (private) {
read_ref(private, posn->old_sha1);
free(private);