summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
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='