{"thread":{"id":"14718","subject":"Branch renaming not updating the configuration correctly.","startedAt":"2008-07-28T13:36:09Z","lastAt":"2008-07-28T14:06:27Z","messageCount":3,"participants":["Jurko Gospodnetić","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"85291","messageId":"g6ki09$81c$1@ger.gmane.org","threadId":"14718","inReplyTo":null,"subject":"Branch renaming not updating the configuration correctly.","fromName":"Jurko Gospodnetić","fromEmail":"jurko.gospodnetic@docte.hr","sentAt":"2008-07-28T13:36:09Z","receivedAt":"2008-07-28T13:36:09Z","isPatch":false,"sender":{"key":"jurko.gospodnetic@docte.hr","avatar":null},"body":"   Hi.\n\n   I noticed that the .git/config file is not updated completely in case \nyou create two branches aaa and bbb, set the repository up so it \nautomatically merges changes from bbb into aaa and then rename the branches:\n\n   Here is an exact list of commands and config file contents \nillustrating the problem:\n\n   > git branch aaa\n   > git branch bbb\n   > git config --add branch.aaa.remote .\n   > git config --add branch.aaa.merge bbb\n\n-- .git/config: --\n[branch \"aaa\"]\n\tremote = .\n\tmerge = bbb\n------------------\n\n   > git branch -m aaa patched\n   > git branch -m bbb original\n\n-- .git/config: --\n[branch \"patched\"]\n\tremote = .\n\tmerge = bbb\n------------------\n\n   And as you can see above, the branch.patched.merge configuration \nsetting did not get updated and still holds the old branch name 'bbb'.\n\n   Hope this helps.\n\n   Best regards,\n     Jurko Gospodnetić\n"},{"id":"85292","messageId":"alpine.DEB.1.00.0807281445340.8986@racer","threadId":"14718","inReplyTo":"g6ki09$81c$1@ger.gmane.org","subject":"Re: Branch renaming not updating the configuration correctly.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-07-28T13:49:28Z","receivedAt":"2008-07-28T13:49:28Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 28 Jul 2008, Jurko Gospodnetić wrote:\n\n> -- .git/config: --\n> [branch \"aaa\"]\n> \tremote = .\n> \tmerge = bbb\n> ------------------\n> \n>   > git branch -m aaa patched\n>   > git branch -m bbb original\n> \n> -- .git/config: --\n> [branch \"patched\"]\n> \tremote = .\n> \tmerge = bbb\n> ------------------\n> \n> And as you can see above, the branch.patched.merge configuration setting \n> did not get updated and still holds the old branch name 'bbb'.\n\nI deem this not an \"important\" bug.\n\nWe usually do not set up tracking information for local branches, and I \nstill do not know valid common scenarios for that workflow.\n\nBut hey, if it really bothers you, and you can come up with a \nnon-intrusive patch (i.e. a patch that does not punish all users that do \n_not_ set up locally-tracking branches), I am sure it will be welcomed.\n\nCiao,\nDscho\n"},{"id":"85294","messageId":"488DD263.8020100@docte.hr","threadId":"14718","inReplyTo":"alpine.DEB.1.00.0807281445340.8986@racer","subject":"Re: Branch renaming not updating the configuration correctly.","fromName":"Jurko Gospodnetić","fromEmail":"jurko.gospodnetic@docte.hr","sentAt":"2008-07-28T14:06:27Z","receivedAt":"2008-07-28T14:06:27Z","isPatch":false,"sender":{"key":"jurko.gospodnetic@docte.hr","avatar":null},"body":"   Hi Johannes.\n\n>> -- .git/config: --\n>> [branch \"aaa\"]\n>> \tremote = .\n>> \tmerge = bbb\n>> ------------------\n>>\n>>   > git branch -m aaa patched\n>>   > git branch -m bbb original\n>>\n>> -- .git/config: --\n>> [branch \"patched\"]\n>> \tremote = .\n>> \tmerge = bbb\n>> ------------------\n>>\n>> And as you can see above, the branch.patched.merge configuration setting \n>> did not get updated and still holds the old branch name 'bbb'.\n> \n> I deem this not an \"important\" bug.\n\n   Just wanted to chip in and report... not comfortable enough yet with \ngit from the user side to contribute with much else...\n\n\n> We usually do not set up tracking information for local branches, and I \n> still do not know valid common scenarios for that workflow.\n\n   I was playing around with setting up a local branch containing Boost \nlibrary sources as there is no official git repository for that project. \n  They hold their main repository under subversion and have currently \nclosed down their main development branch for changes while a new \nrelease is being prepared. As I do _hate_ svn branching/merging I \nthought git should be perfect for the task of tracking my own changes to \nthe project and this whole 'project' would give me a chance to get \nbetter acquainted with the tool :-).\n\n   Crossing the SVN/Git boundary however is causing a problem since I \nuse Windows and 'git svn' does not seem to be supported here. My initial \nidea was to manually update my own personal 'origin/master' branch (svn \ncheckout & then manually commit to the my git branch) and then update \nother branches containing my patches from there. Locally-tracking \nbranches seemed like a perfect fit for that.\n\n   Any other suggested patterns/organizations/solutions I should try out \nin this case?\n\n\n> But hey, if it really bothers you, and you can come up with a \n> non-intrusive patch (i.e. a patch that does not punish all users that do \n> _not_ set up locally-tracking branches), I am sure it will be welcomed.\n\n   Heh... it'll take a little more time for me to get comfortable enough \nwith git to attempt something like that. :-) Still an infant user here, \nhappy with reporting what I find and hoping I don't miss something too \nobvious or find & report something already reported. :-)\n\n   Best regards,\n     Jurko Gospodnetić\n"}]}