threads / discuss / 27091

Commit hashes differ from local and remote

Subject: Commit hashes differ from local and remote

## tl;dr

4 messages between Apr 13, 2011 and Apr 15, 2011.

replies: 3people: 3as markdown or json

Arthur Debert· Apr 13, 2011, 19:38 UTC · lore
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

John Szakmeister· Apr 15, 2011, 01:46 UTC · re: Arthur Debert · lore

Re: Commit hashes differ from local and remote

On Wed, Apr 13, 2011 at 3:38 PM, Arthur Debert <arthur@stimuli.com.br> wrote:
Show 18 quoted lines
> 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
Alex Riesen· Apr 15, 2011, 15:26 UTC · re: Arthur Debert · lore

Re: Commit hashes differ from local and remote

On Wed, Apr 13, 2011 at 21:38, Arthur Debert <arthur@stimuli.com.br> wrote:
Show 12 quoted lines
> 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.

← back to recent threads