From 5989a57734dfd4d6cb7eb0045a008dfdc90c2fbb Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sat, 20 Jan 2007 22:58:52 -0500 Subject: [PATCH] git-gui: Remove invalid DM state. The DM state cannot really happen. Its implying that the file has been deleted in the index, but the file in the working directory has been modified relative to the file in the index. This is complete nonsense, the file doesn't exist in the index for it to be different against! Signed-off-by: Shawn O. Pearce --- git-gui.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index 9a2b70b475..be286b0e78 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1114,8 +1114,7 @@ proc commit_committree {fd_wt curHEAD msg} { AM - AD - MM - - MD - - DM { + MD { set file_states($path) [list \ _[string index $m 1] \ [lindex $s 1] \ @@ -2872,8 +2871,7 @@ proc toggle_or_diff {w x y} { A_ - M_ - D_ - - DO - - DM { + DO { update_indexinfo \ "Removing [short_path $path] from commit" \ [list $path] \