diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-09-10 23:39:23 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-12 08:40:00 +0400 |
| commit | b52d00aedeb94f12a16afcef1bb33c989f9b4105 (patch) | |
| tree | 9a3e5ec235ecdc84adc7d9effbf5aead7cb18140 /t/t5505-remote.sh | |
| parent | 1822b86a515af708e2259bae2b6a1f2052a2d3aa (diff) | |
remote: only update remote-tracking branch if updating refspec
'git remote rename' will only update the remote's fetch refspec if it
looks like a default one. If the remote has no default fetch refspec,
as in
[remote "origin"]
url = git://git.kernel.org/pub/scm/git/git.git
fetch = +refs/heads/*:refs/remotes/upstream/*
we would not update the fetch refspec and even if there is a ref
called "refs/remotes/origin/master", we should not rename it, since it
was not created by fetching from the remote.
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5505-remote.sh')
| -rwxr-xr-x | t/t5505-remote.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 15186c8cbf..e8af615e6d 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -637,7 +637,8 @@ test_expect_success 'rename does not update a non-default fetch refspec' ' (cd four.one && git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* && git remote rename origin upstream && - test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*") + test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" && + git rev-parse -q origin/master) ' |