From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 30 Sep 2020 06:41:36 +0000 (+1000)
Subject: clean up merge_msg
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;ds=sidebyside;h=01572e70fb286ac49e902afbabe79f8a4f800f58;p=next-scripts

clean up merge_msg

no intended change in semantics
---

diff --git a/merge_msg b/merge_msg
index 38e6e2e..33332d3 100755
--- a/merge_msg
+++ b/merge_msg
@@ -1,22 +1,22 @@
 #!/bin/bash
 
-branch=""
-[ "$1" = "-t" ] && {
-        branch="-t $2"
+branch=''
+if [ "X$1" = 'X-t' ]; then
+        branch=( -t "$2" )
         shift 2
-}
+fi
 
 gitk --merge -- "$@" &
-# [ "$#" ] && gvim "$@" 2>/dev/null
 
-printf -v files "  %s\n" "$@"
-conf="a conflict"
-[ "$#" -gt 1 ] &&
-	conf="conflicts"
+printf -v files '  %s\n' "$@"
+conf='a conflict'
+if [ "$#" -gt 1 ]; then
+	conf='conflicts'
+fi
 
-subject="manual merge of the BRANCH tree with the FIXME tree"
+subject='manual merge of the BRANCH tree with the FIXME tree'
 
-$(dirname $0)/message_helper $branch "$subject" <<EOF
+"$(dirname "$0")/message_helper" "${branch[@]}" "$subject" <<EOF
 FIXME: Add owner of second tree to To:
        Add author(s)/SOB of conflicting commits.