From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2011 23:12:25 +0000 (-0700)
Subject: Merge branch 'jm/mergetool-pathspec' into maint-1.7.6
X-Git-Tag: v1.7.6.5~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/87d99c64dfa8880592104245896557aa530d4fd9?ds=inline;hp=-c

Merge branch 'jm/mergetool-pathspec' into maint-1.7.6

* jm/mergetool-pathspec:
mergetool: no longer need to save standard input
mergetool: Use args as pathspec to unmerged files
---

87d99c64dfa8880592104245896557aa530d4fd9
diff --combined Documentation/git-mergetool.txt
index 3470910109,f1f4e7a07d..2a49de7cfe
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@@ -7,7 -7,6 +7,7 @@@ git-mergetool - Run merge conflict reso
  
  SYNOPSIS
  --------
 +[verse]
  'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>...]
  
  DESCRIPTION
@@@ -17,9 -16,10 +17,10 @@@ Use `git mergetool` to run one of sever
  merge conflicts.  It is typically run after 'git merge'.
  
  If one or more <file> parameters are given, the merge tool program will
- be run to resolve differences on each file.  If no <file> names are
- specified, 'git mergetool' will run the merge tool program on every file
- with merge conflicts.
+ be run to resolve differences on each file (skipping those without
+ conflicts).  Specifying a directory will include all unresolved files in
+ that path.  If no <file> names are specified, 'git mergetool' will run
+ the merge tool program on every file with merge conflicts.
  
  OPTIONS
  -------
diff --combined git-mergetool.sh
index b6d463f0d0,0a06bde843..085e213a12
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@@ -72,7 -72,7 +72,7 @@@ describe_file () 
  resolve_symlink_merge () {
      while true; do
  	printf "Use (l)ocal or (r)emote, or (a)bort? "
 -	read ans
 +	read ans || return 1
  	case "$ans" in
  	    [lL]*)
  		git checkout-index -f --stage=2 -- "$MERGED"
@@@ -100,7 -100,7 +100,7 @@@ resolve_deleted_merge () 
  	else
  	    printf "Use (c)reated or (d)eleted file, or (a)bort? "
  	fi
 -	read ans
 +	read ans || return 1
  	case "$ans" in
  	    [mMcC]*)
  		git add -- "$MERGED"
@@@ -122,7 -122,7 +122,7 @@@
  resolve_submodule_merge () {
      while true; do
  	printf "Use (l)ocal or (r)emote, or (a)bort? "
 -	read ans
 +	read ans || return 1
  	case "$ans" in
  	    [lL]*)
  		if ! local_present; then
@@@ -249,7 -249,7 +249,7 @@@ merge_file () 
      describe_file "$remote_mode" "remote" "$REMOTE"
      if "$prompt" = true; then
  	printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
 -	read ans
 +	read ans || return 1
      fi
  
      if base_present; then
@@@ -320,7 -320,7 +320,7 @@@ don
  prompt_after_failed_merge() {
      while true; do
  	printf "Continue merging other unresolved paths (y/n) ? "
 -	read ans
 +	read ans || return 1
  	case "$ans" in
  
  	    [yY]*)
@@@ -342,64 -342,42 +342,42 @@@ merge_keep_temporaries="$(git config --
  
  last_status=0
  rollup_status=0
- rerere=false
- 
- files_to_merge() {
-     if test "$rerere" = true
-     then
- 	git rerere remaining
-     else
- 	git ls-files -u | sed -e 's/^[^	]*	//' | sort -u
-     fi
- }
- 
+ files=
  
  if test $# -eq 0 ; then
      cd_to_toplevel
  
      if test -e "$GIT_DIR/MERGE_RR"
      then
- 	rerere=true
-     fi
- 
-     files=$(files_to_merge)
-     if test -z "$files" ; then
- 	echo "No files need merging"
- 	exit 0
+ 	files=$(git rerere remaining)
+     else
+ 	files=$(git ls-files -u | sed -e 's/^[^	]*	//' | sort -u)
      fi
+ else
+     files=$(git ls-files -u -- "$@" | sed -e 's/^[^	]*	//' | sort -u)
+ fi
  
-     # Save original stdin
-     exec 3<&0
+ if test -z "$files" ; then
+     echo "No files need merging"
+     exit 0
+ fi
  
-     printf "Merging:\n"
-     printf "$files\n"
+ printf "Merging:\n"
+ printf "$files\n"
  
-     files_to_merge |
-     while IFS= read i
-     do
- 	if test $last_status -ne 0; then
- 	    prompt_after_failed_merge <&3 || exit 1
- 	fi
- 	printf "\n"
- 	merge_file "$i" <&3
- 	last_status=$?
- 	if test $last_status -ne 0; then
- 	    rollup_status=1
- 	fi
-     done
- else
-     while test $# -gt 0; do
- 	if test $last_status -ne 0; then
- 	    prompt_after_failed_merge || exit 1
- 	fi
- 	printf "\n"
- 	merge_file "$1"
- 	last_status=$?
- 	if test $last_status -ne 0; then
- 	    rollup_status=1
- 	fi
- 	shift
-     done
- fi
+ IFS='
+ '
+ for i in $files
+ do
+     if test $last_status -ne 0; then
+ 	prompt_after_failed_merge || exit 1
+     fi
+     printf "\n"
+     merge_file "$i"
+     last_status=$?
+     if test $last_status -ne 0; then
+ 	rollup_status=1
+     fi
+ done
  
  exit $rollup_status