[PATCH 2/2] remote: "rename o foo" should not rename ref "origin/bar"
- From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
- Date
- Sep 1, 2011, 01:50 UTC
- Message-ID
- <1314841843-19868-2-git-send-email-martin.von.zweigbergk@gmail.com>
- In-Reply-To
- <1314841843-19868-1-git-send-email-martin.von.zweigbergk@gmail.com>
When renaming a remote called 'o' using 'git remote rename o foo', git should also rename any remote-tracking branches for the remote. This does happen, but any remote-tracking branches starting with 'refs/remotes/o', such as 'refs/remotes/origin/bar', will also be renamed (to 'refs/remotes/foorigin/bar' in this case).
Fix it by simply matching one more character, up to the slash following the remote name.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> --- builtin/remote.c | 2 +- t/t5505-remote.sh | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c index c1763ed..127cff4 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -570,7 +570,7 @@ static int read_remote_branches(const char *refname, unsigned char orig_sha1[20]; const char *symref; - strbuf_addf(&buf, "refs/remotes/%s", rename->old); + strbuf_addf(&buf, "refs/remotes/%s/", rename->old); if (!prefixcmp(refname, buf.buf)) { item = string_list_append(rename->remote_branches, xstrdup(refname)); symref = resolve_ref(refname, orig_sha1, 1, &flag); diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 7b6f443..57b584c 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -651,6 +651,16 @@ test_expect_success 'rename a remote with name part of fetch spec' ' ' +test_expect_success 'rename a remote with name prefix of other remote' ' + + git clone one four.three && + (cd four.three && + git remote add o git://example.com/repo.git && + git remote rename o upstream && + test "$(git rev-parse origin/master)" = "$(git rev-parse master)") + +' + cat > remotes_origin << EOF URL: $(pwd)/one Push: refs/heads/master:refs/heads/upstream
-- 1.7.6.51.g07e0e