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>
Shawn O. Pearce committed
Jan 20, 2007 at 22:58 UTC
5989a57734dfd4d6cb7eb0045a008dfdc90c2fbb
1 file changed
+2
-4
git-gui.sh
+2
-4
@@ -1114,8 +1114,7 @@ proc commit_committree {fd_wt curHEAD msg} {
1114
AM -
1115
AD -
1116
MM -
1117
- MD -
1118
- DM {
1117
+ MD {
1118
set file_states($path) [list \
1119
_[string index $m 1] \
1120
[lindex $s 1] \
@@ -2872,8 +2871,7 @@ proc toggle_or_diff {w x y} {
2871
A_ -
2872
M_ -
2873
D_ -
2875
- DO -
2876
- DM {
2874
+ DO {
2875
update_indexinfo \
2876
"Removing [short_path $path] from commit" \
2877
[list $path] \