From: Jeff King <peff@peff.net>
To: Miles Bader <miles@gnu.org>
Cc: git@vger.kernel.org
Subject: Re: renaming remote branches
Date: Thu, 16 Apr 2009 02:59:34 -0400 [thread overview]
Message-ID: <20090416065934.GA20071@coredump.intra.peff.net> (raw)
In-Reply-To: <buo3ac9jn18.fsf@dhlpc061.dev.necel.com>
On Thu, Apr 16, 2009 at 12:27:31PM +0900, Miles Bader wrote:
> I can "rename" a remote branch by doing:
>
> git push REMOTE REMOTE/OLD:refs/heads/NEW
> git push REMOTE :OLD
>
> is there any better way to do this (I mean, er... more
> user-friendly/less-dangerous/... I dunno... "better" :-)?
No, the git protocol doesn't know about moving refs at all, so you are
stuck with creation and deletion (and the creation, as you noticed, is
even more painful because we don't guess that "NEW" is going to be a
branch, so you are stuck saying "refs/heads/").
Not only is this not user-friendly, but it does not preserve any branch
config or reflog at the remote (both things that "branch -m" does).
In your situation, I would probably do:
ssh remote-host 'cd remote-dir && git branch -m OLD NEW'
but that is not always an option, depending on your setup.
> Also, I note that the old name ("OLD") remains in .git/info/refs, both
> locally and in the remote; is this a problem? I can update the local
> .git/info/refs by running "git update-server-info", but I'm not sure how
> to do in for the remote repo without having a login there...
If you are not sharing your repo over a dumb transport (like http), then
the contents of .git/info/refs shouldn't matter. If you are, then you
should enable the post-update hook to run update-server-info after every
push (i.e., it is not just the deletion that is a problem, but none of
your pushes is being marked in .git/info/refs).
-Peff
next prev parent reply other threads:[~2009-04-16 7:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-16 3:27 renaming remote branches Miles Bader
2009-04-16 6:59 ` Jeff King [this message]
2009-04-16 8:00 ` Miles Bader
2009-04-16 8:18 ` Jeff King
2009-04-16 13:09 ` Jay Soffian
2009-04-16 13:50 ` Jeff King
2009-04-17 0:51 ` Miles Bader
2009-04-17 12:07 ` Jeff King
2009-04-17 16:20 ` Dmitry Potapov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090416065934.GA20071@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=miles@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).