From: Jay Soffian <jaysoffian@gmail.com>
To: git <git@vger.kernel.org>
Subject: git status and diff-files don't agree on unmerged file
Date: Tue, 2 Mar 2010 22:53:50 -0500 [thread overview]
Message-ID: <76718491003021953l7c982c70vd2e9f082f1762fea@mail.gmail.com> (raw)
I've run into an issue recently where I'll be rebasing, hit a
conflict, resolve it, use "git add" (I think...) but rebase doesn't
want to continue. It seems there is a disagreement between diff-files
and status while in this state:
$ git --version
git version 1.7.0.1.242.ga1f88
$ git status
# Not currently on any branch.
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: chrome/browser/cocoa/browser_window_controller.mm
# modified: chrome/browser/cocoa/tab_strip_controller.h
# modified: chrome/browser/cocoa/tab_strip_controller.mm
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .mailmap
$ git diff-files --ignore-submodules
:100644 100644 b6ac7eb5e74d21eb7d5806f05a2ed83d6078ced3
0000000000000000000000000000000000000000
M chrome/browser/cocoa/tab_strip_controller.h
git add on the file in question resolves the problem, but shouldn't
said file show up as "unmerged" in the output of git status?
j.
reply other threads:[~2010-03-03 3:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=76718491003021953l7c982c70vd2e9f082f1762fea@mail.gmail.com \
--to=jaysoffian@gmail.com \
--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).