mergetool: take the "-O" out of $orderfile
This will make it easier for a future commit to convert a relative orderfile pathname to either absolute or relative to the top-level directory. It also improves code readability. Signed-off-by: Richard Hansen <hansenr@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Richard Hansen committed
Jan 10, 2017 at 15:42 UTC
c1b0d3a010eaed0d7683fe0593132f2211467b20
1 file changed
+2
-2
git-mergetool.sh
+2
-2
@@ -421,7 +421,7 @@ main () {
421
prompt=true
422
;;
423
-O*)
424
- orderfile="$1"
424
+ orderfile="${1#-O}"
425
;;
426
--)
427
shift
@@ -465,7 +465,7 @@ main () {
465
466
files=$(git -c core.quotePath=false \
467
diff --name-only --diff-filter=U \
468
- ${orderfile:+"$orderfile"} -- "$@")
468
+ ${orderfile:+"-O$orderfile"} -- "$@")
469
470
cd_to_toplevel
471