[PATCH (GIT-GUI) 1/8] git-gui: Don't allow staging files with conflicts.
- From
Alexander Gavrilov <angavrilov@gmail.com>
- Date
- Aug 30, 2008, 20:54 UTC
- Message-ID
- <200808310054.19732.angavrilov@gmail.com>
- In-Reply-To
- <200808310052.21595.angavrilov@gmail.com>
Prevent staging files with conflict markers by clicking on the icon in the 'Unstaged Changes' list. Instead, pretend that the user clicked the name, and show the diff.
Originally it made some sense to allow staging conflicting files, because git-gui did not provide any tools to resolve them from within the GUI. But now that I'm adding mergetool capabilities, it is more likely to cause accidental and non-undoable errors.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> --- git-gui.sh | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/git-gui.sh b/git-gui.sh index ec08b5a..9df4f8c 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1838,6 +1838,14 @@ proc toggle_or_diff {w x y} { $ui_index tag remove in_sel 0.0 end $ui_workdir tag remove in_sel 0.0 end + # Do not stage files with conflicts + if {[info exists file_states($path)]} { + set state [lindex $file_states($path) 0] + if {[string index $state 0] eq {U}} { + set col 1 + } + } + if {$col == 0 && $y > 1} { set i [expr {$lno-1}] set ll [expr {[llength $file_lists($w)]-1}]
-- 1.6.0.20.g6148bc