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

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 <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · Dec 20, 2008 · ce2c3eb · ce2c3eb
1 parent 0e73b3e
commit ce2c3eb
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/git-mergetool.sh b/git-mergetool.sh
@@ -296,6 +296,7 @@ do
 	    esac
 	    ;;
 	--)
+	    shift
 	    break
 	    ;;
 	-*)