Changes between Version 2 and Version 3 of LibavMerge

Timestamp:

Aug 4, 2016, 8:32:36 AM (10 years ago)

Author:

Timothy Gu

Comment:

Rewrite script

LibavMerge

@@ -42 +42 @@
 #!/bin/sh
 
-if [ "$1" != "merge" -a "$1" != "noop" ]; then
-    printf "Usage: $0 <merge|noop [REF_HASH]>\n"
-    exit 0
-fi
+op="$1"
+next_rev=$(git rev-list libav/master --not HEAD --no-merges | tail -n1)
 
-[ "$1" = "noop" ] && merge_opts="-s ours"
+do_merge() {
+    if [ -z "$next_rev" ]; then
+        printf "Nothing to merge..\n"
+        return 0
+    fi
 
-nextrev=$(git rev-list libav/master --not master --no-merges | tail -n1)
-if [ -z "$nextrev" ]; then
-    printf "Nothing to merge..\n"
-    exit 0
-fi
-printf "Merging $(git log -n 1 --oneline $nextrev)\n"
-git merge --no-commit $merge_opts --no-ff --log $nextrev
+    merge_opts=
+    [ "$op" = "noop" ] && merge_opts="-s ours"
 
-if [ "$1" = "noop" -a -n "$2" ]; then
-    printf "\nThis commit is a noop, see $2\n" >> .git/MERGE_MSG
-fi
+    printf "Merging $(git log -n 1 --oneline $next_rev)\n"
+    git merge --no-commit $merge_opts --no-ff --log $next_rev
 
-printf "\nMerged-by: $(git config --get user.name) <$(git config --get user.email)>\n" >> .git/MERGE_MSG
+    if [ "$op" = "noop" ]; then
+        printf "\nThis commit is a no-op." >> .git/MERGE_MSG
+        [ -n "$2" ] && printf " See $2." >> .git/MERGE_MSG
+        printf "\n" >> .git/MERGE_MSG
+    fi
+
+    printf "\nMerged-by: $(git config --get user.name) <$(git config --get user.email)>\n" >> .git/MERGE_MSG
+}
+
+case "$op" in
+next)
+    echo $next_rev
+    ;;
+show)
+    git show $next_rev
+    ;;
+merge|noop)
+    do_merge
+    ;;
+*)
+    echo "Usage: $0 <next|show|merge|noop [REF_HASH]>"
+    echo "    next  - Echo hash of the commit to be merged next"
+    echo '    show  - git show $next'
+    echo '    merge - Prepare to merge the next commit'
+    echo '    noop  - Pass up the next commit with an optional "See $REF_HASH" message'
+    ;;
+esac
 }}}