git-merge: add support for branch.<name>.mergeoptions

diff --git a/git-merge.sh b/git-merge.sh
index 49185eb5d2199a39d3f7a02ef1c1cc054634cf94..a35b15157bd2838175e8400e67ca272b39b8e921 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -168,9 +168,30 @@ parse_option () {
        args_left=$#
 }
 
+parse_config () {
+       while test $# -gt 0
+       do
+               parse_option "$@" || usage
+               while test $args_left -lt $#
+               do
+                       shift
+               done
+       done
+}
+
 test $# != 0 || usage
 
 have_message=
+
+if branch=$(git-symbolic-ref -q HEAD)
+then
+       mergeopts=$(git config "branch.${branch#refs/heads/}.mergeoptions")
+       if test -n "$mergeopts"
+       then
+               parse_config $mergeopts
+       fi
+fi
+
 while parse_option "$@"
 do
        while test $args_left -lt $#