[PATCH] git-mergetool: properly handle "git mergetool -- filename"

From: David Aguilar <davvid@gmail.com>
Date: Oct 15, 2008, 07:39 UTC
Message-ID: <36715524a8e3a4688024cc1e23dd1518c4df71a0.1224056291.git.davvid@gmail.com>

git-mergetool has an entry for "--" in its command-line parsing code to designate the end of option processing. It was not calling shift, though, which caused git-mergetool to incorrectly use "--" as the merge filename.

This patch fixes this bug and updates the usage and documentation to include [--] in the options spec.

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 Documentation/git-mergetool.txt |    2 +-
 git-mergetool.sh                |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index e0b2703..475db72 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -7,7 +7,7 @@ git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
 
 SYNOPSIS
 --------
-'git mergetool' [--tool=<tool>] [<file>]...
+'git mergetool' [--tool=<tool>] [--] [<file>]...
 
 DESCRIPTION
 -----------
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 94187c3..1b0dfec 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -8,7 +8,7 @@
 # at the discretion of Junio C Hamano.
 #
 
-USAGE='[--tool=tool] [file to merge] ...'
+USAGE='[--tool=tool] [--] [file to merge] ...'
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
 . git-sh-setup
@@ -296,6 +296,7 @@ do
 	    esac
 	    ;;
 	--)
+	    shift
 	    break
 	    ;;
 	-*)

-- 
1.6.0.2.532.g84ed4c