From: Kevin Bracey <kevin@bracey.fi>
To: git@vger.kernel.org
Cc: David Aguilar <davvid@gmail.com>, Kevin Bracey <kevin@bracey.fi>
Subject: [PATCH v2 1/3] git-merge-one-file: style cleanup
Date: Sun, 24 Mar 2013 14:26:23 +0200 [thread overview]
Message-ID: <1364127985-13366-2-git-send-email-kevin@bracey.fi> (raw)
In-Reply-To: <1364127985-13366-1-git-send-email-kevin@bracey.fi>
Update style to match Documentation/CodingGuidelines.
Signed-off-by: Kevin Bracey <kevin@bracey.fi>
---
git-merge-one-file.sh | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 255c07a..2382b1f 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -27,7 +27,7 @@ SUBDIRECTORY_OK=Yes
cd_to_toplevel
require_work_tree
-if ! test "$#" -eq 7
+if test $# != 7
then
echo "$LONG_USAGE"
exit 1
@@ -38,7 +38,8 @@ case "${1:-.}${2:-.}${3:-.}" in
# Deleted in both or deleted in one and unchanged in the other
#
"$1.." | "$1.$1" | "$1$1.")
- if [ "$2" ]; then
+ if test -n "$2"
+ then
echo "Removing $4"
else
# read-tree checked that index matches HEAD already,
@@ -48,7 +49,8 @@ case "${1:-.}${2:-.}${3:-.}" in
# we do not have it in the index, though.
exec git update-index --remove -- "$4"
fi
- if test -f "$4"; then
+ if test -f "$4"
+ then
rm -f -- "$4" &&
rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || :
fi &&
@@ -78,7 +80,8 @@ case "${1:-.}${2:-.}${3:-.}" in
# Added in both, identically (check for same permissions).
#
".$3$2")
- if [ "$6" != "$7" ]; then
+ if test "$6" != "$7"
+ then
echo "ERROR: File $4 added identically in both branches,"
echo "ERROR: but permissions conflict $6->$7."
exit 1
@@ -123,7 +126,8 @@ case "${1:-.}${2:-.}${3:-.}" in
git merge-file "$src1" "$orig" "$src2"
ret=$?
msg=
- if [ $ret -ne 0 ]; then
+ if test $ret != 0
+ then
msg='content conflict'
fi
@@ -132,18 +136,22 @@ case "${1:-.}${2:-.}${3:-.}" in
git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4" || exit 1
rm -f -- "$orig" "$src1" "$src2"
- if [ "$6" != "$7" ]; then
- if [ -n "$msg" ]; then
+ if test "$6" != "$7"
+ then
+ if test -n "$msg"
+ then
msg="$msg, "
fi
msg="${msg}permissions conflict: $5->$6,$7"
ret=1
fi
- if [ "$1" = '' ]; then
+ if test -z "$1"
+ then
ret=1
fi
- if [ $ret -ne 0 ]; then
+ if test $ret != 0
+ then
echo "ERROR: $msg in $4"
exit 1
fi
--
1.8.2.rc3.21.g744ac65
next prev parent reply other threads:[~2013-03-24 12:37 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-06 20:32 [PATCH 0/2] Improve P4Merge mergetool invocation Kevin Bracey
2013-03-06 20:32 ` [PATCH 1/2] p4merge: swap LOCAL and REMOTE for mergetool Kevin Bracey
2013-03-07 0:36 ` Junio C Hamano
2013-03-07 6:16 ` Kevin Bracey
2013-03-07 7:23 ` Junio C Hamano
2013-03-07 17:14 ` Kevin Bracey
2013-03-07 19:10 ` Junio C Hamano
2013-03-07 19:50 ` David Aguilar
2013-03-07 20:31 ` Junio C Hamano
2013-03-06 20:32 ` [PATCH 2/2] p4merge: create a virtual base if none available Kevin Bracey
2013-03-07 2:23 ` David Aguilar
2013-03-07 6:28 ` Kevin Bracey
2013-03-07 7:25 ` Junio C Hamano
2013-03-07 3:33 ` David Aguilar
2013-03-09 19:20 ` [PATCH v2 0/3] Improve P4Merge mergetool invocation Kevin Bracey
2013-03-09 19:20 ` [PATCH v2 1/3] mergetools/p4merge: swap LOCAL and REMOTE Kevin Bracey
2013-03-09 19:20 ` [PATCH v2 2/3] mergetools/p4merge: create a base if none available Kevin Bracey
2013-03-10 4:55 ` Junio C Hamano
2013-03-09 19:21 ` [PATCH v2 3/3] git-merge-one-file: revise merge error reporting Kevin Bracey
2013-03-13 1:12 ` [PATCH v3 1/3] mergetools/p4merge: swap LOCAL and REMOTE Kevin Bracey
2013-03-13 1:12 ` [PATCH v3 2/3] mergetools/p4merge: create a base if none available Kevin Bracey
2013-03-13 1:12 ` [PATCH v3 3/3] git-merge-one-file: revise merge error reporting Kevin Bracey
2013-03-13 9:03 ` David Aguilar
2013-03-24 12:26 ` [PATCH v2 0/3] git-merge-one-file " Kevin Bracey
2013-03-24 12:26 ` Kevin Bracey [this message]
2013-03-24 12:26 ` [PATCH v2 2/3] git-merge-one-file: send "ERROR:" messages to stderr Kevin Bracey
2013-03-24 12:26 ` [PATCH v2 3/3] git-merge-one-file: revise merge error reporting Kevin Bracey
2013-03-25 17:04 ` Junio C Hamano
2013-03-25 17:17 ` Junio C Hamano
2013-03-25 17:20 ` Junio C Hamano
2013-03-25 19:24 ` Eric Sunshine
2013-03-13 17:57 ` [PATCH v3 " Junio C Hamano
2013-03-14 6:27 ` Kevin Bracey
2013-03-14 14:56 ` Junio C Hamano
2013-03-14 17:31 ` Kevin Bracey
2013-03-14 17:39 ` Kevin Bracey
2013-03-13 2:05 ` [PATCH v3 1/3] mergetools/p4merge: swap LOCAL and REMOTE David Aguilar
2013-03-24 11:54 ` [PATCH v4 1/2] " Kevin Bracey
2013-03-24 11:54 ` [PATCH v4 2/2] mergetools/p4merge: create a base if none available Kevin Bracey
2013-03-25 17:47 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364127985-13366-2-git-send-email-kevin@bracey.fi \
--to=kevin@bracey.fi \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).