Commit hashes differ from local and remote

Commit hashes differ from local and remote

[Arthur Debert]

Hi Folks.

I'm seeing some behavior that my git-fu isn't quite capable of explaining.

On a local branch the last commit has a hash different than the remote
branch it is tracking from. Nothing has been committed locally and
doing:
$ git diff branch-name origin/branch-name
Comes up empty
git pull also says my branch is already up to date.

It seems that git pull has generated a bogus commit (a merge commit),
but I can't quite figure out why.
This is specially important since we need our app servers to have the
same commit hash once git pull is done.

Anything obvious I'm missing out? Any extra info that can help
pinpoint what the issue is?

Thank you,
Arthur Debert

Re: Commit hashes differ from local and remote

[John Szakmeister]

On Wed, Apr 13, 2011 at 3:38 PM, Arthur Debert <arthur@stimuli.com.br> wrote:
> Hi Folks.
>
> I'm seeing some behavior that my git-fu isn't quite capable of explaining.
>
> On a local branch the last commit has a hash different than the remote
> branch it is tracking from. Nothing has been committed locally and
> doing:
> $ git diff branch-name origin/branch-name
> Comes up empty
> git pull also says my branch is already up to date.
>
> It seems that git pull has generated a bogus commit (a merge commit),
> but I can't quite figure out why.
> This is specially important since we need our app servers to have the
> same commit hash once git pull is done.
>
> Anything obvious I'm missing out? Any extra info that can help
> pinpoint what the issue is?

Maybe you did a git merge instead of a git pull?  Does 'gitk --all'
show you anything interesting?  I find it useful in understanding
issues like this.  It does sound like a merge happened, without having
any more information to go on.

-John

Re: Commit hashes differ from local and remote

[Alex Riesen]

On Wed, Apr 13, 2011 at 21:38, Arthur Debert <arthur@stimuli.com.br> wrote:
> Hi Folks.
>
> I'm seeing some behavior that my git-fu isn't quite capable of explaining.
>
> On a local branch the last commit has a hash different than the remote
> branch it is tracking from. Nothing has been committed locally and
> doing:
> $ git diff branch-name origin/branch-name
> Comes up empty
> git pull also says my branch is already up to date.
>
> It seems that git pull has generated a bogus commit (a merge commit),

git pull is designed to create merge commits, if needed.
In your case both branches just have the same content,
for whatever reason.

You probably want to specify "--ff-only" (only fast-forwards) to all
your pulls to achieve what you seem to want.

Re: Commit hashes differ from local and remote

[Arthur Debert]

Thanks Alex and John, this makes sense.

Cheers
-- 
Arthur Debert
www.stimuli.com.br