git-pull: refuse default merge without branch.*.merge

diff --git a/git-clone.sh b/git-clone.sh
index 3f006d1a778636e5906ad9e8671adb6561fa0d98..422499a5372e5662fbf7ca36ad260229ec03331e 100755 (executable)
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -14,7 +14,7 @@ die() {
 }
 
 usage() {
-       die "Usage: $0 [--template=<template_directory>] [--use-separate-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [--origin <name>] [-n] <repo> [<dir>]"
+       die "Usage: $0 [--template=<template_directory>] [--no-separate-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [--origin <name>] [-n] <repo> [<dir>]"
 }
 
 get_repo_base() {
@@ -48,6 +48,10 @@ Perhaps git-update-server-info needs to be run there?"
                case "$name" in
                *^*)    continue;;
                esac
+               case "$bare,$name" in
+               yes,* | ,heads/* | ,tags/*) ;;
+               *)      continue ;;
+               esac
                if test -n "$use_separate_remote" &&
                   branch_name=`expr "z$name" : 'zheads/\(.*\)'`
                then
@@ -115,7 +119,7 @@ bare=
 reference=
 origin=
 origin_override=
-use_separate_remote=
+use_separate_remote=t
 while
        case "$#,$1" in
        0,*) break ;;
@@ -134,7 +138,10 @@ while
          template="$1" ;;
        *,-q|*,--quiet) quiet=-q ;;
        *,--use-separate-remote)
+               # default
                use_separate_remote=t ;;
+       *,--no-separate-remote)
+               use_separate_remote= ;;
        1,--reference) usage ;;
        *,--reference)
                shift; reference="$1" ;;
@@ -169,18 +176,15 @@ repo="$1"
 test -n "$repo" ||
     die 'you must specify a repository to clone.'
 
-# --bare implies --no-checkout
+# --bare implies --no-checkout and --no-separate-remote
 if test yes = "$bare"
 then
        if test yes = "$origin_override"
        then
                die '--bare and --origin $origin options are incompatible.'
        fi
-       if test t = "$use_separate_remote"
-       then
-               die '--bare and --use-separate-remote options are incompatible.'
-       fi
        no_checkout=yes
+       use_separate_remote=
 fi
 
 if test -z "$origin"
@@ -362,41 +366,56 @@ then
                )
        )
 
-       # Write out remotes/$origin file, and update our "$head_points_at".
+       # Write out remote.$origin config, and update our "$head_points_at".
        case "$head_points_at" in
        ?*)
-               mkdir -p "$GIT_DIR/remotes" &&
+               # Local default branch
                git-symbolic-ref HEAD "refs/heads/$head_points_at" &&
+
+               # Tracking branch for the primary branch at the remote.
                case "$use_separate_remote" in
                t)      origin_track="$remote_top/$head_points_at"
                        git-update-ref HEAD "$head_sha1" ;;
                *)      origin_track="$remote_top/$origin"
                        git-update-ref "refs/heads/$origin" "$head_sha1" ;;
                esac &&
-               echo >"$GIT_DIR/remotes/$origin" \
-               "URL: $repo
-Pull: refs/heads/$head_points_at:$origin_track" &&
-               (cd "$GIT_DIR/$remote_top" && find . -type f -print) |
-               while read dotslref
-               do
-                       name=`expr "$dotslref" : './\(.*\)'`
-                       if test "z$head_points_at" = "z$name"
-                       then
-                               continue
-                       fi
-                       if test "$use_separate_remote" = '' &&
-                          test "z$origin" = "z$name"
-                       then
-                               continue
-                       fi
-                       echo "Pull: refs/heads/${name}:$remote_top/${name}"
-               done >>"$GIT_DIR/remotes/$origin" &&
+
+               # Upstream URL and the primary branch tracking
+               git-repo-config remote."$origin".url "$repo" &&
+               git-repo-config remote."$origin".fetch \
+                       "refs/heads/$head_points_at:$origin_track" &&
+
+               # Set up the mappings to track the remaining branches.
+               case "$use_separate_remote" in
+               t)
+                       git-repo-config remote."$origin".fetch \
+                               "refs/heads/*:$remote_top/*" '^$'
+                       ;;
+               *)
+                       (cd "$GIT_DIR/$remote_top" && find . -type f -print) |
+                       while read dotslref
+                       do
+                               name=`expr "$dotslref" : './\(.*\)'`
+                               if test "z$head_points_at" = "z$name" ||
+                                       test "z$origin" = "z$name"
+                               then
+                                       continue
+                               fi
+                               git-repo-config remote."$origin".fetch \
+                               "refs/heads/${name}:$remote_top/${name}" '^$'
+                       done
+                       ;;
+               esac &&
+
                case "$use_separate_remote" in
                t)
                        rm -f "refs/remotes/$origin/HEAD"
                        git-symbolic-ref "refs/remotes/$origin/HEAD" \
                                "refs/remotes/$origin/$head_points_at"
-               esac
+               esac &&
+
+               git-repo-config branch."$head_points_at".remote "$origin" &&
+               git-repo-config branch."$head_points_at".merge "refs/heads/$head_points_at"
        esac
 
        case "$no_checkout" in