summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-26 20:44:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-26 20:44:11 (GMT)
commitad1c66033e7fa8166825662a56793abedf917d73 (patch)
tree93a16151f9444ade412c24b3ca25136ee554446b /git-gui/git-gui.sh
parentc47372d3a8a9fb7892cc1aa5cc5df7b6c1e61751 (diff)
parent3decb8e0ac5d951f0a0cf6e604790b471aef22e1 (diff)
downloadgit-ad1c66033e7fa8166825662a56793abedf917d73.zip
git-ad1c66033e7fa8166825662a56793abedf917d73.tar.gz
git-ad1c66033e7fa8166825662a56793abedf917d73.tar.bz2
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: tolerate major version changes when comparing the git version git-gui: show staged submodules regardless of ignore config
Diffstat (limited to 'git-gui/git-gui.sh')
-rwxr-xr-xgit-gui/git-gui.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 6a8907e..b186329 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -1558,7 +1558,11 @@ proc rescan_stage2 {fd after} {
set rescan_active 2
ui_status [mc "Scanning for modified files ..."]
- set fd_di [git_read diff-index --cached -z [PARENT]]
+ if {[git-version >= "1.7.2"]} {
+ set fd_di [git_read diff-index --cached --ignore-submodules=dirty -z [PARENT]]
+ } else {
+ set fd_di [git_read diff-index --cached -z [PARENT]]
+ }
set fd_df [git_read diff-files -z]
fconfigure $fd_di -blocking 0 -translation binary -encoding binary