From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Sat, 3 Sep 2011 15:26:59 +0000 (-0400)
Subject: remote rename: warn when refspec was not updated
X-Git-Tag: v1.7.8-rc0~111^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1822b86a515af708e2259bae2b6a1f2052a2d3aa;p=git.git

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>
---

diff --git a/builtin/remote.c b/builtin/remote.c
index 180da895b..659c6ab71 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);
 	}