diff options
| author | Bert Wesarg <bert.wesarg@googlemail.com> | 2010-12-09 21:46:23 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2011-01-28 00:16:50 +0000 |
| commit | 7587f4d32f7479a9fa9ae1767708597702a0be5f (patch) | |
| tree | 9750628d932d9799be3709db01d7a1cbe2dafe6e /git-gui.sh | |
| parent | 4a065c8a6f0415da6d778dae83ff88e5385a2f0f (diff) | |
| download | git-7587f4d32f7479a9fa9ae1767708597702a0be5f.tar.gz git-7587f4d32f7479a9fa9ae1767708597702a0be5f.tar.xz | |
git-gui: learn more type change states
Support the following states with type change in git-gui: AT, MT, TD, TM
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-gui.sh b/git-gui.sh index 8d576b398..886719a8c 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1997,7 +1997,11 @@ foreach i { {MD {mc "Staged for commit, missing"}} {_T {mc "File type changed, not staged"}} + {MT {mc "File type changed, old type staged for commit"}} + {AT {mc "File type changed, old type staged for commit"}} {T_ {mc "File type changed, staged"}} + {TM {mc "File type change staged, modification not staged"}} + {TD {mc "File type change staged, file missing"}} {_O {mc "Untracked, not staged"}} {A_ {mc "Staged for commit"}} @@ -3539,8 +3543,8 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} { || $current_diff_path eq {} || {__} eq $state || {_O} eq $state - || {_T} eq $state - || {T_} eq $state + || [string match {?T} $state] + || [string match {T?} $state] || [has_textconv $current_diff_path]} { set s disabled } else { |