From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 21 Jan 2007 18:25:06 +0000 (-0500)
Subject: git-gui: Correct disappearing unstaged files.
X-Git-Tag: gitgui-0.6.0~95
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a4b1786b954917294483feb176e6ca473e01b615;p=git.git

git-gui: Correct disappearing unstaged files.

A prior commit tried to use the old index state for the old working
directory state during a UI refresh of a file.  This caused files
which were being unstaged (and thus becoming unmodified) to drop
out of the working directory side of the display, at least until
the user performed a rescan to force the UI to redisplay everything.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui.sh b/git-gui.sh
index c4d77fafe..aa8f0ba06 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1336,7 +1336,7 @@ proc display_file {path state} {
 	if {[string index $old_m 0] eq {U}} {
 		set o U
 	} else {
-		set o [string index $old_m 0]
+		set o [string index $old_m 1]
 	}
 	if {[string index $new_m 0] eq {U}} {
 		set n U