git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arthur Debert <arthur@stimuli.com.br>
To: Git mailing list <git@vger.kernel.org>
Subject: Commit hashes differ from local and remote
Date: Wed, 13 Apr 2011 16:38:26 -0300	[thread overview]
Message-ID: <BANLkTimhx1tN7EzU94bpKK64P1F8P7MG0g@mail.gmail.com> (raw)

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

             reply	other threads:[~2011-04-13 19:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-13 19:38 Arthur Debert [this message]
2011-04-15  1:46 ` Commit hashes differ from local and remote John Szakmeister
2011-04-15 15:26 ` Alex Riesen
2011-04-15 15:41   ` Arthur Debert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=BANLkTimhx1tN7EzU94bpKK64P1F8P7MG0g@mail.gmail.com \
    --to=arthur@stimuli.com.br \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).