{"thread":{"id":"26726","subject":"[Support] Branch pointer does not move","startedAt":"2011-03-14T13:18:44Z","lastAt":"2011-03-15T15:27:42Z","messageCount":11,"participants":["Franz Liedke","Sverre Rabbelier","Michael J Gruber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"163306","messageId":"op.vsb4lif0bl4hj1@metalltrottel.fritz.box","threadId":"26726","inReplyTo":null,"subject":"[Support] Branch pointer does not move","fromName":"Franz Liedke","fromEmail":"franz@develophp.org","sentAt":"2011-03-14T13:18:44Z","receivedAt":"2011-03-14T13:18:44Z","isPatch":false,"sender":{"key":"franz@develophp.org","avatar":"https://gravatar.com/avatar/8a8620604a1f4094fee4ab1c3d2f6fccb6583293daf5f866c804d155c05b2e13?d=mp&s=160"},"body":"Hello everybody,\n\nI am currently having some trouble with a local Git branch.\nIt seems the branch pointer is not updated when I make new commits to that  \nparticular branch.\n\nAfter looking around in the .git directory of my repository, it seems that  \nthe commit hashes both in .git/packed-refs and in .git/info/refs are not  \nupdated (if that helps).\n\nDid I do something wrong? How can this be fixed?\n\nThank you very much in advance,\nFranz\n"},{"id":"163308","messageId":"AANLkTik5MGyw_6vnT8055Yap3Ca1pDQYpJ_RXiZQbwA4@mail.gmail.com","threadId":"26726","inReplyTo":"op.vsb4lif0bl4hj1@metalltrottel.fritz.box","subject":"Re: [Support] Branch pointer does not move","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2011-03-14T15:09:39Z","receivedAt":"2011-03-14T15:09:39Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Mon, Mar 14, 2011 at 14:18, Franz Liedke <franz@develophp.org> wrote:\n> I am currently having some trouble with a local Git branch.\n> It seems the branch pointer is not updated when I make new commits to that\n> particular branch.\n\nYou might not be on any branch/the branch you expect. What does 'git\nstatus' and 'git branch ' say?\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"163309","messageId":"op.vsb95dilbl4hj1@metalltrottel.fritz.box","threadId":"26726","inReplyTo":"AANLkTik5MGyw_6vnT8055Yap3Ca1pDQYpJ_RXiZQbwA4@mail.gmail.com","subject":"Re: [Support] Branch pointer does not move","fromName":"Franz Liedke","fromEmail":"franz@develophp.org","sentAt":"2011-03-14T15:18:39Z","receivedAt":"2011-03-14T15:18:39Z","isPatch":false,"sender":{"key":"franz@develophp.org","avatar":"https://gravatar.com/avatar/8a8620604a1f4094fee4ab1c3d2f6fccb6583293daf5f866c804d155c05b2e13?d=mp&s=160"},"body":"Hey,\n\nthanks for your response.\n\n\"git status\" and \"git branch\" both tell me I'm on my feature branch.\n\n.git/packed-refs and .git/info/refs are both not updated.\n.git/refs/heads/168-users-mass-edit is updated.\n\nOn Mon, 14 Mar 2011 16:09:39 +0100, Sverre Rabbelier  \n<srabbelier@gmail.com> wrote:\n\n> Heya,\n>\n> On Mon, Mar 14, 2011 at 14:18, Franz Liedke <franz@develophp.org> wrote:\n>> I am currently having some trouble with a local Git branch.\n>> It seems the branch pointer is not updated when I make new commits to  \n>> that\n>> particular branch.\n>\n> You might not be on any branch/the branch you expect. What does 'git\n> status' and 'git branch ' say?\n>\n\n\n-- \nUsing Opera's revolutionary email client: http://www.opera.com/mail/\n"},{"id":"163310","messageId":"AANLkTimW+01wriSjvEVEyQ8SE5RPxhGv_o2Rus9kw6ZQ@mail.gmail.com","threadId":"26726","inReplyTo":"op.vsb95dilbl4hj1@metalltrottel.fritz.box","subject":"Re: [Support] Branch pointer does not move","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2011-03-14T15:19:39Z","receivedAt":"2011-03-14T15:19:39Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Mon, Mar 14, 2011 at 16:18, Franz Liedke <franz@develophp.org> wrote:\n> \"git status\" and \"git branch\" both tell me I'm on my feature branch.\n\nAnd that one _is_ updating?\n\n> .git/packed-refs and .git/info/refs are both not updated.\n\nThat's fine, don't worry about those.\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"163312","messageId":"op.vscae5mbbl4hj1@metalltrottel.fritz.box","threadId":"26726","inReplyTo":"AANLkTimW+01wriSjvEVEyQ8SE5RPxhGv_o2Rus9kw6ZQ@mail.gmail.com","subject":"Re: [Support] Branch pointer does not move","fromName":"Franz Liedke","fromEmail":"franz@develophp.org","sentAt":"2011-03-14T15:24:31Z","receivedAt":"2011-03-14T15:24:31Z","isPatch":false,"sender":{"key":"franz@develophp.org","avatar":"https://gravatar.com/avatar/8a8620604a1f4094fee4ab1c3d2f6fccb6583293daf5f866c804d155c05b2e13?d=mp&s=160"},"body":"Oops, sorry I didn't make that clear. The branch pointer is still  \ndisplayed next to the old commit in SmartGit, the GUI I normally use.\n\nOn Mon, 14 Mar 2011 16:19:39 +0100, Sverre Rabbelier  \n<srabbelier@gmail.com> wrote:\n\n> Heya,\n>\n> On Mon, Mar 14, 2011 at 16:18, Franz Liedke <franz@develophp.org> wrote:\n>> \"git status\" and \"git branch\" both tell me I'm on my feature branch.\n>\n> And that one _is_ updating?\n>\n>> .git/packed-refs and .git/info/refs are both not updated.\n>\n> That's fine, don't worry about those.\n>\n\n\n-- \nUsing Opera's revolutionary email client: http://www.opera.com/mail/\n"},{"id":"163392","messageId":"AANLkTinDurbM0nd_WppA-KaVYdxZzT6593hneC4AK+91@mail.gmail.com","threadId":"26726","inReplyTo":"op.vscae5mbbl4hj1@metalltrottel.fritz.box","subject":"Re: [Support] Branch pointer does not move","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2011-03-14T15:24:52Z","receivedAt":"2011-03-14T15:24:52Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Mon, Mar 14, 2011 at 16:24, Franz Liedke <franz@develophp.org> wrote:\n> Oops, sorry I didn't make that clear. The branch pointer is still displayed\n> next to the old commit in SmartGit, the GUI I normally use.\n\nHave you tried turning it on and off again [0]? As in, did you close\nand start SmartGit and/or refresh it (if it has such an option)?\nPerhaps it keeps some sort of internal state.\n\n[0] http://www.youtube.com/watch?v=p85xwZ_OLX0\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"163314","messageId":"4D7E38C6.4010804@drmicha.warpmail.net","threadId":"26726","inReplyTo":"op.vscae5mbbl4hj1@metalltrottel.fritz.box","subject":"Re: [Support] Branch pointer does not move","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-14T15:48:22Z","receivedAt":"2011-03-14T15:48:22Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Franz Liedke venit, vidit, dixit 14.03.2011 16:24:\n> Oops, sorry I didn't make that clear. The branch pointer is still  \n> displayed next to the old commit in SmartGit, the GUI I normally use.\n> \n> On Mon, 14 Mar 2011 16:19:39 +0100, Sverre Rabbelier  \n> <srabbelier@gmail.com> wrote:\n> \n>> Heya,\n>>\n>> On Mon, Mar 14, 2011 at 16:18, Franz Liedke <franz@develophp.org> wrote:\n>>> \"git status\" and \"git branch\" both tell me I'm on my feature branch.\n>>\n>> And that one _is_ updating?\n>>\n>>> .git/packed-refs and .git/info/refs are both not updated.\n>>\n>> That's fine, don't worry about those.\n>>\n\nSo, taking a step back - when you \"make a commit\", do you mean using git\nor using smartgit? Have you been mixing git command line and smartgit\nactions (while smartgit was running)?\n\nMichael\n"},{"id":"163315","messageId":"op.vsccqtbobl4hj1@metalltrottel.fritz.box","threadId":"26726","inReplyTo":"4D7E38C6.4010804@drmicha.warpmail.net","subject":"Re: [Support] Branch pointer does not move","fromName":"Franz Liedke","fromEmail":"franz@develophp.org","sentAt":"2011-03-14T16:14:43Z","receivedAt":"2011-03-14T16:14:43Z","isPatch":false,"sender":{"key":"franz@develophp.org","avatar":"https://gravatar.com/avatar/8a8620604a1f4094fee4ab1c3d2f6fccb6583293daf5f866c804d155c05b2e13?d=mp&s=160"},"body":"Hey Michael,\n\nin fact, I have been making commits both from the command line and from  \nSmartGit from time to time, and yes, they were both running.\nThis has never been the problem before.\n\nI ran some sort of cleanup tool yesterday, possibly about the time when  \nthe problem started (I only noticed it today). Something along the lines  \nof 'git gc' maybe, if I remember correctly. Could that be the cause?\n\nThanks a bunch\nFranz\n\nOn Mon, 14 Mar 2011 16:48:22 +0100, Michael J Gruber  \n<git@drmicha.warpmail.net> wrote:\n\n> Franz Liedke venit, vidit, dixit 14.03.2011 16:24:\n>> Oops, sorry I didn't make that clear. The branch pointer is still\n>> displayed next to the old commit in SmartGit, the GUI I normally use.\n>>\n>> On Mon, 14 Mar 2011 16:19:39 +0100, Sverre Rabbelier\n>> <srabbelier@gmail.com> wrote:\n>>\n>>> Heya,\n>>>\n>>> On Mon, Mar 14, 2011 at 16:18, Franz Liedke <franz@develophp.org>  \n>>> wrote:\n>>>> \"git status\" and \"git branch\" both tell me I'm on my feature branch.\n>>>\n>>> And that one _is_ updating?\n>>>\n>>>> .git/packed-refs and .git/info/refs are both not updated.\n>>>\n>>> That's fine, don't worry about those.\n>>>\n>\n> So, taking a step back - when you \"make a commit\", do you mean using git\n> or using smartgit? Have you been mixing git command line and smartgit\n> actions (while smartgit was running)?\n>\n> Michael\n>\n\n\n-- \nUsing Opera's revolutionary email client: http://www.opera.com/mail/\n"},{"id":"163317","messageId":"4D7E4277.8040202@drmicha.warpmail.net","threadId":"26726","inReplyTo":"op.vsccqtbobl4hj1@metalltrottel.fritz.box","subject":"Re: [Support] Branch pointer does not move","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-14T16:29:43Z","receivedAt":"2011-03-14T16:29:43Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Franz Liedke venit, vidit, dixit 14.03.2011 17:14:\n> Hey Michael,\n> \n> in fact, I have been making commits both from the command line and from  \n> SmartGit from time to time, and yes, they were both running.\n> This has never been the problem before.\n> \n\nI don't know how smartgit reacts when you switch the branch in git while\nsmartgit is running, for example.\n\n> I ran some sort of cleanup tool yesterday, possibly about the time when  \n> the problem started (I only noticed it today). Something along the lines  \n> of 'git gc' maybe, if I remember correctly. Could that be the cause?\n\ngit gc does not do any evil as long as you're not accessing the repo\nwith another client at the same time.\n\nSo, have you lost any commits? Maybe something like\n\ngit log --graph --abbrev-commit --pretty=oneline --decorate --all\n\nwill give you a clearer picture of where your commits went. If they're\nnot there then inspecting the reflog of HEAD may help:\n\ngit log -g --abbrev-commit --pretty=oneline --decorate HEAD\n\nMichael\n"},{"id":"163318","messageId":"op.vscd3mnbbl4hj1@metalltrottel.fritz.box","threadId":"26726","inReplyTo":"4D7E4277.8040202@drmicha.warpmail.net","subject":"Re: [Support] Branch pointer does not move","fromName":"Franz Liedke","fromEmail":"franz@develophp.org","sentAt":"2011-03-14T16:44:00Z","receivedAt":"2011-03-14T16:44:00Z","isPatch":false,"sender":{"key":"franz@develophp.org","avatar":"https://gravatar.com/avatar/8a8620604a1f4094fee4ab1c3d2f6fccb6583293daf5f866c804d155c05b2e13?d=mp&s=160"},"body":"On Mon, 14 Mar 2011 17:29:43 +0100, Michael J Gruber  \n<git@drmicha.warpmail.net> wrote:\n\n> I don't know how smartgit reacts when you switch the branch in git while\n> smartgit is running, for example.\n>\nThat works just fine. SmartGit does really well when it comes to  \nrefreshing.\n\n>> I ran some sort of cleanup tool yesterday, possibly about the time when\n>> the problem started (I only noticed it today). Something along the lines\n>> of 'git gc' maybe, if I remember correctly. Could that be the cause?\n>\n> git gc does not do any evil as long as you're not accessing the repo\n> with another client at the same time.\nAh, there we go. I was.\n\n> So, have you lost any commits? Maybe something like\n>\n> git log --graph --abbrev-commit --pretty=oneline --decorate --all\n>\n> will give you a clearer picture of where your commits went. If they're\n> not there then inspecting the reflog of HEAD may help:\n>\n> git log -g --abbrev-commit --pretty=oneline --decorate HEAD\nNo, I did not lose anything. Commits were added to the log correctly, but  \nthe branch pointer stayed where it was.\n\nI've appended the output of the second command below. Is it correct that  \nthe branch name appears in front of every commit in that branch  \n(\"168-...\", down to the one where the problem started, actually; that's  \nwhere it stops displaying the name)?\n\n---\n\nd07b4b6 (HEAD, lie2815/fluxbb-1.4, fluxbb-1.4) HEAD@{0}: commit: #168: Fix  \nquery bug and don't display buttons when we don't show any results?\n57d8f07 HEAD@{1}: checkout: moving from 168-users-mass-edit to fluxbb-1.4\ne5b0b91 (168-users-mass-edit) HEAD@{2}: HEAD^ --: updating HEAD\n099c040 HEAD@{3}: commit: Test\ne5b0b91 (168-users-mass-edit) HEAD@{4}: checkout: moving from fluxbb-1.4  \nto 168-users-mass-edit\n57d8f07 HEAD@{5}: commit (amend): #168: Merge commits that were ignored in  \nprevious commits. Mainly related to moving users to different groups.\nf27510a HEAD@{6}: commit: #168: Merge commits that were ignored in  \nprevious merge.\ne1dcbf6 HEAD@{7}: checkout: moving from master to fluxbb-1.4\nbe38cd6 (master) HEAD@{8}: checkout: moving from 168-users-mass-edit to  \nmaster\ne5b0b91 (168-users-mass-edit) HEAD@{9}: HEAD^ --: updating HEAD\n327259b HEAD@{10}: commit: test\ne5b0b91 (168-users-mass-edit) HEAD@{11}: HEAD^ --: updating HEAD\n7137c68 HEAD@{12}: commit: test\ne5b0b91 (168-users-mass-edit) HEAD@{13}: HEAD^ --: updating HEAD\n70169b6 HEAD@{14}: commit: Foobar test commit.\ne5b0b91 (168-users-mass-edit) HEAD@{15}: checkout: moving from fluxbb-1.4  \nto 168-users-mass-edit\ne1dcbf6 HEAD@{16}: commit: #168: Add batch actions for banning, deleting  \nand moving users to the admin users page.\n1587022 (origin/fluxbb-1.4) HEAD@{17}: merge origin/fluxbb-1.4:  \nFast-forward\n7c4b93b HEAD@{18}: checkout: moving from 168-users-mass-edit to fluxbb-1.4\ne5b0b91 (168-users-mass-edit) HEAD@{19}: commit: Change form markup. #168\n15186ad HEAD@{20}: commit: #168: Implement moving users to another group.\n02a4541 HEAD@{21}: commit: Don't allow moderators to mass ban other  \nmoderators. #168. Related to #343.\nccb44c8 HEAD@{22}: checkout: moving from fluxbb-1.4 to 168-users-mass-edit\n7c4b93b HEAD@{23}: rebase: #343: Moderators could ban other moderators.\ne313ed0 HEAD@{24}: checkout: moving from fluxbb-1.4 to  \ne313ed0a936071a6abe7efcabcd79f6de295822e^0\n5980b56 HEAD@{25}: commit: #343: Moderators could ban other moderators.\nd9824a9 HEAD@{26}: checkout: moving from 168-users-mass-edit to fluxbb-1.4\nccb44c8 HEAD@{27}: commit (amend): Add button for changing user group. #168\nccbdebd HEAD@{28}: commit: Add button for changing user group. #168\n731a790 HEAD@{29}: commit: Display admin menu on user deletion  \nconfirmation page, too. #168\na494a13 HEAD@{30}: HEAD^ --: updating HEAD\nac9bdf9 HEAD@{31}: commit: Display admin menu on user deletion  \nconfirmation page, too. #168\na494a13 HEAD@{32}: HEAD^ --: updating HEAD\nd73a7b3 HEAD@{33}: commit: Display admin menu on user deletion  \nconfirmation page, too. #168\na494a13 HEAD@{34}: HEAD^ --: updating HEAD\nc99c40c HEAD@{35}: commit: foobarba\na494a13 HEAD@{36}: HEAD^ --: updating HEAD\n6345b66 HEAD@{37}: commit: foobarba\na494a13 HEAD@{38}: commit (amend): Implement banning of multiple users.  \n#168\n7bea1d7 HEAD@{39}: commit: Implement banning of multiple users. #168\nd4cd3f9 HEAD@{40}: HEAD^ --: updating HEAD\n9de9d8f HEAD@{41}: commit: Implement banning of multiple users. #168\nd4cd3f9 HEAD@{42}: HEAD^ --: updating HEAD\n54eb388 HEAD@{43}: commit (amend): Implement banning of multiple users.  \n#168\n29f8471 HEAD@{44}: commit: Implement banning of multiple users. #168\nd4cd3f9 HEAD@{45}: commit: Only show checkboxes and action buttons on  \nadmin users list when permissions are sufficient. #168.\n7560b75 HEAD@{46}: commit: More logical check for valid user IDs when  \ndeleting users. #168.\n9f73b8d HEAD@{47}: commit: Switch order of action buttons and \"select all\"  \nlink in admin users page. #168\n891c4fe HEAD@{48}: checkout: moving from fluxbb-1.4 to 168-users-mass-edit\nd9824a9 HEAD@{49}: checkout: moving from fluxbb-1.2 to fluxbb-1.4\nf233870 (origin/fluxbb-1.2, lie2815/fluxbb-1.2, fluxbb-1.2) HEAD@{50}:  \ncommit: #240: Fix authentication cookie being set incorrectly in some  \ncases.\n0a71ae9 (tag: fluxbb-1.2.23) HEAD@{51}: checkout: moving from  \n168-users-mass-edit to fluxbb-1.2\n891c4fe HEAD@{52}: commit: Move JavaScript code to a file common.js and  \nonly use one link for toggling checkboxes.\ne9349be HEAD@{53}: checkout: moving from fluxbb-1.4 to 168-users-mass-edit\nd9824a9 HEAD@{54}: HEAD^ --: updating HEAD\nf39af9d HEAD@{55}: commit: #294: Limit size of tracking cookie so that  \nthere is some more space in nginx.\nd9824a9 HEAD@{56}: commit: #330: Fix my feed fix. XML-namespace-related.\n2b470b6 HEAD@{57}: commit: #331: Fix hard-coded language entry on admin  \nreports page.\ne0fa124 HEAD@{58}: commit: Enhance RSS feeds by adding atom:link with  \nrel=\"self\".\n5abbbfc HEAD@{59}: checkout: moving from master to fluxbb-1.4\nbe38cd6 (master) HEAD@{60}: checkout: moving from fluxbb-2.0 to master\n20b0441 (origin/fluxbb-2.0, lie2815/fluxbb-2.0, fluxbb-2.0) HEAD@{61}:  \ncheckout: moving from 168-users-mass-edit to fluxbb-2.0\ne9349be HEAD@{62}: commit: Implement mass deletion of users. #168.\n1dff30b HEAD@{63}: checkout: moving from master to 168-users-mass-edit\nbe38cd6 (master) HEAD@{64}: merge origin/master: Fast-forward\nf813ef5 HEAD@{65}: checkout: moving from 168-users-mass-edit to master\n1dff30b HEAD@{66}: commit: Add JavaScript code for selecting / unselecting  \nmultiple checkboxes.\n4acd8f8 HEAD@{67}: checkout: moving from master to 168-users-mass-edit\nf813ef5 HEAD@{68}: pull origin master: Fast-forward\nd55266d HEAD@{69}: checkout: moving from 168-users-mass-edit to master\n4acd8f8 HEAD@{70}: checkout: moving from master to 168-users-mass-edit\nd55266d HEAD@{71}: commit: #272: Add new language string to install.php  \nfor default name of Guests group\n4291ae6 HEAD@{72}: pull origin master: Fast-forward\n28d33cf HEAD@{73}: commit: Change breadcrumbs text in search results  \ndepending on whether we're searching for posts or topics.\n1bef6cc HEAD@{74}: commit: #274: Fix usernames in breadcrumbs being  \nconverted to lower-case when searching for posts by author name.\n971f14e HEAD@{75}: commit: #257: Apply my last commit to edit.php, too.\n---\n\nThanks for your help again\nFranz\n"},{"id":"163393","messageId":"4D7F856E.2030005@drmicha.warpmail.net","threadId":"26726","inReplyTo":"op.vscd3mnbbl4hj1@metalltrottel.fritz.box","subject":"Re: [Support] Branch pointer does not move","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-15T15:27:42Z","receivedAt":"2011-03-15T15:27:42Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Franz Liedke venit, vidit, dixit 14.03.2011 17:44:\n> On Mon, 14 Mar 2011 17:29:43 +0100, Michael J Gruber  \n> <git@drmicha.warpmail.net> wrote:\n> \n>> I don't know how smartgit reacts when you switch the branch in git while\n>> smartgit is running, for example.\n>>\n> That works just fine. SmartGit does really well when it comes to  \n> refreshing.\n> \n>>> I ran some sort of cleanup tool yesterday, possibly about the time when\n>>> the problem started (I only noticed it today). Something along the lines\n>>> of 'git gc' maybe, if I remember correctly. Could that be the cause?\n>>\n>> git gc does not do any evil as long as you're not accessing the repo\n>> with another client at the same time.\n> Ah, there we go. I was.\n> \n>> So, have you lost any commits? Maybe something like\n>>\n>> git log --graph --abbrev-commit --pretty=oneline --decorate --all\n>>\n>> will give you a clearer picture of where your commits went. If they're\n>> not there then inspecting the reflog of HEAD may help:\n>>\n>> git log -g --abbrev-commit --pretty=oneline --decorate HEAD\n> No, I did not lose anything. Commits were added to the log correctly, but  \n> the branch pointer stayed where it was.\n> \n> I've appended the output of the second command below. Is it correct that  \n> the branch name appears in front of every commit in that branch\n\nNo, I'm afraid I've confused you with the \"--decorate\" option. It means\nthat every sha1 in the log or reflog is \"decorated\" with a refname\n(branch, tag) if its current (!) value matches the sha1.\n\nIn the reflog of HEAD (git log -g HEAD), you see the current branch only\nby keeping track of the \"checkout: moving from x to y\" messages.\n\nYou can also look at the reflog of branches, of course. There you see\nbranchname@{n} for the nth prior value of that branch.\n\n(Also note that the most current values come first.)\n\n> (\"168-...\", down to the one where the problem started, actually; that's  \n> where it stops displaying the name)?\n\nYou've done a lot of resetting. Which commit is the problem - e1dcbf6?\n\nYou have to read my following comments backwards (just like the reflog):\n\n> \n> ---\n> \n> d07b4b6 (HEAD, lie2815/fluxbb-1.4, fluxbb-1.4) HEAD@{0}: commit: #168: Fix  \n> query bug and don't display buttons when we don't show any results?\nCommit on fluxbb-1.4\n\n> 57d8f07 HEAD@{1}: checkout: moving from 168-users-mass-edit to fluxbb-1.4\nSwitch to fluxbb-1.4\n\n> e5b0b91 (168-users-mass-edit) HEAD@{2}: HEAD^ --: updating HEAD\n> 099c040 HEAD@{3}: commit: Test\nMore testing and resetting\n\n> e5b0b91 (168-users-mass-edit) HEAD@{4}: checkout: moving from fluxbb-1.4  \n> to 168-users-mass-edit\nSwitch to branch 168...\n\n> 57d8f07 HEAD@{5}: commit (amend): #168: Merge commits that were ignored in  \n> previous commits. Mainly related to moving users to different groups.\nAmend previous commit on master\n\n> f27510a HEAD@{6}: commit: #168: Merge commits that were ignored in  \n> previous merge.\nCommit on master\n\n> e1dcbf6 HEAD@{7}: checkout: moving from master to fluxbb-1.4\nSwitch to fluxbb-1.4\n\n> be38cd6 (master) HEAD@{8}: checkout: moving from 168-users-mass-edit to  \n> master\nSwitch to master\n\n> e5b0b91 (168-users-mass-edit) HEAD@{9}: HEAD^ --: updating HEAD\n> 327259b HEAD@{10}: commit: test\n> e5b0b91 (168-users-mass-edit) HEAD@{11}: HEAD^ --: updating HEAD\n> 7137c68 HEAD@{12}: commit: test\nMore of the same experimenting.\n\n> e5b0b91 (168-users-mass-edit) HEAD@{13}: HEAD^ --: updating HEAD\nReset branch 168... to previous commit.\n\n> 70169b6 HEAD@{14}: commit: Foobar test commit.\nCommit on branch 168...\n\n> e5b0b91 (168-users-mass-edit) HEAD@{15}: checkout: moving from fluxbb-1.4  \n> to 168-users-mass-edit\nSwitch to branch 168...\n\n> e1dcbf6 HEAD@{16}: commit: #168: Add batch actions for banning, deleting  \n> and moving users to the admin users page.\nCommit on fluxbb-1.4\n\n> 1587022 (origin/fluxbb-1.4) HEAD@{17}: merge origin/fluxbb-1.4:  \n> Fast-forward\nYou merged origin/fluxbb-1.4 with a fast-forward.\n\n> 7c4b93b HEAD@{18}: checkout: moving from 168-users-mass-edit to fluxbb-1.4\nThe above moved you to fluxbb-1.4\n\n> e5b0b91 (168-users-mass-edit) HEAD@{19}: commit: Change form markup. #168\n> 15186ad HEAD@{20}: commit: #168: Implement moving users to another group.\n> 02a4541 HEAD@{21}: commit: Don't allow moderators to mass ban other  \n> moderators. #168. Related to #343.\n> ccb44c8 HEAD@{22}: checkout: moving from fluxbb-1.4 to 168-users-mass-edit\n> 7c4b93b HEAD@{23}: rebase: #343: Moderators could ban other moderators.\n> e313ed0 HEAD@{24}: checkout: moving from fluxbb-1.4 to  \n> e313ed0a936071a6abe7efcabcd79f6de295822e^0\n> 5980b56 HEAD@{25}: commit: #343: Moderators could ban other moderators.\n> d9824a9 HEAD@{26}: checkout: moving from 168-users-mass-edit to fluxbb-1.4\n> ccb44c8 HEAD@{27}: commit (amend): Add button for changing user group. #168\n> ccbdebd HEAD@{28}: commit: Add button for changing user group. #168\n> 731a790 HEAD@{29}: commit: Display admin menu on user deletion  \n> confirmation page, too. #168\n> a494a13 HEAD@{30}: HEAD^ --: updating HEAD\n> ac9bdf9 HEAD@{31}: commit: Display admin menu on user deletion  \n> confirmation page, too. #168\n> a494a13 HEAD@{32}: HEAD^ --: updating HEAD\n> d73a7b3 HEAD@{33}: commit: Display admin menu on user deletion  \n> confirmation page, too. #168\n> a494a13 HEAD@{34}: HEAD^ --: updating HEAD\n> c99c40c HEAD@{35}: commit: foobarba\n> a494a13 HEAD@{36}: HEAD^ --: updating HEAD\n> 6345b66 HEAD@{37}: commit: foobarba\n> a494a13 HEAD@{38}: commit (amend): Implement banning of multiple users.  \n> #168\n> 7bea1d7 HEAD@{39}: commit: Implement banning of multiple users. #168\n> d4cd3f9 HEAD@{40}: HEAD^ --: updating HEAD\n> 9de9d8f HEAD@{41}: commit: Implement banning of multiple users. #168\n> d4cd3f9 HEAD@{42}: HEAD^ --: updating HEAD\n> 54eb388 HEAD@{43}: commit (amend): Implement banning of multiple users.  \n> #168\n> 29f8471 HEAD@{44}: commit: Implement banning of multiple users. #168\n> d4cd3f9 HEAD@{45}: commit: Only show checkboxes and action buttons on  \n> admin users list when permissions are sufficient. #168.\n> 7560b75 HEAD@{46}: commit: More logical check for valid user IDs when  \n> deleting users. #168.\n> 9f73b8d HEAD@{47}: commit: Switch order of action buttons and \"select all\"  \n> link in admin users page. #168\n> 891c4fe HEAD@{48}: checkout: moving from fluxbb-1.4 to 168-users-mass-edit\n> d9824a9 HEAD@{49}: checkout: moving from fluxbb-1.2 to fluxbb-1.4\n> f233870 (origin/fluxbb-1.2, lie2815/fluxbb-1.2, fluxbb-1.2) HEAD@{50}:  \n> commit: #240: Fix authentication cookie being set incorrectly in some  \n> cases.\n> 0a71ae9 (tag: fluxbb-1.2.23) HEAD@{51}: checkout: moving from  \n> 168-users-mass-edit to fluxbb-1.2\n> 891c4fe HEAD@{52}: commit: Move JavaScript code to a file common.js and  \n> only use one link for toggling checkboxes.\n> e9349be HEAD@{53}: checkout: moving from fluxbb-1.4 to 168-users-mass-edit\n> d9824a9 HEAD@{54}: HEAD^ --: updating HEAD\n> f39af9d HEAD@{55}: commit: #294: Limit size of tracking cookie so that  \n> there is some more space in nginx.\n> d9824a9 HEAD@{56}: commit: #330: Fix my feed fix. XML-namespace-related.\n> 2b470b6 HEAD@{57}: commit: #331: Fix hard-coded language entry on admin  \n> reports page.\n> e0fa124 HEAD@{58}: commit: Enhance RSS feeds by adding atom:link with  \n> rel=\"self\".\n> 5abbbfc HEAD@{59}: checkout: moving from master to fluxbb-1.4\n> be38cd6 (master) HEAD@{60}: checkout: moving from fluxbb-2.0 to master\n> 20b0441 (origin/fluxbb-2.0, lie2815/fluxbb-2.0, fluxbb-2.0) HEAD@{61}:  \n> checkout: moving from 168-users-mass-edit to fluxbb-2.0\n> e9349be HEAD@{62}: commit: Implement mass deletion of users. #168.\n> 1dff30b HEAD@{63}: checkout: moving from master to 168-users-mass-edit\n> be38cd6 (master) HEAD@{64}: merge origin/master: Fast-forward\n> f813ef5 HEAD@{65}: checkout: moving from 168-users-mass-edit to master\n> 1dff30b HEAD@{66}: commit: Add JavaScript code for selecting / unselecting  \n> multiple checkboxes.\n> 4acd8f8 HEAD@{67}: checkout: moving from master to 168-users-mass-edit\n> f813ef5 HEAD@{68}: pull origin master: Fast-forward\n> d55266d HEAD@{69}: checkout: moving from 168-users-mass-edit to master\n> 4acd8f8 HEAD@{70}: checkout: moving from master to 168-users-mass-edit\n> d55266d HEAD@{71}: commit: #272: Add new language string to install.php  \n> for default name of Guests group\n> 4291ae6 HEAD@{72}: pull origin master: Fast-forward\n> 28d33cf HEAD@{73}: commit: Change breadcrumbs text in search results  \n> depending on whether we're searching for posts or topics.\n> 1bef6cc HEAD@{74}: commit: #274: Fix usernames in breadcrumbs being  \n> converted to lower-case when searching for posts by author name.\n> 971f14e HEAD@{75}: commit: #257: Apply my last commit to edit.php, too.\n> ---\n> \n> Thanks for your help again\n> Franz\n> \n"}]}