From: Gonzalo Garramuno <gga@filmaura.com>
To: git@vger.kernel.org
Subject: git update index question
Date: Wed, 17 Oct 2007 07:23:39 -0300 [thread overview]
Message-ID: <4715E2AB.4030900@filmaura.com> (raw)
Hi. I'm new to git but have been using it successfully for about three
months now and love it.
I've run into my first problem (or, more specifically) lack of
understanding.
I'm currently working on linux.
After some modifications of my source code with a script and doing a
commit with qgit, it seems some spaces at the end of those changed lines
got added.
Now, whenever I try to do a commit, the result is that git aborts with
* trailing whitespace (line XXX).
That is, it fails due to git's pre-commit perl hook.
Now, I've modified and changed the offending lines, but redoing the
commit the problem persists.
After loooking into it, I realized the issue is git's index file. If
git-diff-index is called without --cached, the diff matches what's on
disk and works as I expect. However, the pre-commit hook calls it with
--cached which leads to the problem.
Thus, since I don't want to modify the pre-commit hook, the question is
what's the proper way to rebuild git's index file for all the files that
were to be committed but weren't due to the abort.
I've tried git-update-index with most of the flags with no success. I
only got it to update the index properly when I specifically specified a
filename with the problem, but I have a lot of files with the issue and
git already knows about them so I was hoping for a better method.
--
Gonzalo Garramuño
Film Aura
A New Dawn in Media Companies
gga@filmaura.com
http://www.filmaura.com
next reply other threads:[~2007-10-17 11:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-17 10:23 Gonzalo Garramuno [this message]
2007-10-17 12:49 ` git update index question Lars Hjemli
2007-10-17 12:58 ` Gonzalo Garramuno
2007-10-17 13:30 ` Lars Hjemli
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4715E2AB.4030900@filmaura.com \
--to=gga@filmaura.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).