diff options
| author |  Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-09-03 11:26:59 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-09-11 21:39:58 -0700 |
| commit | 1822b86a515af708e2259bae2b6a1f2052a2d3aa (patch) | |
| tree | 8814478e2490f1bdd2fec2720ca18ea8580fb031 /builtin | |
| parent | remote: "rename o foo" should not rename ref "origin/bar" (diff) | |
| download | tgif-1822b86a515af708e2259bae2b6a1f2052a2d3aa.tar.xz | |
remote rename: warn when refspec was not updated
When renaming a remote, we also try to update the fetch refspec
accordingly, but only if it has the default format. For others, such
as refs/heads/master:refs/heads/origin, we are conservative and leave
it untouched. Let's give the user a warning about refspecs that are
not updated, so he can manually update the config if necessary.
Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/remote.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index 180da895be..659c6ab71e 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -682,6 +682,12 @@ static int mv(int argc, const char **argv) ptr-buf2.buf + strlen(":refs/remotes/"), strlen(rename.old), rename.new, strlen(rename.new)); + else + warning("Not updating non-default fetch respec\n" + "\t%s\n" + "\tPlease update the configuration manually if necessary.", + buf2.buf); + if (git_config_set_multivar(buf.buf, buf2.buf, "^$", 0)) return error("Could not append '%s'", buf.buf); } |