mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-30 20:41:39 +02:00
Code

git-gui: Correctly ignore '* Unmerged path' during diff.

Browse Source 
If a path is really unmerged, such as because it has been deleted and
also modifed, we cannot obtain a diff for it.  Instead Git is sending
back '* Unmerged path <blah>' for file <blah>.  We should display this
line as-is as our tag selecting switches don't recognize it.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2007-01-21 14:23:51 -05:00
parent 884fd059f8
commit 37d2a1c9fa
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-gui.sh
View File

@ -708,7 +708,8 @@ proc read_diff {fd} {
#
if {[string match {@@@ *} $line]} {set is_3way_diff 1}
if {[string match {index *} $line]} {
if {[string match {index *} $line]
|| [regexp {^\* Unmerged path } $line]} {
set tags {}
} elseif {$is_3way_diff} {
set op [string range $line 0 1]