From: "Jurko Gospodnetić" <jurko.gospodnetic@docte.hr>
To: git@vger.kernel.org
Subject: Re: Branch renaming not updating the configuration correctly.
Date: Mon, 28 Jul 2008 16:06:27 +0200 [thread overview]
Message-ID: <488DD263.8020100@docte.hr> (raw)
In-Reply-To: <alpine.DEB.1.00.0807281445340.8986@racer>
Hi Johannes.
>> -- .git/config: --
>> [branch "aaa"]
>> remote = .
>> merge = bbb
>> ------------------
>>
>> > git branch -m aaa patched
>> > git branch -m bbb original
>>
>> -- .git/config: --
>> [branch "patched"]
>> remote = .
>> merge = bbb
>> ------------------
>>
>> And as you can see above, the branch.patched.merge configuration setting
>> did not get updated and still holds the old branch name 'bbb'.
>
> I deem this not an "important" bug.
Just wanted to chip in and report... not comfortable enough yet with
git from the user side to contribute with much else...
> We usually do not set up tracking information for local branches, and I
> still do not know valid common scenarios for that workflow.
I was playing around with setting up a local branch containing Boost
library sources as there is no official git repository for that project.
They hold their main repository under subversion and have currently
closed down their main development branch for changes while a new
release is being prepared. As I do _hate_ svn branching/merging I
thought git should be perfect for the task of tracking my own changes to
the project and this whole 'project' would give me a chance to get
better acquainted with the tool :-).
Crossing the SVN/Git boundary however is causing a problem since I
use Windows and 'git svn' does not seem to be supported here. My initial
idea was to manually update my own personal 'origin/master' branch (svn
checkout & then manually commit to the my git branch) and then update
other branches containing my patches from there. Locally-tracking
branches seemed like a perfect fit for that.
Any other suggested patterns/organizations/solutions I should try out
in this case?
> But hey, if it really bothers you, and you can come up with a
> non-intrusive patch (i.e. a patch that does not punish all users that do
> _not_ set up locally-tracking branches), I am sure it will be welcomed.
Heh... it'll take a little more time for me to get comfortable enough
with git to attempt something like that. :-) Still an infant user here,
happy with reporting what I find and hoping I don't miss something too
obvious or find & report something already reported. :-)
Best regards,
Jurko Gospodnetić
prev parent reply other threads:[~2008-07-28 14:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-28 13:36 Branch renaming not updating the configuration correctly Jurko Gospodnetić
2008-07-28 13:49 ` Johannes Schindelin
2008-07-28 14:06 ` Jurko Gospodnetić [this message]
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=488DD263.8020100@docte.hr \
--to=jurko.gospodnetic@docte.hr \
--cc=git@vger.kernel.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).