git-mergetool: properly handle "git mergetool -- filename"

davvid · gitster · commit ce2c3ebbc5a6 · 2008-12-19T19:10:58.000-08:00
Like many git commands, git-mergetool allows "--" to signal
the end of option processing.  This adds a missing "shift"
statement so that this is correctly handled.

Signed-off-by: David Aguilar &lt;davvid@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-mergetool.sh b/git-mergetool.sh
@@ -296,6 +296,7 @@ do
 	    esac
 	    ;;
 	--)
+	    shift
 	    break
 	    ;;
 	-*)

-Original file line number
+Diff line change
 	    esac
 	    ;;
 	--)
 +	    shift
 	    break
 	    ;;
 	-*)