summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-11-24 15:59:34 -0500
committerShawn O. Pearce <spearce@spearce.org>2006-11-24 15:59:34 -0500
commit9342e26d3a832dd24878725b42444b8efe4fa1c4 (patch)
treea550f9979f37636aa207b4b5596e98e7e1b79b1c /git-gui
parent8553b772d7aeebe8c83710233877483dd409b846 (diff)
downloadgit-9342e26d3a832dd24878725b42444b8efe4fa1c4.tar.gz
git-gui: Support file state MD (modified/deleted).
Apparently I missed the file state MD, which is a file modified and updated in the index but then removed from the working directory. This should be treated just like AD, an added file which has been deleted from the working directory. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-gui')
-rwxr-xr-xgit-gui3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-gui b/git-gui
index dd2d750ab1..e9d4600a25 100755
--- a/git-gui
+++ b/git-gui
@@ -1093,6 +1093,7 @@ proc commit_committree {fd_wt curHEAD msg} {
AM -
AD -
MM -
+ MD -
DM {
set file_states($path) [list \
_[string index $m 1] \
@@ -2211,6 +2212,7 @@ proc include_helper {txt paths} {
AM -
AD -
MM -
+ MD -
U? -
_M -
_D -
@@ -2255,6 +2257,7 @@ proc do_include_all {} {
AM -
AD -
MM -
+ MD -
_M -
_D {lappend paths $path}
}