admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mergetool: honor diff.orderFile

Browse Source 
Teach mergetool to get the list of files to edit via `diff` so that we
gain support for diff.orderFile.

Suggested-by: Luis Gutierrez <luisgutz@gmail.com>
Helped-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar
2016-10-07 16:58:05 -07:00
committed by Junio C Hamano
parent 08221e3fa2
commit 57937f70a0
3 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
git-mergetool.sh
View File

@@ -382,6 +382,11 @@ prompt_after_failed_merge () {
done
}
print_noop_and_exit () {
echo "No files need merging"
exit 0
}
main () {
prompt=$(git config --bool mergetool.prompt)
guessed_merge_tool=false
@@ -445,28 +450,23 @@ main () {
merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"
files=
if test $# -eq 0
if test $# -eq 0 && test -e "$GIT_DIR/MERGE_RR"
then
cd_to_toplevel
if test -e "$GIT_DIR/MERGE_RR"
set -- $(git rerere remaining)
if test $# -eq 0
then
files=$(git rerere remaining)
else
files=$(git ls-files -u |
sed -e 's/^[^ ]* //' | sort -u)
print_noop_and_exit
fi
else
files=$(git ls-files -u -- "$@" |
sed -e 's/^[^ ]* //' | sort -u)
fi
files=$(git -c core.quotePath=false \
diff --name-only --diff-filter=U -- "$@")
cd_to_toplevel
if test -z "$files"
then
echo "No files need merging"
exit 0
print_noop_and_exit
fi
printf "Merging:\n"