From: Junio C Hamano Date: Wed, 12 Nov 2008 00:49:14 GMT Subject: Re: [PATCH 3/4] git-remote rename: support branches->config migration Message-ID: <7v63mtvkdx.fsf@gitster.siamese.dyndns.org> In-Reply-To: Miklos Vajna writes: > This is similar to the remotes->config one, but it makes the > branches->config conversion possible. > > Signed-off-by: Miklos Vajna > --- > builtin-remote.c | 2 ++ > t/t5505-remote.sh | 12 ++++++++++++ > 2 files changed, 14 insertions(+), 0 deletions(-) > > diff --git a/builtin-remote.c b/builtin-remote.c > index d9d0ba3..3af1876 100644 > --- a/builtin-remote.c > +++ b/builtin-remote.c > @@ -384,6 +384,8 @@ static int migrate_file(struct remote *remote) > remote->fetch_refspec[i], buf.buf); > if (remote->origin == REMOTE_REMOTES) > path = git_path("remotes/%s", remote->name); > + else if (remote->origin == REMOTE_BRANCHES) > + path = git_path("branches/%s", remote->name); There is something fishy going on between 2/4 and 3/4. 2/4 was advertised to migrate remotes to config and had a call to migrate_file() for that purpose. Here this one now allows to convert branches but there is no change to the callsite of migrate_file(). Which would mean that 2/4 would convert branches/foo too. And this one is only to remove the leftover branches/foo file. Or am I utterly confused?