git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [Support] Branch pointer does not move
@ 2011-03-14 13:18 Franz Liedke
  2011-03-14 15:09 ` Sverre Rabbelier
  0 siblings, 1 reply; 11+ messages in thread
From: Franz Liedke @ 2011-03-14 13:18 UTC (permalink / raw)
  To: git

Hello everybody,

I am currently having some trouble with a local Git branch.
It seems the branch pointer is not updated when I make new commits to that  
particular branch.

After looking around in the .git directory of my repository, it seems that  
the commit hashes both in .git/packed-refs and in .git/info/refs are not  
updated (if that helps).

Did I do something wrong? How can this be fixed?

Thank you very much in advance,
Franz

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Support] Branch pointer does not move
  2011-03-14 13:18 [Support] Branch pointer does not move Franz Liedke
@ 2011-03-14 15:09 ` Sverre Rabbelier
  2011-03-14 15:18   ` Franz Liedke
  0 siblings, 1 reply; 11+ messages in thread
From: Sverre Rabbelier @ 2011-03-14 15:09 UTC (permalink / raw)
  To: Franz Liedke; +Cc: git

Heya,

On Mon, Mar 14, 2011 at 14:18, Franz Liedke <franz@develophp.org> wrote:
> I am currently having some trouble with a local Git branch.
> It seems the branch pointer is not updated when I make new commits to that
> particular branch.

You might not be on any branch/the branch you expect. What does 'git
status' and 'git branch ' say?

-- 
Cheers,

Sverre Rabbelier

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Support] Branch pointer does not move
  2011-03-14 15:09 ` Sverre Rabbelier
@ 2011-03-14 15:18   ` Franz Liedke
  2011-03-14 15:19     ` Sverre Rabbelier
  0 siblings, 1 reply; 11+ messages in thread
From: Franz Liedke @ 2011-03-14 15:18 UTC (permalink / raw)
  To: Sverre Rabbelier; +Cc: git@vger.kernel.org

Hey,

thanks for your response.

"git status" and "git branch" both tell me I'm on my feature branch.

.git/packed-refs and .git/info/refs are both not updated.
.git/refs/heads/168-users-mass-edit is updated.

On Mon, 14 Mar 2011 16:09:39 +0100, Sverre Rabbelier  
<srabbelier@gmail.com> wrote:

> Heya,
>
> On Mon, Mar 14, 2011 at 14:18, Franz Liedke <franz@develophp.org> wrote:
>> I am currently having some trouble with a local Git branch.
>> It seems the branch pointer is not updated when I make new commits to  
>> that
>> particular branch.
>
> You might not be on any branch/the branch you expect. What does 'git
> status' and 'git branch ' say?
>


-- 
Using Opera's revolutionary email client: http://www.opera.com/mail/

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Support] Branch pointer does not move
  2011-03-14 15:18   ` Franz Liedke
@ 2011-03-14 15:19     ` Sverre Rabbelier
  2011-03-14 15:24       ` Franz Liedke
  0 siblings, 1 reply; 11+ messages in thread
From: Sverre Rabbelier @ 2011-03-14 15:19 UTC (permalink / raw)
  To: Franz Liedke; +Cc: git@vger.kernel.org

Heya,

On Mon, Mar 14, 2011 at 16:18, Franz Liedke <franz@develophp.org> wrote:
> "git status" and "git branch" both tell me I'm on my feature branch.

And that one _is_ updating?

> .git/packed-refs and .git/info/refs are both not updated.

That's fine, don't worry about those.

-- 
Cheers,

Sverre Rabbelier

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Support] Branch pointer does not move
  2011-03-14 15:19     ` Sverre Rabbelier
@ 2011-03-14 15:24       ` Franz Liedke
  2011-03-14 15:24         ` Sverre Rabbelier
  2011-03-14 15:48         ` Michael J Gruber
  0 siblings, 2 replies; 11+ messages in thread
From: Franz Liedke @ 2011-03-14 15:24 UTC (permalink / raw)
  To: Sverre Rabbelier; +Cc: git

Oops, sorry I didn't make that clear. The branch pointer is still  
displayed next to the old commit in SmartGit, the GUI I normally use.

On Mon, 14 Mar 2011 16:19:39 +0100, Sverre Rabbelier  
<srabbelier@gmail.com> wrote:

> Heya,
>
> On Mon, Mar 14, 2011 at 16:18, Franz Liedke <franz@develophp.org> wrote:
>> "git status" and "git branch" both tell me I'm on my feature branch.
>
> And that one _is_ updating?
>
>> .git/packed-refs and .git/info/refs are both not updated.
>
> That's fine, don't worry about those.
>


-- 
Using Opera's revolutionary email client: http://www.opera.com/mail/

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Support] Branch pointer does not move
  2011-03-14 15:24       ` Franz Liedke
@ 2011-03-14 15:24         ` Sverre Rabbelier
  2011-03-14 15:48         ` Michael J Gruber
  1 sibling, 0 replies; 11+ messages in thread
From: Sverre Rabbelier @ 2011-03-14 15:24 UTC (permalink / raw)
  To: Franz Liedke; +Cc: git

Heya,

On Mon, Mar 14, 2011 at 16:24, Franz Liedke <franz@develophp.org> wrote:
> Oops, sorry I didn't make that clear. The branch pointer is still displayed
> next to the old commit in SmartGit, the GUI I normally use.

Have you tried turning it on and off again [0]? As in, did you close
and start SmartGit and/or refresh it (if it has such an option)?
Perhaps it keeps some sort of internal state.

[0] http://www.youtube.com/watch?v=p85xwZ_OLX0

-- 
Cheers,

Sverre Rabbelier

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Support] Branch pointer does not move
  2011-03-14 15:24       ` Franz Liedke
  2011-03-14 15:24         ` Sverre Rabbelier
@ 2011-03-14 15:48         ` Michael J Gruber
  2011-03-14 16:14           ` Franz Liedke
  1 sibling, 1 reply; 11+ messages in thread
From: Michael J Gruber @ 2011-03-14 15:48 UTC (permalink / raw)
  To: Franz Liedke; +Cc: Sverre Rabbelier, git

Franz Liedke venit, vidit, dixit 14.03.2011 16:24:
> Oops, sorry I didn't make that clear. The branch pointer is still  
> displayed next to the old commit in SmartGit, the GUI I normally use.
> 
> On Mon, 14 Mar 2011 16:19:39 +0100, Sverre Rabbelier  
> <srabbelier@gmail.com> wrote:
> 
>> Heya,
>>
>> On Mon, Mar 14, 2011 at 16:18, Franz Liedke <franz@develophp.org> wrote:
>>> "git status" and "git branch" both tell me I'm on my feature branch.
>>
>> And that one _is_ updating?
>>
>>> .git/packed-refs and .git/info/refs are both not updated.
>>
>> That's fine, don't worry about those.
>>

So, taking a step back - when you "make a commit", do you mean using git
or using smartgit? Have you been mixing git command line and smartgit
actions (while smartgit was running)?

Michael

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Support] Branch pointer does not move
  2011-03-14 15:48         ` Michael J Gruber
@ 2011-03-14 16:14           ` Franz Liedke
  2011-03-14 16:29             ` Michael J Gruber
  0 siblings, 1 reply; 11+ messages in thread
From: Franz Liedke @ 2011-03-14 16:14 UTC (permalink / raw)
  To: Michael J Gruber; +Cc: Sverre Rabbelier, git

Hey Michael,

in fact, I have been making commits both from the command line and from  
SmartGit from time to time, and yes, they were both running.
This has never been the problem before.

I ran some sort of cleanup tool yesterday, possibly about the time when  
the problem started (I only noticed it today). Something along the lines  
of 'git gc' maybe, if I remember correctly. Could that be the cause?

Thanks a bunch
Franz

On Mon, 14 Mar 2011 16:48:22 +0100, Michael J Gruber  
<git@drmicha.warpmail.net> wrote:

> Franz Liedke venit, vidit, dixit 14.03.2011 16:24:
>> Oops, sorry I didn't make that clear. The branch pointer is still
>> displayed next to the old commit in SmartGit, the GUI I normally use.
>>
>> On Mon, 14 Mar 2011 16:19:39 +0100, Sverre Rabbelier
>> <srabbelier@gmail.com> wrote:
>>
>>> Heya,
>>>
>>> On Mon, Mar 14, 2011 at 16:18, Franz Liedke <franz@develophp.org>  
>>> wrote:
>>>> "git status" and "git branch" both tell me I'm on my feature branch.
>>>
>>> And that one _is_ updating?
>>>
>>>> .git/packed-refs and .git/info/refs are both not updated.
>>>
>>> That's fine, don't worry about those.
>>>
>
> So, taking a step back - when you "make a commit", do you mean using git
> or using smartgit? Have you been mixing git command line and smartgit
> actions (while smartgit was running)?
>
> Michael
>


-- 
Using Opera's revolutionary email client: http://www.opera.com/mail/

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Support] Branch pointer does not move
  2011-03-14 16:14           ` Franz Liedke
@ 2011-03-14 16:29             ` Michael J Gruber
  2011-03-14 16:44               ` Franz Liedke
  0 siblings, 1 reply; 11+ messages in thread
From: Michael J Gruber @ 2011-03-14 16:29 UTC (permalink / raw)
  To: Franz Liedke; +Cc: Sverre Rabbelier, git

Franz Liedke venit, vidit, dixit 14.03.2011 17:14:
> Hey Michael,
> 
> in fact, I have been making commits both from the command line and from  
> SmartGit from time to time, and yes, they were both running.
> This has never been the problem before.
> 

I don't know how smartgit reacts when you switch the branch in git while
smartgit is running, for example.

> I ran some sort of cleanup tool yesterday, possibly about the time when  
> the problem started (I only noticed it today). Something along the lines  
> of 'git gc' maybe, if I remember correctly. Could that be the cause?

git gc does not do any evil as long as you're not accessing the repo
with another client at the same time.

So, have you lost any commits? Maybe something like

git log --graph --abbrev-commit --pretty=oneline --decorate --all

will give you a clearer picture of where your commits went. If they're
not there then inspecting the reflog of HEAD may help:

git log -g --abbrev-commit --pretty=oneline --decorate HEAD

Michael

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Support] Branch pointer does not move
  2011-03-14 16:29             ` Michael J Gruber
@ 2011-03-14 16:44               ` Franz Liedke
  2011-03-15 15:27                 ` Michael J Gruber
  0 siblings, 1 reply; 11+ messages in thread
From: Franz Liedke @ 2011-03-14 16:44 UTC (permalink / raw)
  To: Michael J Gruber; +Cc: Sverre Rabbelier, git

On Mon, 14 Mar 2011 17:29:43 +0100, Michael J Gruber  
<git@drmicha.warpmail.net> wrote:

> I don't know how smartgit reacts when you switch the branch in git while
> smartgit is running, for example.
>
That works just fine. SmartGit does really well when it comes to  
refreshing.

>> I ran some sort of cleanup tool yesterday, possibly about the time when
>> the problem started (I only noticed it today). Something along the lines
>> of 'git gc' maybe, if I remember correctly. Could that be the cause?
>
> git gc does not do any evil as long as you're not accessing the repo
> with another client at the same time.
Ah, there we go. I was.

> So, have you lost any commits? Maybe something like
>
> git log --graph --abbrev-commit --pretty=oneline --decorate --all
>
> will give you a clearer picture of where your commits went. If they're
> not there then inspecting the reflog of HEAD may help:
>
> git log -g --abbrev-commit --pretty=oneline --decorate HEAD
No, I did not lose anything. Commits were added to the log correctly, but  
the branch pointer stayed where it was.

I've appended the output of the second command below. Is it correct that  
the branch name appears in front of every commit in that branch  
("168-...", down to the one where the problem started, actually; that's  
where it stops displaying the name)?

---

d07b4b6 (HEAD, lie2815/fluxbb-1.4, fluxbb-1.4) HEAD@{0}: commit: #168: Fix  
query bug and don't display buttons when we don't show any results?
57d8f07 HEAD@{1}: checkout: moving from 168-users-mass-edit to fluxbb-1.4
e5b0b91 (168-users-mass-edit) HEAD@{2}: HEAD^ --: updating HEAD
099c040 HEAD@{3}: commit: Test
e5b0b91 (168-users-mass-edit) HEAD@{4}: checkout: moving from fluxbb-1.4  
to 168-users-mass-edit
57d8f07 HEAD@{5}: commit (amend): #168: Merge commits that were ignored in  
previous commits. Mainly related to moving users to different groups.
f27510a HEAD@{6}: commit: #168: Merge commits that were ignored in  
previous merge.
e1dcbf6 HEAD@{7}: checkout: moving from master to fluxbb-1.4
be38cd6 (master) HEAD@{8}: checkout: moving from 168-users-mass-edit to  
master
e5b0b91 (168-users-mass-edit) HEAD@{9}: HEAD^ --: updating HEAD
327259b HEAD@{10}: commit: test
e5b0b91 (168-users-mass-edit) HEAD@{11}: HEAD^ --: updating HEAD
7137c68 HEAD@{12}: commit: test
e5b0b91 (168-users-mass-edit) HEAD@{13}: HEAD^ --: updating HEAD
70169b6 HEAD@{14}: commit: Foobar test commit.
e5b0b91 (168-users-mass-edit) HEAD@{15}: checkout: moving from fluxbb-1.4  
to 168-users-mass-edit
e1dcbf6 HEAD@{16}: commit: #168: Add batch actions for banning, deleting  
and moving users to the admin users page.
1587022 (origin/fluxbb-1.4) HEAD@{17}: merge origin/fluxbb-1.4:  
Fast-forward
7c4b93b HEAD@{18}: checkout: moving from 168-users-mass-edit to fluxbb-1.4
e5b0b91 (168-users-mass-edit) HEAD@{19}: commit: Change form markup. #168
15186ad HEAD@{20}: commit: #168: Implement moving users to another group.
02a4541 HEAD@{21}: commit: Don't allow moderators to mass ban other  
moderators. #168. Related to #343.
ccb44c8 HEAD@{22}: checkout: moving from fluxbb-1.4 to 168-users-mass-edit
7c4b93b HEAD@{23}: rebase: #343: Moderators could ban other moderators.
e313ed0 HEAD@{24}: checkout: moving from fluxbb-1.4 to  
e313ed0a936071a6abe7efcabcd79f6de295822e^0
5980b56 HEAD@{25}: commit: #343: Moderators could ban other moderators.
d9824a9 HEAD@{26}: checkout: moving from 168-users-mass-edit to fluxbb-1.4
ccb44c8 HEAD@{27}: commit (amend): Add button for changing user group. #168
ccbdebd HEAD@{28}: commit: Add button for changing user group. #168
731a790 HEAD@{29}: commit: Display admin menu on user deletion  
confirmation page, too. #168
a494a13 HEAD@{30}: HEAD^ --: updating HEAD
ac9bdf9 HEAD@{31}: commit: Display admin menu on user deletion  
confirmation page, too. #168
a494a13 HEAD@{32}: HEAD^ --: updating HEAD
d73a7b3 HEAD@{33}: commit: Display admin menu on user deletion  
confirmation page, too. #168
a494a13 HEAD@{34}: HEAD^ --: updating HEAD
c99c40c HEAD@{35}: commit: foobarba
a494a13 HEAD@{36}: HEAD^ --: updating HEAD
6345b66 HEAD@{37}: commit: foobarba
a494a13 HEAD@{38}: commit (amend): Implement banning of multiple users.  
#168
7bea1d7 HEAD@{39}: commit: Implement banning of multiple users. #168
d4cd3f9 HEAD@{40}: HEAD^ --: updating HEAD
9de9d8f HEAD@{41}: commit: Implement banning of multiple users. #168
d4cd3f9 HEAD@{42}: HEAD^ --: updating HEAD
54eb388 HEAD@{43}: commit (amend): Implement banning of multiple users.  
#168
29f8471 HEAD@{44}: commit: Implement banning of multiple users. #168
d4cd3f9 HEAD@{45}: commit: Only show checkboxes and action buttons on  
admin users list when permissions are sufficient. #168.
7560b75 HEAD@{46}: commit: More logical check for valid user IDs when  
deleting users. #168.
9f73b8d HEAD@{47}: commit: Switch order of action buttons and "select all"  
link in admin users page. #168
891c4fe HEAD@{48}: checkout: moving from fluxbb-1.4 to 168-users-mass-edit
d9824a9 HEAD@{49}: checkout: moving from fluxbb-1.2 to fluxbb-1.4
f233870 (origin/fluxbb-1.2, lie2815/fluxbb-1.2, fluxbb-1.2) HEAD@{50}:  
commit: #240: Fix authentication cookie being set incorrectly in some  
cases.
0a71ae9 (tag: fluxbb-1.2.23) HEAD@{51}: checkout: moving from  
168-users-mass-edit to fluxbb-1.2
891c4fe HEAD@{52}: commit: Move JavaScript code to a file common.js and  
only use one link for toggling checkboxes.
e9349be HEAD@{53}: checkout: moving from fluxbb-1.4 to 168-users-mass-edit
d9824a9 HEAD@{54}: HEAD^ --: updating HEAD
f39af9d HEAD@{55}: commit: #294: Limit size of tracking cookie so that  
there is some more space in nginx.
d9824a9 HEAD@{56}: commit: #330: Fix my feed fix. XML-namespace-related.
2b470b6 HEAD@{57}: commit: #331: Fix hard-coded language entry on admin  
reports page.
e0fa124 HEAD@{58}: commit: Enhance RSS feeds by adding atom:link with  
rel="self".
5abbbfc HEAD@{59}: checkout: moving from master to fluxbb-1.4
be38cd6 (master) HEAD@{60}: checkout: moving from fluxbb-2.0 to master
20b0441 (origin/fluxbb-2.0, lie2815/fluxbb-2.0, fluxbb-2.0) HEAD@{61}:  
checkout: moving from 168-users-mass-edit to fluxbb-2.0
e9349be HEAD@{62}: commit: Implement mass deletion of users. #168.
1dff30b HEAD@{63}: checkout: moving from master to 168-users-mass-edit
be38cd6 (master) HEAD@{64}: merge origin/master: Fast-forward
f813ef5 HEAD@{65}: checkout: moving from 168-users-mass-edit to master
1dff30b HEAD@{66}: commit: Add JavaScript code for selecting / unselecting  
multiple checkboxes.
4acd8f8 HEAD@{67}: checkout: moving from master to 168-users-mass-edit
f813ef5 HEAD@{68}: pull origin master: Fast-forward
d55266d HEAD@{69}: checkout: moving from 168-users-mass-edit to master
4acd8f8 HEAD@{70}: checkout: moving from master to 168-users-mass-edit
d55266d HEAD@{71}: commit: #272: Add new language string to install.php  
for default name of Guests group
4291ae6 HEAD@{72}: pull origin master: Fast-forward
28d33cf HEAD@{73}: commit: Change breadcrumbs text in search results  
depending on whether we're searching for posts or topics.
1bef6cc HEAD@{74}: commit: #274: Fix usernames in breadcrumbs being  
converted to lower-case when searching for posts by author name.
971f14e HEAD@{75}: commit: #257: Apply my last commit to edit.php, too.
---

Thanks for your help again
Franz

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Support] Branch pointer does not move
  2011-03-14 16:44               ` Franz Liedke
@ 2011-03-15 15:27                 ` Michael J Gruber
  0 siblings, 0 replies; 11+ messages in thread
From: Michael J Gruber @ 2011-03-15 15:27 UTC (permalink / raw)
  To: Franz Liedke; +Cc: Sverre Rabbelier, git

Franz Liedke venit, vidit, dixit 14.03.2011 17:44:
> On Mon, 14 Mar 2011 17:29:43 +0100, Michael J Gruber  
> <git@drmicha.warpmail.net> wrote:
> 
>> I don't know how smartgit reacts when you switch the branch in git while
>> smartgit is running, for example.
>>
> That works just fine. SmartGit does really well when it comes to  
> refreshing.
> 
>>> I ran some sort of cleanup tool yesterday, possibly about the time when
>>> the problem started (I only noticed it today). Something along the lines
>>> of 'git gc' maybe, if I remember correctly. Could that be the cause?
>>
>> git gc does not do any evil as long as you're not accessing the repo
>> with another client at the same time.
> Ah, there we go. I was.
> 
>> So, have you lost any commits? Maybe something like
>>
>> git log --graph --abbrev-commit --pretty=oneline --decorate --all
>>
>> will give you a clearer picture of where your commits went. If they're
>> not there then inspecting the reflog of HEAD may help:
>>
>> git log -g --abbrev-commit --pretty=oneline --decorate HEAD
> No, I did not lose anything. Commits were added to the log correctly, but  
> the branch pointer stayed where it was.
> 
> I've appended the output of the second command below. Is it correct that  
> the branch name appears in front of every commit in that branch

No, I'm afraid I've confused you with the "--decorate" option. It means
that every sha1 in the log or reflog is "decorated" with a refname
(branch, tag) if its current (!) value matches the sha1.

In the reflog of HEAD (git log -g HEAD), you see the current branch only
by keeping track of the "checkout: moving from x to y" messages.

You can also look at the reflog of branches, of course. There you see
branchname@{n} for the nth prior value of that branch.

(Also note that the most current values come first.)

> ("168-...", down to the one where the problem started, actually; that's  
> where it stops displaying the name)?

You've done a lot of resetting. Which commit is the problem - e1dcbf6?

You have to read my following comments backwards (just like the reflog):

> 
> ---
> 
> d07b4b6 (HEAD, lie2815/fluxbb-1.4, fluxbb-1.4) HEAD@{0}: commit: #168: Fix  
> query bug and don't display buttons when we don't show any results?
Commit on fluxbb-1.4

> 57d8f07 HEAD@{1}: checkout: moving from 168-users-mass-edit to fluxbb-1.4
Switch to fluxbb-1.4

> e5b0b91 (168-users-mass-edit) HEAD@{2}: HEAD^ --: updating HEAD
> 099c040 HEAD@{3}: commit: Test
More testing and resetting

> e5b0b91 (168-users-mass-edit) HEAD@{4}: checkout: moving from fluxbb-1.4  
> to 168-users-mass-edit
Switch to branch 168...

> 57d8f07 HEAD@{5}: commit (amend): #168: Merge commits that were ignored in  
> previous commits. Mainly related to moving users to different groups.
Amend previous commit on master

> f27510a HEAD@{6}: commit: #168: Merge commits that were ignored in  
> previous merge.
Commit on master

> e1dcbf6 HEAD@{7}: checkout: moving from master to fluxbb-1.4
Switch to fluxbb-1.4

> be38cd6 (master) HEAD@{8}: checkout: moving from 168-users-mass-edit to  
> master
Switch to master

> e5b0b91 (168-users-mass-edit) HEAD@{9}: HEAD^ --: updating HEAD
> 327259b HEAD@{10}: commit: test
> e5b0b91 (168-users-mass-edit) HEAD@{11}: HEAD^ --: updating HEAD
> 7137c68 HEAD@{12}: commit: test
More of the same experimenting.

> e5b0b91 (168-users-mass-edit) HEAD@{13}: HEAD^ --: updating HEAD
Reset branch 168... to previous commit.

> 70169b6 HEAD@{14}: commit: Foobar test commit.
Commit on branch 168...

> e5b0b91 (168-users-mass-edit) HEAD@{15}: checkout: moving from fluxbb-1.4  
> to 168-users-mass-edit
Switch to branch 168...

> e1dcbf6 HEAD@{16}: commit: #168: Add batch actions for banning, deleting  
> and moving users to the admin users page.
Commit on fluxbb-1.4

> 1587022 (origin/fluxbb-1.4) HEAD@{17}: merge origin/fluxbb-1.4:  
> Fast-forward
You merged origin/fluxbb-1.4 with a fast-forward.

> 7c4b93b HEAD@{18}: checkout: moving from 168-users-mass-edit to fluxbb-1.4
The above moved you to fluxbb-1.4

> e5b0b91 (168-users-mass-edit) HEAD@{19}: commit: Change form markup. #168
> 15186ad HEAD@{20}: commit: #168: Implement moving users to another group.
> 02a4541 HEAD@{21}: commit: Don't allow moderators to mass ban other  
> moderators. #168. Related to #343.
> ccb44c8 HEAD@{22}: checkout: moving from fluxbb-1.4 to 168-users-mass-edit
> 7c4b93b HEAD@{23}: rebase: #343: Moderators could ban other moderators.
> e313ed0 HEAD@{24}: checkout: moving from fluxbb-1.4 to  
> e313ed0a936071a6abe7efcabcd79f6de295822e^0
> 5980b56 HEAD@{25}: commit: #343: Moderators could ban other moderators.
> d9824a9 HEAD@{26}: checkout: moving from 168-users-mass-edit to fluxbb-1.4
> ccb44c8 HEAD@{27}: commit (amend): Add button for changing user group. #168
> ccbdebd HEAD@{28}: commit: Add button for changing user group. #168
> 731a790 HEAD@{29}: commit: Display admin menu on user deletion  
> confirmation page, too. #168
> a494a13 HEAD@{30}: HEAD^ --: updating HEAD
> ac9bdf9 HEAD@{31}: commit: Display admin menu on user deletion  
> confirmation page, too. #168
> a494a13 HEAD@{32}: HEAD^ --: updating HEAD
> d73a7b3 HEAD@{33}: commit: Display admin menu on user deletion  
> confirmation page, too. #168
> a494a13 HEAD@{34}: HEAD^ --: updating HEAD
> c99c40c HEAD@{35}: commit: foobarba
> a494a13 HEAD@{36}: HEAD^ --: updating HEAD
> 6345b66 HEAD@{37}: commit: foobarba
> a494a13 HEAD@{38}: commit (amend): Implement banning of multiple users.  
> #168
> 7bea1d7 HEAD@{39}: commit: Implement banning of multiple users. #168
> d4cd3f9 HEAD@{40}: HEAD^ --: updating HEAD
> 9de9d8f HEAD@{41}: commit: Implement banning of multiple users. #168
> d4cd3f9 HEAD@{42}: HEAD^ --: updating HEAD
> 54eb388 HEAD@{43}: commit (amend): Implement banning of multiple users.  
> #168
> 29f8471 HEAD@{44}: commit: Implement banning of multiple users. #168
> d4cd3f9 HEAD@{45}: commit: Only show checkboxes and action buttons on  
> admin users list when permissions are sufficient. #168.
> 7560b75 HEAD@{46}: commit: More logical check for valid user IDs when  
> deleting users. #168.
> 9f73b8d HEAD@{47}: commit: Switch order of action buttons and "select all"  
> link in admin users page. #168
> 891c4fe HEAD@{48}: checkout: moving from fluxbb-1.4 to 168-users-mass-edit
> d9824a9 HEAD@{49}: checkout: moving from fluxbb-1.2 to fluxbb-1.4
> f233870 (origin/fluxbb-1.2, lie2815/fluxbb-1.2, fluxbb-1.2) HEAD@{50}:  
> commit: #240: Fix authentication cookie being set incorrectly in some  
> cases.
> 0a71ae9 (tag: fluxbb-1.2.23) HEAD@{51}: checkout: moving from  
> 168-users-mass-edit to fluxbb-1.2
> 891c4fe HEAD@{52}: commit: Move JavaScript code to a file common.js and  
> only use one link for toggling checkboxes.
> e9349be HEAD@{53}: checkout: moving from fluxbb-1.4 to 168-users-mass-edit
> d9824a9 HEAD@{54}: HEAD^ --: updating HEAD
> f39af9d HEAD@{55}: commit: #294: Limit size of tracking cookie so that  
> there is some more space in nginx.
> d9824a9 HEAD@{56}: commit: #330: Fix my feed fix. XML-namespace-related.
> 2b470b6 HEAD@{57}: commit: #331: Fix hard-coded language entry on admin  
> reports page.
> e0fa124 HEAD@{58}: commit: Enhance RSS feeds by adding atom:link with  
> rel="self".
> 5abbbfc HEAD@{59}: checkout: moving from master to fluxbb-1.4
> be38cd6 (master) HEAD@{60}: checkout: moving from fluxbb-2.0 to master
> 20b0441 (origin/fluxbb-2.0, lie2815/fluxbb-2.0, fluxbb-2.0) HEAD@{61}:  
> checkout: moving from 168-users-mass-edit to fluxbb-2.0
> e9349be HEAD@{62}: commit: Implement mass deletion of users. #168.
> 1dff30b HEAD@{63}: checkout: moving from master to 168-users-mass-edit
> be38cd6 (master) HEAD@{64}: merge origin/master: Fast-forward
> f813ef5 HEAD@{65}: checkout: moving from 168-users-mass-edit to master
> 1dff30b HEAD@{66}: commit: Add JavaScript code for selecting / unselecting  
> multiple checkboxes.
> 4acd8f8 HEAD@{67}: checkout: moving from master to 168-users-mass-edit
> f813ef5 HEAD@{68}: pull origin master: Fast-forward
> d55266d HEAD@{69}: checkout: moving from 168-users-mass-edit to master
> 4acd8f8 HEAD@{70}: checkout: moving from master to 168-users-mass-edit
> d55266d HEAD@{71}: commit: #272: Add new language string to install.php  
> for default name of Guests group
> 4291ae6 HEAD@{72}: pull origin master: Fast-forward
> 28d33cf HEAD@{73}: commit: Change breadcrumbs text in search results  
> depending on whether we're searching for posts or topics.
> 1bef6cc HEAD@{74}: commit: #274: Fix usernames in breadcrumbs being  
> converted to lower-case when searching for posts by author name.
> 971f14e HEAD@{75}: commit: #257: Apply my last commit to edit.php, too.
> ---
> 
> Thanks for your help again
> Franz
> 

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2011-03-15 15:27 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-14 13:18 [Support] Branch pointer does not move Franz Liedke
2011-03-14 15:09 ` Sverre Rabbelier
2011-03-14 15:18   ` Franz Liedke
2011-03-14 15:19     ` Sverre Rabbelier
2011-03-14 15:24       ` Franz Liedke
2011-03-14 15:24         ` Sverre Rabbelier
2011-03-14 15:48         ` Michael J Gruber
2011-03-14 16:14           ` Franz Liedke
2011-03-14 16:29             ` Michael J Gruber
2011-03-14 16:44               ` Franz Liedke
2011-03-15 15:27                 ` Michael J Gruber

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).