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>
David Aguilar committed
Dec 19, 2008 at 17:01 UTC
ce2c3ebbc5a66e0370b3ab5b5611c2c390ddd6c0
1 file changed
+1
git-mergetool.sh
+1
@@ -296,6 +296,7 @@ do
296
esac
297
;;
298
--)
299
+ shift
300
break
301
;;
302
-*)