From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: git@vger.kernel.org
Subject: "git diff-index" broken in 'next'
Date: Mon, 10 Mar 2008 19:41:33 -0700 [thread overview]
Message-ID: <7vk5kagexu.fsf_-_@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LFD.1.00.0803100735530.5896@woody.linux-foundation.org> (Linus Torvalds's message of "Mon, 10 Mar 2008 07:38:25 -0700 (PDT)")
When you are in the middle of conflicted merge, it is useful to view "git
diff" that compares the stage #2 and your work tree (which has conflict
markers and both sides of the changes). This still works.
However, with the unpack_trees() update, another form of useful sanity
check seems to be totally broken:
$ git diff HEAD -- $conflicted_file
This used to show the diff between the HEAD and the work tree, but not
anymore. It shows a diff as if the whole file is gone, and that is
because diff-lib.c::oneway_diff() gets idx==NULL from the caller for
unmerged entries. It never reaches show_modified() codepath.
I think it is somewhere around ll. 280 in unpack_callback() that causes
this, but I don't have time to dig this further for now.
next prev parent reply other threads:[~2008-03-11 2:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-10 8:12 "git checkout" branch switching safety broken in 'next' Junio C Hamano
2008-03-10 9:29 ` Jakub Narebski
2008-03-10 13:56 ` Jay Soffian
2008-03-11 8:57 ` setting git-gui locale Maxim Fridental
2008-03-11 10:01 ` Johannes Schindelin
2008-03-10 14:38 ` "git checkout" branch switching safety broken in 'next' Linus Torvalds
2008-03-11 2:41 ` Junio C Hamano [this message]
2008-03-11 3:20 ` "git diff-index" " Linus Torvalds
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=7vk5kagexu.fsf_-_@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.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