From: Erik Sandberg <mandolaerik@gmail.com>
To: git@vger.kernel.org
Subject: BUG: mergetool fails on gitignore:d files
Date: Sat, 30 May 2009 17:30:52 +0200 [thread overview]
Message-ID: <e87cdfda0905300830t6b332533g9a4298f6b8005b9e@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
If a version-controlled file is ignored by git, and a conflict arises
on the file, and I use mergetool to resolve the conflict, then
mergetool fails with a message like:
The following paths are ignored by one of your .gitignore files:
a
Use -f if you really want to add them.
The problem disappears if I edit the git-mergetool script to always
pass -f to "git add", but I'm not sure if that's the right fix; I have
a vague feeling that "git-update-index --add" could be more correct.
I have attached a script that reproduces the problem.
[-- Attachment #2: bug.sh --]
[-- Type: application/x-sh, Size: 391 bytes --]
next reply other threads:[~2009-05-30 15:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-30 15:30 Erik Sandberg [this message]
2009-05-30 16:38 ` BUG: mergetool fails on gitignore:d files Markus Heidelberg
2009-05-30 21:54 ` Jeff King
2009-06-01 2:03 ` Jeff King
2009-06-01 2:04 ` Junio C Hamano
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=e87cdfda0905300830t6b332533g9a4298f6b8005b9e@mail.gmail.com \
--to=mandolaerik@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).