summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-02 17:53:15 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-02 17:53:15 (GMT)
commit86b13da46cd710a45a89968880c691452d5b70b4 (patch)
tree81351ad18d082a8046bed144532c70ecc1e8d8ea /git-resolve-script
parent79882c2883267e16280d630730d6a8b5a86a8092 (diff)
downloadgit-86b13da46cd710a45a89968880c691452d5b70b4.zip
git-86b13da46cd710a45a89968880c691452d5b70b4.tar.gz
git-86b13da46cd710a45a89968880c691452d5b70b4.tar.bz2
scripts: equality test '==' is not portable.
On NetBSD 3 we trigger an error: [: ==: unexpected operator Double-equal is accepted by bash built-in '[' and bash(1) suggests using '=' for strict POSIX compliance (test(1) from coreutils does not mention '=='). Eradicate their uses everywhere. [jc: Somebody with a pseudonym kindly sent a message to let me know about the problem privately; I do not have access to a NetBSD box.] Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-resolve-script')
-rwxr-xr-xgit-resolve-script10
1 files changed, 6 insertions, 4 deletions
diff --git a/git-resolve-script b/git-resolve-script
index 7c0e3d8..000cbb8 100755
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -36,19 +36,21 @@ if [ -z "$common" ]; then
die "Unable to find common commit between" $merge $head
fi
-if [ "$common" == "$merge" ]; then
+case "$common" in
+"$merge")
echo "Already up-to-date. Yeeah!"
dropheads
exit 0
-fi
-if [ "$common" == "$head" ]; then
+ ;;
+"$head")
echo "Updating from $head to $merge."
git-read-tree -u -m $head $merge || exit 1
echo $merge > "$GIT_DIR"/HEAD
git-diff-tree -p $head $merge | git-apply --stat
dropheads
exit 0
-fi
+ ;;
+esac
# Find an optimum merge base if there are more than one candidates.
LF='