fetch: get the remote branches to merge from the branch properties

If in branch "foo" and this in config:

[branch "foo"]
merge=bar

"git fetch": fetch from the default repository and program the "bar"
branch to be merged with pull.

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 04c5094fdd4c5e66b186107c0f64d3a82e1e8aa5..98c1f3e2e32e71047d6f0f6cf982e207117c64e2 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -122,6 +122,10 @@ 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.
 

+branch.<name>.merge::
+       When in branch <name>, it tells `git fetch` the default remote branch
+       to be merged.
+

 pager.color::
        A boolean to enable/disable colored output when the pager is in
        use (default is true).
 pager.color::
        A boolean to enable/disable colored output when the pager is in
        use (default is true).

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 69998169b7f2a2a07363a7d1416be129bca82e84..c325ef761e4c558ab5c7c560da942e127e1be040 100755 (executable)
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -92,9 +92,22 @@ get_remote_default_refs_for_push () {
 
 # Subroutine to canonicalize remote:local notation.
 canon_refs_list_for_fetch () {
 
 # Subroutine to canonicalize remote:local notation.
 canon_refs_list_for_fetch () {

-       # Leave only the first one alone; add prefix . to the rest
+       # If called from get_remote_default_refs_for_fetch
+       # leave the branches in branch.${curr_branch}.merge alone,
+       # or the first one otherwise; add prefix . to the rest

        # to prevent the secondary branches to be merged by default.
        # to prevent the secondary branches to be merged by default.

-       dot_prefix=
+       merge_branches=
+       if test "$1" = "-d"
+       then
+               shift ; remote="$1" ; shift
+               if test "$remote" = "$(get_default_remote)"
+               then
+                       curr_branch=$(git-symbolic-ref HEAD | \
+                           sed -e 's|^refs/heads/||')
+                       merge_branches=$(git-repo-config \
+                           --get-all "branch.${curr_branch}.merge")
+               fi
+       fi

        for ref
        do
                force=
        for ref
        do
                force=


@@ -107,6 +120,18 @@ canon_refs_list_for_fetch () {
                expr "z$ref" : 'z.*:' >/dev/null || ref="${ref}:"
                remote=$(expr "z$ref" : 'z\([^:]*\):')
                local=$(expr "z$ref" : 'z[^:]*:\(.*\)')
                expr "z$ref" : 'z.*:' >/dev/null || ref="${ref}:"
                remote=$(expr "z$ref" : 'z\([^:]*\):')
                local=$(expr "z$ref" : 'z[^:]*:\(.*\)')

+               dot_prefix=.
+               if test -z "$merge_branches"
+               then
+                       merge_branches=$remote
+                       dot_prefix=
+               else
+                       for merge_branch in $merge_branches
+                       do
+                           [ "$remote" = "$merge_branch" ] &&
+                           dot_prefix= && break
+                       done
+               fi

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


@@ -126,7 +151,6 @@ canon_refs_list_for_fetch () {
                   die "* refusing to create funny ref '$local_ref_name' locally"
                fi
                echo "${dot_prefix}${force}${remote}:${local}"
                   die "* refusing to create funny ref '$local_ref_name' locally"
                fi
                echo "${dot_prefix}${force}${remote}:${local}"

-               dot_prefix=.

        done
 }
 
        done
 }
 


@@ -137,7 +161,7 @@ get_remote_default_refs_for_fetch () {
        '' | config-partial | branches-partial)
                echo "HEAD:" ;;
        config)
        '' | config-partial | branches-partial)
                echo "HEAD:" ;;
        config)

-               canon_refs_list_for_fetch \
+               canon_refs_list_for_fetch -d "$1" \

                        $(git-repo-config --get-all "remote.$1.fetch") ;;
        branches)
                remote_branch=$(sed -ne '/#/s/.*#//p' "$GIT_DIR/branches/$1")
                        $(git-repo-config --get-all "remote.$1.fetch") ;;
        branches)
                remote_branch=$(sed -ne '/#/s/.*#//p' "$GIT_DIR/branches/$1")


@@ -145,10 +169,7 @@ get_remote_default_refs_for_fetch () {
                echo "refs/heads/${remote_branch}:refs/heads/$1"
                ;;
        remotes)
                echo "refs/heads/${remote_branch}:refs/heads/$1"
                ;;
        remotes)

-               # This prefixes the second and later default refspecs
-               # with a '.', to signal git-fetch to mark them
-               # not-for-merge.
-               canon_refs_list_for_fetch $(sed -ne '/^Pull: */{
+               canon_refs_list_for_fetch -d "$1" $(sed -ne '/^Pull: */{

                                                s///p
                                        }' "$GIT_DIR/remotes/$1")
                ;;
                                                s///p
                                        }' "$GIT_DIR/remotes/$1")
                ;;