The 'git rev-parse HEAD' command could end up in detached HEAD state

[Henry Saputra]

Hi All,

In the merge tool python, the command "git rev-parse HEAD"  actually
returns you to detached HEAD state after merging PR.

Anyone else seen this behavior?


- Henry

[Robert Metzger]

Hi,
I think I remember something like this. I don't really use the tool.
Since I'm using the zsh I always know in which branch I am, so its no big
deal if the tool leaves me in a detached branch.

Maybe we can think about removing the tool from the repo .. I don't know
anybody using it.

On Thu, Jan 15, 2015 at 2:33 AM, Henry Saputra <[hidden email]>
wrote:

> Hi All,
>
> In the merge tool python, the command "git rev-parse HEAD"  actually
> returns you to detached HEAD state after merging PR.
>
> Anyone else seen this behavior?
>
>
> - Henry
>

[Henry Saputra]

Oh, so you guys do not use the tools/merge_pull_request.sh script to merge PRs?


- Henry

On Thu, Jan 15, 2015 at 6:45 AM, Robert Metzger <[hidden email]> wrote:

> Hi,
> I think I remember something like this. I don't really use the tool.
> Since I'm using the zsh I always know in which branch I am, so its no big
> deal if the tool leaves me in a detached branch.
>
> Maybe we can think about removing the tool from the repo .. I don't know
> anybody using it.
>
> On Thu, Jan 15, 2015 at 2:33 AM, Henry Saputra <[hidden email]>
> wrote:
>
>> Hi All,
>>
>> In the merge tool python, the command "git rev-parse HEAD"  actually
>> returns you to detached HEAD state after merging PR.
>>
>> Anyone else seen this behavior?
>>
>>
>> - Henry
>>

[Aljoscha Krettek-2]

No, I always do a manual "git rebase". Makes for a cleaner history. And I
have more control over how things are merged and squashed.
On Jan 15, 2015 5:27 PM, "Henry Saputra" <[hidden email]> wrote:

> Oh, so you guys do not use the tools/merge_pull_request.sh script to merge
> PRs?
>
>
> - Henry
>
> On Thu, Jan 15, 2015 at 6:45 AM, Robert Metzger <[hidden email]>
> wrote:
> > Hi,
> > I think I remember something like this. I don't really use the tool.
> > Since I'm using the zsh I always know in which branch I am, so its no big
> > deal if the tool leaves me in a detached branch.
> >
> > Maybe we can think about removing the tool from the repo .. I don't know
> > anybody using it.
> >
> > On Thu, Jan 15, 2015 at 2:33 AM, Henry Saputra <[hidden email]>
> > wrote:
> >
> >> Hi All,
> >>
> >> In the merge tool python, the command "git rev-parse HEAD"  actually
> >> returns you to detached HEAD state after merging PR.
> >>
> >> Anyone else seen this behavior?
> >>
> >>
> >> - Henry
> >>
>

[aalexandrov]

+1 for "git rebase"

2015-01-15 17:39 GMT+01:00 Aljoscha Krettek <[hidden email]>:

> No, I always do a manual "git rebase". Makes for a cleaner history. And I
> have more control over how things are merged and squashed.
> On Jan 15, 2015 5:27 PM, "Henry Saputra" <[hidden email]> wrote:
>
> > Oh, so you guys do not use the tools/merge_pull_request.sh script to
> merge
> > PRs?
> >
> >
> > - Henry
> >
> > On Thu, Jan 15, 2015 at 6:45 AM, Robert Metzger <[hidden email]>
> > wrote:
> > > Hi,
> > > I think I remember something like this. I don't really use the tool.
> > > Since I'm using the zsh I always know in which branch I am, so its no
> big
> > > deal if the tool leaves me in a detached branch.
> > >
> > > Maybe we can think about removing the tool from the repo .. I don't
> know
> > > anybody using it.
> > >
> > > On Thu, Jan 15, 2015 at 2:33 AM, Henry Saputra <
> [hidden email]>
> > > wrote:
> > >
> > >> Hi All,
> > >>
> > >> In the merge tool python, the command "git rev-parse HEAD"  actually
> > >> returns you to detached HEAD state after merging PR.
> > >>
> > >> Anyone else seen this behavior?
> > >>
> > >>
> > >> - Henry
> > >>
> >
>

[Fabian Hueske-2]

Same here
On Jan 15, 2015 5:44 PM, "Alexander Alexandrov" <
[hidden email]> wrote:

> +1 for "git rebase"
>
> 2015-01-15 17:39 GMT+01:00 Aljoscha Krettek <[hidden email]>:
>
> > No, I always do a manual "git rebase". Makes for a cleaner history. And I
> > have more control over how things are merged and squashed.
> > On Jan 15, 2015 5:27 PM, "Henry Saputra" <[hidden email]>
> wrote:
> >
> > > Oh, so you guys do not use the tools/merge_pull_request.sh script to
> > merge
> > > PRs?
> > >
> > >
> > > - Henry
> > >
> > > On Thu, Jan 15, 2015 at 6:45 AM, Robert Metzger <[hidden email]>
> > > wrote:
> > > > Hi,
> > > > I think I remember something like this. I don't really use the tool.
> > > > Since I'm using the zsh I always know in which branch I am, so its no
> > big
> > > > deal if the tool leaves me in a detached branch.
> > > >
> > > > Maybe we can think about removing the tool from the repo .. I don't
> > know
> > > > anybody using it.
> > > >
> > > > On Thu, Jan 15, 2015 at 2:33 AM, Henry Saputra <
> > [hidden email]>
> > > > wrote:
> > > >
> > > >> Hi All,
> > > >>
> > > >> In the merge tool python, the command "git rev-parse HEAD"  actually
> > > >> returns you to detached HEAD state after merging PR.
> > > >>
> > > >> Anyone else seen this behavior?
> > > >>
> > > >>
> > > >> - Henry
> > > >>
> > >
> >
>

[Henry Saputra]

I use the tools to merge other people PRS bc it is useful to maintain
original author info.

I do use Git rebase before pushing my own PRs.

So, no one uses the script to merge PRs?

I will send update to the script to fix it.

- Henry

On Thursday, January 15, 2015, Fabian Hueske <[hidden email]> wrote:

> Same here
> On Jan 15, 2015 5:44 PM, "Alexander Alexandrov" <
> [hidden email] <javascript:;>> wrote:
>
> > +1 for "git rebase"
> >
> > 2015-01-15 17:39 GMT+01:00 Aljoscha Krettek <[hidden email]
> <javascript:;>>:
> >
> > > No, I always do a manual "git rebase". Makes for a cleaner history.
> And I
> > > have more control over how things are merged and squashed.
> > > On Jan 15, 2015 5:27 PM, "Henry Saputra" <[hidden email]
> <javascript:;>>
> > wrote:
> > >
> > > > Oh, so you guys do not use the tools/merge_pull_request.sh script to
> > > merge
> > > > PRs?
> > > >
> > > >
> > > > - Henry
> > > >
> > > > On Thu, Jan 15, 2015 at 6:45 AM, Robert Metzger <[hidden email]
> <javascript:;>>
> > > > wrote:
> > > > > Hi,
> > > > > I think I remember something like this. I don't really use the
> tool.
> > > > > Since I'm using the zsh I always know in which branch I am, so its
> no
> > > big
> > > > > deal if the tool leaves me in a detached branch.
> > > > >
> > > > > Maybe we can think about removing the tool from the repo .. I don't
> > > know
> > > > > anybody using it.
> > > > >
> > > > > On Thu, Jan 15, 2015 at 2:33 AM, Henry Saputra <
> > > [hidden email] <javascript:;>>
> > > > > wrote:
> > > > >
> > > > >> Hi All,
> > > > >>
> > > > >> In the merge tool python, the command "git rev-parse HEAD"
> actually
> > > > >> returns you to detached HEAD state after merging PR.
> > > > >>
> > > > >> Anyone else seen this behavior?
> > > > >>
> > > > >>
> > > > >> - Henry
> > > > >>
> > > >
> > >
> >
>

[Ted Dunning]

On Thu, Jan 15, 2015 at 10:18 AM, Henry Saputra <[hidden email]>
wrote:

> I do use Git rebase before pushing my own PRs.
>
> So, no one uses the script to merge PRs?
>
> I will send update to the script to fix it.
>

Manual rebase is a good standard of practice.  I like looking in detail at
what I am doing.

[Aljoscha Krettek-2]

But you don't lose the original author information when rebasing.

On Thu, Jan 15, 2015 at 7:28 PM, Ted Dunning <[hidden email]> wrote:

> On Thu, Jan 15, 2015 at 10:18 AM, Henry Saputra <[hidden email]>
> wrote:
>
>> I do use Git rebase before pushing my own PRs.
>>
>> So, no one uses the script to merge PRs?
>>
>> I will send update to the script to fix it.
>>
>
> Manual rebase is a good standard of practice.  I like looking in detail at
> what I am doing.

[Henry Saputra]

Ah, so you were rebasing against a PR branch?

- Henry

On Thu, Jan 15, 2015 at 10:42 AM, Aljoscha Krettek <[hidden email]> wrote:

> But you don't lose the original author information when rebasing.
>
> On Thu, Jan 15, 2015 at 7:28 PM, Ted Dunning <[hidden email]> wrote:
>> On Thu, Jan 15, 2015 at 10:18 AM, Henry Saputra <[hidden email]>
>> wrote:
>>
>>> I do use Git rebase before pushing my own PRs.
>>>
>>> So, no one uses the script to merge PRs?
>>>
>>> I will send update to the script to fix it.
>>>
>>
>> Manual rebase is a good standard of practice.  I like looking in detail at
>> what I am doing.

[Aljoscha Krettek-2]

I meant rebasing the commits in a PR on top of the current master. So
that you don't need a merge commit and the history looks linear.

On Thu, Jan 15, 2015 at 9:17 PM, Henry Saputra <[hidden email]> wrote:

> Ah, so you were rebasing against a PR branch?
>
> - Henry
>
> On Thu, Jan 15, 2015 at 10:42 AM, Aljoscha Krettek <[hidden email]> wrote:
>> But you don't lose the original author information when rebasing.
>>
>> On Thu, Jan 15, 2015 at 7:28 PM, Ted Dunning <[hidden email]> wrote:
>>> On Thu, Jan 15, 2015 at 10:18 AM, Henry Saputra <[hidden email]>
>>> wrote:
>>>
>>>> I do use Git rebase before pushing my own PRs.
>>>>
>>>> So, no one uses the script to merge PRs?
>>>>
>>>> I will send update to the script to fix it.
>>>>
>>>
>>> Manual rebase is a good standard of practice.  I like looking in detail at
>>> what I am doing.

[Henry Saputra]

Ah ok, what I do usually is to rebase current master on top of my PR
branch, then merge to master for pushing the change.

- Henry

On Thu, Jan 15, 2015 at 12:26 PM, Aljoscha Krettek <[hidden email]> wrote:

> I meant rebasing the commits in a PR on top of the current master. So
> that you don't need a merge commit and the history looks linear.
>
> On Thu, Jan 15, 2015 at 9:17 PM, Henry Saputra <[hidden email]> wrote:
>> Ah, so you were rebasing against a PR branch?
>>
>> - Henry
>>
>> On Thu, Jan 15, 2015 at 10:42 AM, Aljoscha Krettek <[hidden email]> wrote:
>>> But you don't lose the original author information when rebasing.
>>>
>>> On Thu, Jan 15, 2015 at 7:28 PM, Ted Dunning <[hidden email]> wrote:
>>>> On Thu, Jan 15, 2015 at 10:18 AM, Henry Saputra <[hidden email]>
>>>> wrote:
>>>>
>>>>> I do use Git rebase before pushing my own PRs.
>>>>>
>>>>> So, no one uses the script to merge PRs?
>>>>>
>>>>> I will send update to the script to fix it.
>>>>>
>>>>
>>>> Manual rebase is a good standard of practice.  I like looking in detail at
>>>> what I am doing.