diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-20 22:58:52 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-21 02:54:22 -0500 |
| commit | 5989a57734dfd4d6cb7eb0045a008dfdc90c2fbb (patch) | |
| tree | 1ababe0cec2bd4bd330403fb447e3daced30585c | |
| parent | b4b2b8454bca8f0636260358e3a63b9097351fc1 (diff) | |
| download | git-5989a57734dfd4d6cb7eb0045a008dfdc90c2fbb.tar.xz | |
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 <spearce@spearce.org>
| -rwxr-xr-x | git-gui.sh | 6 |
1 files 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] \ |