From: Chris Packham <judge.packham@gmail.com>
To: GIT <git@vger.kernel.org>
Subject: change in behaviour of git status and/or gitk bug
Date: Thu, 6 May 2010 18:20:34 -0700 [thread overview]
Message-ID: <n2na038bef51005061820o581b2f0aq940282264b7f083f@mail.gmail.com> (raw)
Hi,
This may or may not be the same/similar as this thread [1]
I noticed a while back that with gitk I kept on getting files shown as
"Local uncommitted changes, not checked in to index" when I'd made
modifications to them then backed them out so the working tree content
was the same as the index. I used to (with git 1.6.x) fix / work
around this by running git status.
Now, with git 1.7.1, that workaround has stopped working. No doubt
because git status was re-implemented from a wrapper of git commit to
its own real command. Its then no surprise that running git commit
"fixes" the problem even if its got nothing to commit. I think there
is even another command to update whatever info gitk is reading but I
can't find it right now. If I can ever remember the aforementioned
magic command it shouldn't be hard to get gitk to run it when the user
selects "reload" but I was wondering if this change in git status's
behaviour is causing other issues (like in the thread I mentioned).
Its fairly easy to reproduce this
$ mkdir tmp
$ cd tmp
$ git init
$ echo "foo" > foo.txt && git add foo.txt && git commit -m "Initial commit"
$ touch foo.txt
$ git status
# On branch master
nothing to commit (working directory clean)
$ gitk
# this is where you'll see foo.txt modified but not indexed
$ git commit
# On branch master
nothing to commit (working directory clean)
$ gitk
# now everything is clean
---
[1] http://article.gmane.org/gmane.comp.version-control.git/146473
next reply other threads:[~2010-05-07 1:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-07 1:20 Chris Packham [this message]
2010-05-07 5:00 ` change in behaviour of git status and/or gitk bug Jeff King
2010-05-07 16:47 ` Chris Packham
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=n2na038bef51005061820o581b2f0aq940282264b7f083f@mail.gmail.com \
--to=judge.packham@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).