Add branch.*.merge warning and documentation update

This patch clarifies the meaning of the branch.*.merge option.
Previously, if branch.*.merge was specified but did not match any
ref, the message "No changes." was not really helpful regarding
the misconfiguration. This patch adds a warning for this.

Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9090762819fac988c63eaa17089c0d4c57a8d338..21ec55797b8a17f9905ab0a667661439fbf50adb 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -125,10 +125,17 @@ apply.whitespace::
 
 branch.<name>.remote::
        When in branch <name>, it tells `git fetch` which remote to fetch.
 
 branch.<name>.remote::
        When in branch <name>, it tells `git fetch` which remote to fetch.

+       If this option is not given, `git fetch` defaults to remote "origin".

 
 branch.<name>.merge::
 
 branch.<name>.merge::

-       When in branch <name>, it tells `git fetch` the default remote branch
-       to be merged.
+       When in branch <name>, it tells `git fetch` the default refspec to
+       be marked for merging in FETCH_HEAD. The value has exactly to match
+       a remote part of one of the refspecs which are fetched from the remote
+       given by "branch.<name>.remote".
+       The merge information is used by `git pull` (which at first calls
+       `git fetch`) to lookup the default branch for merging. Without
+       this option, `git pull` defaults to merge the first refspec fetched.
+       Specify multiple values to get an octopus merge.

 
 pager.color::
        A boolean to enable/disable colored output when the pager is in
 
 pager.color::
        A boolean to enable/disable colored output when the pager is in

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index da064a53f666db52ce2341132a117355ad74d2a1..6ae534bf89a7a1fd0bfeee4248c37b4ea71290b9 100755 (executable)
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -134,6 +134,8 @@ canon_refs_list_for_fetch () {
        # or the first one otherwise; add prefix . to the rest
        # to prevent the secondary branches to be merged by default.
        merge_branches=
        # or the first one otherwise; add prefix . to the rest
        # to prevent the secondary branches to be merged by default.
        merge_branches=

+       found_mergeref=
+       curr_branch=

        if test "$1" = "-d"
        then
                shift ; remote="$1" ; shift
        if test "$1" = "-d"
        then
                shift ; remote="$1" ; shift


@@ -171,6 +173,10 @@ canon_refs_list_for_fetch () {
                            dot_prefix= && break
                        done
                fi
                            dot_prefix= && break
                        done
                fi

+               if test -z $dot_prefix
+               then
+                       found_mergeref=true
+               fi

                case "$remote" in
                '') remote=HEAD ;;
                refs/heads/* | refs/tags/* | refs/remotes/*) ;;
                case "$remote" in
                '') remote=HEAD ;;
                refs/heads/* | refs/tags/* | refs/remotes/*) ;;


@@ -191,6 +197,11 @@ canon_refs_list_for_fetch () {
                fi
                echo "${dot_prefix}${force}${remote}:${local}"
        done
                fi
                echo "${dot_prefix}${force}${remote}:${local}"
        done

+       if test -z "$found_mergeref" -a "$curr_branch"
+       then
+               echo >&2 "Warning: No merge candidate found because value of config option
+         \"branch.${curr_branch}.merge\" does not match any remote branch fetched."
+       fi

 }
 
 # Returns list of src: (no store), or src:dst (store)
 }
 
 # Returns list of src: (no store), or src:dst (store)