summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2007-01-21 13:25:06 -0500
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2007-01-21 22:47:54 -0500
commita4b1786b954917294483feb176e6ca473e01b615 (patch)
treec5310ceeeb61d11e4bdfd03116d0248e49018fe5
parentgit-gui: Clear diff from viewer if the side changed. (diff)
downloadtgif-a4b1786b954917294483feb176e6ca473e01b615.tar.xz
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>
-rwxr-xr-xgit-gui.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh
index c4d77fafe7..aa8f0ba067 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