Merge branch 'ms/remote-tracking-branches-in-doc'

* ms/remote-tracking-branches-in-doc:
Change "remote tracking" to "remote-tracking"

diff --combined builtin/clone.c
index 14b13235682add18daf625295d746ca5dea7ebcc,9d98cb5acb0d97b500714487a818494e09edb2b7..17f57cdf29a4c74550795ce3f711fbfc57bf38b3
--- 1/builtin/clone.c
--- 2/builtin/clone.c
+++ b/builtin/clone.c
@@@ -18,6 -18,7 +18,6 @@@
  #include "transport.h"
  #include "strbuf.h"
  #include "dir.h"
 -#include "pack-refs.h"
  #include "sigchain.h"
  #include "branch.h"
  #include "remote.h"
@@@ -493,16 -494,13 +493,16 @@@ static void write_remote_refs(const str
  {
        const struct ref *r;
  
 +      lock_packed_refs(LOCK_DIE_ON_ERROR);
 +
        for (r = local_refs; r; r = r->next) {
                if (!r->peer_ref)
                        continue;
                add_packed_ref(r->peer_ref->name, r->old_sha1);
        }
  
 -      pack_refs(PACK_REFS_ALL);
 +      if (commit_packed_refs())
 +              die_errno("unable to overwrite old ref-pack file");
  }
  
  static void write_followtags(const struct ref *refs, const char *msg)
@@@ -544,15 -542,13 +544,15 @@@ static void update_remote_refs(const st
                               const struct ref *mapped_refs,
                               const struct ref *remote_head_points_at,
                               const char *branch_top,
 -                             const char *msg)
 +                             const char *msg,
 +                             struct transport *transport)
  {
        const struct ref *rm = mapped_refs;
  
        if (0 <= option_verbosity)
                printf(_("Checking connectivity... "));
 -      if (check_everything_connected(iterate_ref_map, 0, &rm))
 +      if (check_everything_connected_with_transport(iterate_ref_map,
 +                                                    0, &rm, transport))
                die(_("remote did not send all necessary objects"));
        if (0 <= option_verbosity)
                printf(_("done\n"));
@@@ -701,7 -697,7 +701,7 @@@ static void write_refspec_config(const 
                        /*
                         * otherwise, the next "git fetch" will
                         * simply fetch from HEAD without updating
-                        * any remote tracking branch, which is what
+                        * any remote-tracking branch, which is what
                         * we want.
                         */
                } else {
@@@ -791,8 -787,6 +791,8 @@@ int cmd_clone(int argc, const char **ar
        is_local = option_local != 0 && path && !is_bundle;
        if (is_local && option_depth)
                warning(_("--depth is ignored in local clones; use file:// instead."));
 +      if (option_local > 0 && !is_local)
 +              warning(_("--local is ignored"));
  
        if (argc == 2)
                dir = xstrdup(argv[1]);
@@@ -899,9 -893,6 +899,9 @@@
                if (option_upload_pack)
                        transport_set_option(transport, TRANS_OPT_UPLOADPACK,
                                             option_upload_pack);
 +
 +              if (transport->smart_options && !option_depth)
 +                      transport->smart_options->check_self_contained_and_connected = 1;
        }
  
        refs = transport_get_remote_refs(transport);
@@@ -963,7 -954,7 +963,7 @@@
                transport_fetch_refs(transport, mapped_refs);
  
        update_remote_refs(refs, mapped_refs, remote_head_points_at,
 -                         branch_top.buf, reflog_msg.buf);
 +                         branch_top.buf, reflog_msg.buf, transport);
  
        update_head(our_head_points_at, remote_head, reflog_msg.buf);
  

diff --combined builtin/merge.c
index 2ebe732896c1b3bfd920941b5182b793468c0afe,622f5db89aff73b4a6e6c6c7d2e3792dfd1de1b2..bad4536a8738237a87e51011f074814bd8b10ba3
--- 1/builtin/merge.c
--- 2/builtin/merge.c
+++ b/builtin/merge.c
@@@ -948,7 -948,7 +948,7 @@@ static int evaluate_result(void
  }
  
  /*
-  * Pretend as if the user told us to merge with the tracking
+  * Pretend as if the user told us to merge with the remote-tracking
   * branch we have for the upstream of the current branch
   */
  static int setup_with_upstream(const char ***argv)
@@@ -967,7 -967,7 +967,7 @@@
        args = xcalloc(branch->merge_nr + 1, sizeof(char *));
        for (i = 0; i < branch->merge_nr; i++) {
                if (!branch->merge[i]->dst)
-                       die(_("No remote tracking branch for %s from %s"),
+                       die(_("No remote-tracking branch for %s from %s"),
                            branch->merge[i]->src, branch->remote_name);
                args[i] = branch->merge[i]->dst;
        }
@@@ -1054,8 -1054,7 +1054,8 @@@ static struct commit_list *collect_pare
        for (i = 0; i < argc; i++) {
                struct commit *commit = get_merge_parent(argv[i]);
                if (!commit)
 -                      die(_("%s - not something we can merge"), argv[i]);
 +                      help_unknown_ref(argv[i], "merge",
 +                                       "not something we can merge");
                remotes = &commit_list_insert(commit, remotes)->next;
        }
        *remotes = NULL;

diff --combined t/t5505-remote.sh
index ee5d65d52f6d1d4dba6b1664f4dae23ebe69429d,8d0f3e3078d665ddfb2b9ca23977ac3285b6cf13..8f6e3922dce2b676221610d83a87c5b36d3bc5b6
--- 1/t/t5505-remote.sh
--- 2/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@@ -42,104 -42,107 +42,104 @@@ check_tracking_branch () 
  }
  
  test_expect_success setup '
 -
        setup_repository one &&
        setup_repository two &&
        (
 -              cd two && git branch another
 +              cd two &&
 +              git branch another
        ) &&
        git clone one test
 -
  '
  
  test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' '
 -(
 -      cd test &&
 -      tokens_match origin "$(git remote)" &&
 -      check_remote_track origin master side &&
 -      check_tracking_branch origin HEAD master side
 -)
 +      (
 +              cd test &&
 +              tokens_match origin "$(git remote)" &&
 +              check_remote_track origin master side &&
 +              check_tracking_branch origin HEAD master side
 +      )
  '
  
  test_expect_success 'add another remote' '
 -(
 -      cd test &&
 -      git remote add -f second ../two &&
 -      tokens_match "origin second" "$(git remote)" &&
 -      check_tracking_branch second master side another &&
 -      git for-each-ref "--format=%(refname)" refs/remotes |
 -      sed -e "/^refs\/remotes\/origin\//d" \
 -          -e "/^refs\/remotes\/second\//d" >actual &&
 -      >expect &&
 -      test_cmp expect actual
 -)
 +      (
 +              cd test &&
 +              git remote add -f second ../two &&
 +              tokens_match "origin second" "$(git remote)" &&
 +              check_tracking_branch second master side another &&
 +              git for-each-ref "--format=%(refname)" refs/remotes |
 +              sed -e "/^refs\/remotes\/origin\//d" \
 +                  -e "/^refs\/remotes\/second\//d" >actual &&
 +              >expect &&
 +              test_cmp expect actual
 +      )
  '
  
- test_expect_success C_LOCALE_OUTPUT 'check remote tracking' '
+ test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' '
 -(
 -      cd test &&
 -      check_remote_track origin master side &&
 -      check_remote_track second master side another
 -)
 +      (
 +              cd test &&
 +              check_remote_track origin master side &&
 +              check_remote_track second master side another
 +      )
  '
  
  test_expect_success 'remote forces tracking branches' '
 -(
 -      cd test &&
 -      case `git config remote.second.fetch` in
 -      +*) true ;;
 -       *) false ;;
 -      esac
 -)
 +      (
 +              cd test &&
 +              case `git config remote.second.fetch` in
 +              +*) true ;;
 +               *) false ;;
 +              esac
 +      )
  '
  
  test_expect_success 'remove remote' '
 -(
 -      cd test &&
 -      git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/master &&
 -      git remote rm second
 -)
 +      (
 +              cd test &&
 +              git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/master &&
 +              git remote rm second
 +      )
  '
  
  test_expect_success C_LOCALE_OUTPUT 'remove remote' '
 -(
 -      cd test &&
 -      tokens_match origin "$(git remote)" &&
 -      check_remote_track origin master side &&
 -      git for-each-ref "--format=%(refname)" refs/remotes |
 -      sed -e "/^refs\/remotes\/origin\//d" >actual &&
 -      >expect &&
 -      test_cmp expect actual
 -)
 +      (
 +              cd test &&
 +              tokens_match origin "$(git remote)" &&
 +              check_remote_track origin master side &&
 +              git for-each-ref "--format=%(refname)" refs/remotes |
 +              sed -e "/^refs\/remotes\/origin\//d" >actual &&
 +              >expect &&
 +              test_cmp expect actual
 +      )
  '
  
  test_expect_success 'remove remote protects local branches' '
 -(
 -      cd test &&
 -      { cat >expect1 <<EOF
 -Note: A branch outside the refs/remotes/ hierarchy was not removed;
 -to delete it, use:
 -  git branch -d master
 -EOF
 -      } &&
 -      { cat >expect2 <<EOF
 -Note: Some branches outside the refs/remotes/ hierarchy were not removed;
 -to delete them, use:
 -  git branch -d foobranch
 -  git branch -d master
 -EOF
 -      } &&
 -      git tag footag &&
 -      git config --add remote.oops.fetch "+refs/*:refs/*" &&
 -      git remote remove oops 2>actual1 &&
 -      git branch foobranch &&
 -      git config --add remote.oops.fetch "+refs/*:refs/*" &&
 -      git remote rm oops 2>actual2 &&
 -      git branch -d foobranch &&
 -      git tag -d footag &&
 -      test_i18ncmp expect1 actual1 &&
 -      test_i18ncmp expect2 actual2
 -)
 -'
 -
 -cat > test/expect << EOF
 +      (
 +              cd test &&
 +              cat >expect1 <<-\EOF &&
 +              Note: A branch outside the refs/remotes/ hierarchy was not removed;
 +              to delete it, use:
 +                git branch -d master
 +              EOF
 +              cat >expect2 <<-\EOF &&
 +              Note: Some branches outside the refs/remotes/ hierarchy were not removed;
 +              to delete them, use:
 +                git branch -d foobranch
 +                git branch -d master
 +              EOF
 +              git tag footag &&
 +              git config --add remote.oops.fetch "+refs/*:refs/*" &&
 +              git remote remove oops 2>actual1 &&
 +              git branch foobranch &&
 +              git config --add remote.oops.fetch "+refs/*:refs/*" &&
 +              git remote rm oops 2>actual2 &&
 +              git branch -d foobranch &&
 +              git tag -d footag &&
 +              test_i18ncmp expect1 actual1 &&
 +              test_i18ncmp expect2 actual2
 +      )
 +'
 +
 +cat >test/expect <<EOF
  * remote origin
    Fetch URL: $(pwd)/one
    Push  URL: $(pwd)/one
@@@ -169,40 -172,36 +169,40 @@@
  EOF
  
  test_expect_success 'show' '
 -      (cd test &&
 -       git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
 -       git fetch &&
 -       git checkout -b ahead origin/master &&
 -       echo 1 >> file &&
 -       test_tick &&
 -       git commit -m update file &&
 -       git checkout master &&
 -       git branch --track octopus origin/master &&
 -       git branch --track rebase origin/master &&
 -       git branch -d -r origin/master &&
 -       git config --add remote.two.url ../two &&
 -       git config --add remote.two.pushurl ../three &&
 -       git config branch.rebase.rebase true &&
 -       git config branch.octopus.merge "topic-a topic-b topic-c" &&
 -       (cd ../one &&
 -        echo 1 > file &&
 -        test_tick &&
 -        git commit -m update file) &&
 -       git config --add remote.origin.push : &&
 -       git config --add remote.origin.push refs/heads/master:refs/heads/upstream &&
 -       git config --add remote.origin.push +refs/tags/lastbackup &&
 -       git config --add remote.two.push +refs/heads/ahead:refs/heads/master &&
 -       git config --add remote.two.push refs/heads/master:refs/heads/another &&
 -       git remote show origin two > output &&
 -       git branch -d rebase octopus &&
 -       test_i18ncmp expect output)
 -'
 -
 -cat > test/expect << EOF
 +      (
 +              cd test &&
 +              git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
 +              git fetch &&
 +              git checkout -b ahead origin/master &&
 +              echo 1 >>file &&
 +              test_tick &&
 +              git commit -m update file &&
 +              git checkout master &&
 +              git branch --track octopus origin/master &&
 +              git branch --track rebase origin/master &&
 +              git branch -d -r origin/master &&
 +              git config --add remote.two.url ../two &&
 +              git config --add remote.two.pushurl ../three &&
 +              git config branch.rebase.rebase true &&
 +              git config branch.octopus.merge "topic-a topic-b topic-c" &&
 +              (
 +                      cd ../one &&
 +                      echo 1 >file &&
 +                      test_tick &&
 +                      git commit -m update file
 +              ) &&
 +              git config --add remote.origin.push : &&
 +              git config --add remote.origin.push refs/heads/master:refs/heads/upstream &&
 +              git config --add remote.origin.push +refs/tags/lastbackup &&
 +              git config --add remote.two.push +refs/heads/ahead:refs/heads/master &&
 +              git config --add remote.two.push refs/heads/master:refs/heads/another &&
 +              git remote show origin two >output &&
 +              git branch -d rebase octopus &&
 +              test_i18ncmp expect output
 +      )
 +'
 +
 +cat >test/expect <<EOF
  * remote origin
    Fetch URL: $(pwd)/one
    Push  URL: $(pwd)/one
@@@ -220,187 -219,152 +220,187 @@@
  EOF
  
  test_expect_success 'show -n' '
 -      (mv one one.unreachable &&
 -       cd test &&
 -       git remote show -n origin > output &&
 -       mv ../one.unreachable ../one &&
 -       test_i18ncmp expect output)
 +      mv one one.unreachable &&
 +      (
 +              cd test &&
 +              git remote show -n origin >output &&
 +              mv ../one.unreachable ../one &&
 +              test_i18ncmp expect output
 +      )
  '
  
  test_expect_success 'prune' '
 -      (cd one &&
 -       git branch -m side side2) &&
 -      (cd test &&
 -       git fetch origin &&
 -       git remote prune origin &&
 -       git rev-parse refs/remotes/origin/side2 &&
 -       test_must_fail git rev-parse refs/remotes/origin/side)
 +      (
 +              cd one &&
 +              git branch -m side side2
 +      ) &&
 +      (
 +              cd test &&
 +              git fetch origin &&
 +              git remote prune origin &&
 +              git rev-parse refs/remotes/origin/side2 &&
 +              test_must_fail git rev-parse refs/remotes/origin/side
 +      )
  '
  
  test_expect_success 'set-head --delete' '
 -      (cd test &&
 -       git symbolic-ref refs/remotes/origin/HEAD &&
 -       git remote set-head --delete origin &&
 -       test_must_fail git symbolic-ref refs/remotes/origin/HEAD)
 +      (
 +              cd test &&
 +              git symbolic-ref refs/remotes/origin/HEAD &&
 +              git remote set-head --delete origin &&
 +              test_must_fail git symbolic-ref refs/remotes/origin/HEAD
 +      )
  '
  
  test_expect_success 'set-head --auto' '
 -      (cd test &&
 -       git remote set-head --auto origin &&
 -       echo refs/remotes/origin/master >expect &&
 -       git symbolic-ref refs/remotes/origin/HEAD >output &&
 -       test_cmp expect output
 +      (
 +              cd test &&
 +              git remote set-head --auto origin &&
 +              echo refs/remotes/origin/master >expect &&
 +              git symbolic-ref refs/remotes/origin/HEAD >output &&
 +              test_cmp expect output
        )
  '
  
 -cat >test/expect <<EOF
 +cat >test/expect <<\EOF
  error: Multiple remote HEAD branches. Please choose one explicitly with:
    git remote set-head two another
    git remote set-head two master
  EOF
  
  test_expect_success 'set-head --auto fails w/multiple HEADs' '
 -      (cd test &&
 -       test_must_fail git remote set-head --auto two >output 2>&1 &&
 -      test_i18ncmp expect output)
 +      (
 +              cd test &&
 +              test_must_fail git remote set-head --auto two >output 2>&1 &&
 +              test_i18ncmp expect output
 +      )
  '
  
 -cat >test/expect <<EOF
 +cat >test/expect <<\EOF
  refs/remotes/origin/side2
  EOF
  
  test_expect_success 'set-head explicit' '
 -      (cd test &&
 -       git remote set-head origin side2 &&
 -       git symbolic-ref refs/remotes/origin/HEAD >output &&
 -       git remote set-head origin master &&
 -       test_cmp expect output)
 +      (
 +              cd test &&
 +              git remote set-head origin side2 &&
 +              git symbolic-ref refs/remotes/origin/HEAD >output &&
 +              git remote set-head origin master &&
 +              test_cmp expect output
 +      )
  '
  
 -cat > test/expect << EOF
 +cat >test/expect <<EOF
  Pruning origin
  URL: $(pwd)/one
   * [would prune] origin/side2
  EOF
  
  test_expect_success 'prune --dry-run' '
 -      (cd one &&
 -       git branch -m side2 side) &&
 -      (cd test &&
 -       git remote prune --dry-run origin > output &&
 -       git rev-parse refs/remotes/origin/side2 &&
 -       test_must_fail git rev-parse refs/remotes/origin/side &&
 -      (cd ../one &&
 -       git branch -m side side2) &&
 -       test_i18ncmp expect output)
 +      (
 +              cd one &&
 +              git branch -m side2 side) &&
 +      (
 +              cd test &&
 +              git remote prune --dry-run origin >output &&
 +              git rev-parse refs/remotes/origin/side2 &&
 +              test_must_fail git rev-parse refs/remotes/origin/side &&
 +      (
 +              cd ../one &&
 +              git branch -m side side2) &&
 +              test_i18ncmp expect output
 +      )
  '
  
  test_expect_success 'add --mirror && prune' '
 -      (mkdir mirror &&
 -       cd mirror &&
 -       git init --bare &&
 -       git remote add --mirror -f origin ../one) &&
 -      (cd one &&
 -       git branch -m side2 side) &&
 -      (cd mirror &&
 -       git rev-parse --verify refs/heads/side2 &&
 -       test_must_fail git rev-parse --verify refs/heads/side &&
 -       git fetch origin &&
 -       git remote prune origin &&
 -       test_must_fail git rev-parse --verify refs/heads/side2 &&
 -       git rev-parse --verify refs/heads/side)
 +      mkdir mirror &&
 +      (
 +              cd mirror &&
 +              git init --bare &&
 +              git remote add --mirror -f origin ../one
 +      ) &&
 +      (
 +              cd one &&
 +              git branch -m side2 side
 +      ) &&
 +      (
 +              cd mirror &&
 +              git rev-parse --verify refs/heads/side2 &&
 +              test_must_fail git rev-parse --verify refs/heads/side &&
 +              git fetch origin &&
 +              git remote prune origin &&
 +              test_must_fail git rev-parse --verify refs/heads/side2 &&
 +              git rev-parse --verify refs/heads/side
 +      )
  '
  
  test_expect_success 'add --mirror=fetch' '
        mkdir mirror-fetch &&
        git init mirror-fetch/parent &&
 -      (cd mirror-fetch/parent &&
 -       test_commit one) &&
 +      (
 +              cd mirror-fetch/parent &&
 +              test_commit one
 +      ) &&
        git init --bare mirror-fetch/child &&
 -      (cd mirror-fetch/child &&
 -       git remote add --mirror=fetch -f parent ../parent)
 +      (
 +              cd mirror-fetch/child &&
 +              git remote add --mirror=fetch -f parent ../parent
 +      )
  '
  
  test_expect_success 'fetch mirrors act as mirrors during fetch' '
 -      (cd mirror-fetch/parent &&
 -       git branch new &&
 -       git branch -m master renamed
 +      (
 +              cd mirror-fetch/parent &&
 +              git branch new &&
 +              git branch -m master renamed
        ) &&
 -      (cd mirror-fetch/child &&
 -       git fetch parent &&
 -       git rev-parse --verify refs/heads/new &&
 -       git rev-parse --verify refs/heads/renamed
 +      (
 +              cd mirror-fetch/child &&
 +              git fetch parent &&
 +              git rev-parse --verify refs/heads/new &&
 +              git rev-parse --verify refs/heads/renamed
        )
  '
  
  test_expect_success 'fetch mirrors can prune' '
 -      (cd mirror-fetch/child &&
 -       git remote prune parent &&
 -       test_must_fail git rev-parse --verify refs/heads/master
 +      (
 +              cd mirror-fetch/child &&
 +              git remote prune parent &&
 +              test_must_fail git rev-parse --verify refs/heads/master
        )
  '
  
  test_expect_success 'fetch mirrors do not act as mirrors during push' '
 -      (cd mirror-fetch/parent &&
 -       git checkout HEAD^0
 +      (
 +              cd mirror-fetch/parent &&
 +              git checkout HEAD^0
        ) &&
 -      (cd mirror-fetch/child &&
 -       git branch -m renamed renamed2 &&
 -       git push parent :
 +      (
 +              cd mirror-fetch/child &&
 +              git branch -m renamed renamed2 &&
 +              git push parent :
        ) &&
 -      (cd mirror-fetch/parent &&
 -       git rev-parse --verify renamed &&
 -       test_must_fail git rev-parse --verify refs/heads/renamed2
 +      (
 +              cd mirror-fetch/parent &&
 +              git rev-parse --verify renamed &&
 +              test_must_fail git rev-parse --verify refs/heads/renamed2
        )
  '
  
  test_expect_success 'add fetch mirror with specific branches' '
        git init --bare mirror-fetch/track &&
 -      (cd mirror-fetch/track &&
 -       git remote add --mirror=fetch -t heads/new parent ../parent
 +      (
 +              cd mirror-fetch/track &&
 +              git remote add --mirror=fetch -t heads/new parent ../parent
        )
  '
  
  test_expect_success 'fetch mirror respects specific branches' '
 -      (cd mirror-fetch/track &&
 -       git fetch parent &&
 -       git rev-parse --verify refs/heads/new &&
 -       test_must_fail git rev-parse --verify refs/heads/renamed
 +      (
 +              cd mirror-fetch/track &&
 +              git fetch parent &&
 +              git rev-parse --verify refs/heads/new &&
 +              test_must_fail git rev-parse --verify refs/heads/renamed
        )
  '
  
@@@ -408,72 -372,60 +408,72 @@@ test_expect_success 'add --mirror=push
        mkdir mirror-push &&
        git init --bare mirror-push/public &&
        git init mirror-push/private &&
 -      (cd mirror-push/private &&
 -       test_commit one &&
 -       git remote add --mirror=push public ../public
 +      (
 +              cd mirror-push/private &&
 +              test_commit one &&
 +              git remote add --mirror=push public ../public
        )
  '
  
  test_expect_success 'push mirrors act as mirrors during push' '
 -      (cd mirror-push/private &&
 -       git branch new &&
 -       git branch -m master renamed &&
 -       git push public
 +      (
 +              cd mirror-push/private &&
 +              git branch new &&
 +              git branch -m master renamed &&
 +              git push public
        ) &&
 -      (cd mirror-push/private &&
 -       git rev-parse --verify refs/heads/new &&
 -       git rev-parse --verify refs/heads/renamed &&
 -       test_must_fail git rev-parse --verify refs/heads/master
 +      (
 +              cd mirror-push/private &&
 +              git rev-parse --verify refs/heads/new &&
 +              git rev-parse --verify refs/heads/renamed &&
 +              test_must_fail git rev-parse --verify refs/heads/master
        )
  '
  
  test_expect_success 'push mirrors do not act as mirrors during fetch' '
 -      (cd mirror-push/public &&
 -       git branch -m renamed renamed2 &&
 -       git symbolic-ref HEAD refs/heads/renamed2
 +      (
 +              cd mirror-push/public &&
 +              git branch -m renamed renamed2 &&
 +              git symbolic-ref HEAD refs/heads/renamed2
        ) &&
 -      (cd mirror-push/private &&
 -       git fetch public &&
 -       git rev-parse --verify refs/heads/renamed &&
 -       test_must_fail git rev-parse --verify refs/heads/renamed2
 +      (
 +              cd mirror-push/private &&
 +              git fetch public &&
 +              git rev-parse --verify refs/heads/renamed &&
 +              test_must_fail git rev-parse --verify refs/heads/renamed2
        )
  '
  
  test_expect_success 'push mirrors do not allow you to specify refs' '
        git init mirror-push/track &&
 -      (cd mirror-push/track &&
 -       test_must_fail git remote add --mirror=push -t new public ../public
 +      (
 +              cd mirror-push/track &&
 +              test_must_fail git remote add --mirror=push -t new public ../public
        )
  '
  
  test_expect_success 'add alt && prune' '
 -      (mkdir alttst &&
 -       cd alttst &&
 -       git init &&
 -       git remote add -f origin ../one &&
 -       git config remote.alt.url ../one &&
 -       git config remote.alt.fetch "+refs/heads/*:refs/remotes/origin/*") &&
 -      (cd one &&
 -       git branch -m side side2) &&
 -      (cd alttst &&
 -       git rev-parse --verify refs/remotes/origin/side &&
 -       test_must_fail git rev-parse --verify refs/remotes/origin/side2 &&
 -       git fetch alt &&
 -       git remote prune alt &&
 -       test_must_fail git rev-parse --verify refs/remotes/origin/side &&
 -       git rev-parse --verify refs/remotes/origin/side2)
 +      mkdir alttst &&
 +      (
 +              cd alttst &&
 +              git init &&
 +              git remote add -f origin ../one &&
 +              git config remote.alt.url ../one &&
 +              git config remote.alt.fetch "+refs/heads/*:refs/remotes/origin/*"
 +      ) &&
 +      (
 +              cd one &&
 +              git branch -m side side2
 +      ) &&
 +      (
 +              cd alttst &&
 +              git rev-parse --verify refs/remotes/origin/side &&
 +              test_must_fail git rev-parse --verify refs/remotes/origin/side2 &&
 +              git fetch alt &&
 +              git remote prune alt &&
 +              test_must_fail git rev-parse --verify refs/remotes/origin/side &&
 +              git rev-parse --verify refs/remotes/origin/side2
 +      )
  '
  
  cat >test/expect <<\EOF
@@@ -481,24 -433,20 +481,24 @@@ some-ta
  EOF
  
  test_expect_success 'add with reachable tags (default)' '
 -      (cd one &&
 -       >foobar &&
 -       git add foobar &&
 -       git commit -m "Foobar" &&
 -       git tag -a -m "Foobar tag" foobar-tag &&
 -       git reset --hard HEAD~1 &&
 -       git tag -a -m "Some tag" some-tag) &&
 -      (mkdir add-tags &&
 -       cd add-tags &&
 -       git init &&
 -       git remote add -f origin ../one &&
 -       git tag -l some-tag >../test/output &&
 -       git tag -l foobar-tag >>../test/output &&
 -       test_must_fail git config remote.origin.tagopt) &&
 +      (
 +              cd one &&
 +              >foobar &&
 +              git add foobar &&
 +              git commit -m "Foobar" &&
 +              git tag -a -m "Foobar tag" foobar-tag &&
 +              git reset --hard HEAD~1 &&
 +              git tag -a -m "Some tag" some-tag
 +      ) &&
 +      mkdir add-tags &&
 +      (
 +              cd add-tags &&
 +              git init &&
 +              git remote add -f origin ../one &&
 +              git tag -l some-tag >../test/output &&
 +              git tag -l foobar-tag >>../test/output &&
 +              test_must_fail git config remote.origin.tagopt
 +      ) &&
        test_cmp test/expect test/output
  '
  
@@@ -509,16 -457,14 +509,16 @@@ foobar-ta
  EOF
  
  test_expect_success 'add --tags' '
 -      (rm -rf add-tags &&
 -       mkdir add-tags &&
 -       cd add-tags &&
 -       git init &&
 -       git remote add -f --tags origin ../one &&
 -       git tag -l some-tag >../test/output &&
 -       git tag -l foobar-tag >>../test/output &&
 -       git config remote.origin.tagopt >>../test/output) &&
 +      rm -rf add-tags &&
 +      (
 +              mkdir add-tags &&
 +              cd add-tags &&
 +              git init &&
 +              git remote add -f --tags origin ../one &&
 +              git tag -l some-tag >../test/output &&
 +              git tag -l foobar-tag >>../test/output &&
 +              git config remote.origin.tagopt >>../test/output
 +      ) &&
        test_cmp test/expect test/output
  '
  
@@@ -527,31 -473,25 +527,31 @@@ cat >test/expect <<\EO
  EOF
  
  test_expect_success 'add --no-tags' '
 -      (rm -rf add-tags &&
 -       mkdir add-no-tags &&
 -       cd add-no-tags &&
 -       git init &&
 -       git remote add -f --no-tags origin ../one &&
 -       git tag -l some-tag >../test/output &&
 -       git tag -l foobar-tag >../test/output &&
 -       git config remote.origin.tagopt >>../test/output) &&
 -      (cd one &&
 -       git tag -d some-tag foobar-tag) &&
 +      rm -rf add-tags &&
 +      (
 +              mkdir add-no-tags &&
 +              cd add-no-tags &&
 +              git init &&
 +              git remote add -f --no-tags origin ../one &&
 +              git tag -l some-tag >../test/output &&
 +              git tag -l foobar-tag >../test/output &&
 +              git config remote.origin.tagopt >>../test/output
 +      ) &&
 +      (
 +              cd one &&
 +              git tag -d some-tag foobar-tag
 +      ) &&
        test_cmp test/expect test/output
  '
  
  test_expect_success 'reject --no-no-tags' '
 -      (cd add-no-tags &&
 -       test_must_fail git remote add -f --no-no-tags neworigin ../one)
 +      (
 +              cd add-no-tags &&
 +              test_must_fail git remote add -f --no-no-tags neworigin ../one
 +      )
  '
  
 -cat > one/expect << EOF
 +cat >one/expect <<\EOF
    apis/master
    apis/side
    drosophila/another
@@@ -560,17 -500,17 +560,17 @@@
  EOF
  
  test_expect_success 'update' '
 -
 -      (cd one &&
 -       git remote add drosophila ../two &&
 -       git remote add apis ../mirror &&
 -       git remote update &&
 -       git branch -r > output &&
 -       test_cmp expect output)
 -
 +      (
 +              cd one &&
 +              git remote add drosophila ../two &&
 +              git remote add apis ../mirror &&
 +              git remote update &&
 +              git branch -r >output &&
 +              test_cmp expect output
 +      )
  '
  
 -cat > one/expect << EOF
 +cat >one/expect <<\EOF
    drosophila/another
    drosophila/master
    drosophila/side
@@@ -581,40 -521,34 +581,40 @@@
  EOF
  
  test_expect_success 'update with arguments' '
 -
 -      (cd one &&
 -       for b in $(git branch -r)
 -       do
 +      (
 +              cd one &&
 +              for b in $(git branch -r)
 +              do
                git branch -r -d $b || break
 -       done &&
 -       git remote add manduca ../mirror &&
 -       git remote add megaloprepus ../mirror &&
 -       git config remotes.phobaeticus "drosophila megaloprepus" &&
 -       git config remotes.titanus manduca &&
 -       git remote update phobaeticus titanus &&
 -       git branch -r > output &&
 -       test_cmp expect output)
 -
 +              done &&
 +              git remote add manduca ../mirror &&
 +              git remote add megaloprepus ../mirror &&
 +              git config remotes.phobaeticus "drosophila megaloprepus" &&
 +              git config remotes.titanus manduca &&
 +              git remote update phobaeticus titanus &&
 +              git branch -r >output &&
 +              test_cmp expect output
 +      )
  '
  
  test_expect_success 'update --prune' '
 -
 -      (cd one &&
 -       git branch -m side2 side3) &&
 -      (cd test &&
 -       git remote update --prune &&
 -       (cd ../one && git branch -m side3 side2) &&
 -       git rev-parse refs/remotes/origin/side3 &&
 -       test_must_fail git rev-parse refs/remotes/origin/side2)
 +      (
 +              cd one &&
 +              git branch -m side2 side3
 +      ) &&
 +      (
 +              cd test &&
 +              git remote update --prune &&
 +              (
 +                      cd ../one &&
 +                      git branch -m side3 side2
 +              ) &&
 +              git rev-parse refs/remotes/origin/side3 &&
 +              test_must_fail git rev-parse refs/remotes/origin/side2
 +      )
  '
  
 -cat > one/expect << EOF
 +cat >one/expect <<-\EOF
    apis/master
    apis/side
    manduca/master
@@@ -624,204 -558,176 +624,204 @@@
  EOF
  
  test_expect_success 'update default' '
 -
 -      (cd one &&
 -       for b in $(git branch -r)
 -       do
 +      (
 +              cd one &&
 +              for b in $(git branch -r)
 +              do
                git branch -r -d $b || break
 -       done &&
 -       git config remote.drosophila.skipDefaultUpdate true &&
 -       git remote update default &&
 -       git branch -r > output &&
 -       test_cmp expect output)
 -
 +              done &&
 +              git config remote.drosophila.skipDefaultUpdate true &&
 +              git remote update default &&
 +              git branch -r >output &&
 +              test_cmp expect output
 +      )
  '
  
 -cat > one/expect << EOF
 +cat >one/expect <<\EOF
    drosophila/another
    drosophila/master
    drosophila/side
  EOF
  
  test_expect_success 'update default (overridden, with funny whitespace)' '
 -
 -      (cd one &&
 -       for b in $(git branch -r)
 -       do
 +      (
 +              cd one &&
 +              for b in $(git branch -r)
 +              do
                git branch -r -d $b || break
 -       done &&
 -       git config remotes.default "$(printf "\t drosophila  \n")" &&
 -       git remote update default &&
 -       git branch -r > output &&
 -       test_cmp expect output)
 -
 +              done &&
 +              git config remotes.default "$(printf "\t drosophila  \n")" &&
 +              git remote update default &&
 +              git branch -r >output &&
 +              test_cmp expect output
 +      )
  '
  
  test_expect_success 'update (with remotes.default defined)' '
 -
 -      (cd one &&
 -       for b in $(git branch -r)
 -       do
 +      (
 +              cd one &&
 +              for b in $(git branch -r)
 +              do
                git branch -r -d $b || break
 -       done &&
 -       git config remotes.default "drosophila" &&
 -       git remote update &&
 -       git branch -r > output &&
 -       test_cmp expect output)
 -
 +              done &&
 +              git config remotes.default "drosophila" &&
 +              git remote update &&
 +              git branch -r >output &&
 +              test_cmp expect output
 +      )
  '
  
  test_expect_success '"remote show" does not show symbolic refs' '
 -
        git clone one three &&
 -      (cd three &&
 -       git remote show origin > output &&
 -       ! grep "^ *HEAD$" < output &&
 -       ! grep -i stale < output)
 -
 +      (
 +              cd three &&
 +              git remote show origin >output &&
 +              ! grep "^ *HEAD$" < output &&
 +              ! grep -i stale < output
 +      )
  '
  
  test_expect_success 'reject adding remote with an invalid name' '
 -
        test_must_fail git remote add some:url desired-name
 -
  '
  
  # The first three test if the tracking branches are properly renamed,
  # the last two ones check if the config is updated.
  
  test_expect_success 'rename a remote' '
 -
        git clone one four &&
 -      (cd four &&
 -       git remote rename origin upstream &&
 -       rmdir .git/refs/remotes/origin &&
 -       test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
 -       test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
 -       test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
 -       test "$(git config branch.master.remote)" = "upstream")
 -
 +      (
 +              cd four &&
 +              git remote rename origin upstream &&
 +              rmdir .git/refs/remotes/origin &&
 +              test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
 +              test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
 +              test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
 +              test "$(git config branch.master.remote)" = "upstream"
 +      )
  '
  
  test_expect_success 'rename does not update a non-default fetch refspec' '
 -
        git clone one four.one &&
 -      (cd four.one &&
 -       git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* &&
 -       git remote rename origin upstream &&
 -       test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" &&
 -       git rev-parse -q origin/master)
 -
 +      (
 +              cd four.one &&
 +              git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* &&
 +              git remote rename origin upstream &&
 +              test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" &&
 +              git rev-parse -q origin/master
 +      )
  '
  
  test_expect_success 'rename a remote with name part of fetch spec' '
 -
        git clone one four.two &&
 -      (cd four.two &&
 -       git remote rename origin remote &&
 -       git remote rename remote upstream &&
 -       test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*")
 -
 +      (
 +              cd four.two &&
 +              git remote rename origin remote &&
 +              git remote rename remote upstream &&
 +              test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*"
 +      )
  '
  
  test_expect_success 'rename a remote with name prefix of other remote' '
 -
        git clone one four.three &&
 -      (cd four.three &&
 -       git remote add o git://example.com/repo.git &&
 -       git remote rename o upstream &&
 -       test "$(git rev-parse origin/master)" = "$(git rev-parse master)")
 -
 +      (
 +              cd four.three &&
 +              git remote add o git://example.com/repo.git &&
 +              git remote rename o upstream &&
 +              test "$(git rev-parse origin/master)" = "$(git rev-parse master)"
 +      )
  '
  
 -cat > remotes_origin << EOF
 +cat >remotes_origin <<EOF
  URL: $(pwd)/one
  Push: refs/heads/master:refs/heads/upstream
 +Push: refs/heads/next:refs/heads/upstream2
  Pull: refs/heads/master:refs/heads/origin
 +Pull: refs/heads/next:refs/heads/origin2
  EOF
  
  test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
        git clone one five &&
        origin_url=$(pwd)/one &&
 -      (cd five &&
 -       git remote remove origin &&
 -       mkdir -p .git/remotes &&
 -       cat ../remotes_origin > .git/remotes/origin &&
 -       git remote rename origin origin &&
 -       ! test -f .git/remotes/origin &&
 -       test "$(git config remote.origin.url)" = "$origin_url" &&
 -       test "$(git config remote.origin.push)" = "refs/heads/master:refs/heads/upstream" &&
 -       test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin")
 +      (
 +              cd five &&
 +              git remote remove origin &&
 +              mkdir -p .git/remotes &&
 +              cat ../remotes_origin >.git/remotes/origin &&
 +              git remote rename origin origin &&
 +              test_path_is_missing .git/remotes/origin &&
 +              test "$(git config remote.origin.url)" = "$origin_url" &&
 +              cat >push_expected <<-\EOF &&
 +              refs/heads/master:refs/heads/upstream
 +              refs/heads/next:refs/heads/upstream2
 +              EOF
 +              cat >fetch_expected <<-\EOF &&
 +              refs/heads/master:refs/heads/origin
 +              refs/heads/next:refs/heads/origin2
 +              EOF
 +              git config --get-all remote.origin.push >push_actual &&
 +              git config --get-all remote.origin.fetch >fetch_actual &&
 +              test_cmp push_expected push_actual &&
 +              test_cmp fetch_expected fetch_actual
 +      )
  '
  
  test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' '
        git clone one six &&
        origin_url=$(pwd)/one &&
 -      (cd six &&
 -       git remote rm origin &&
 -       echo "$origin_url" > .git/branches/origin &&
 -       git remote rename origin origin &&
 -       ! test -f .git/branches/origin &&
 -       test "$(git config remote.origin.url)" = "$origin_url" &&
 -       test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin")
 +      (
 +              cd six &&
 +              git remote rm origin &&
 +              echo "$origin_url" >.git/branches/origin &&
 +              git remote rename origin origin &&
 +              test_path_is_missing .git/branches/origin &&
 +              test "$(git config remote.origin.url)" = "$origin_url" &&
 +              test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin" &&
 +              test "$(git config remote.origin.push)" = "HEAD:refs/heads/master"
 +      )
  '
  
 -test_expect_success 'remote prune to cause a dangling symref' '
 +test_expect_success 'migrate a remote from named file in $GIT_DIR/branches (2)' '
        git clone one seven &&
 +      (
 +              cd seven &&
 +              git remote rm origin &&
 +              echo "quux#foom" > .git/branches/origin &&
 +              git remote rename origin origin &&
 +              test_path_is_missing .git/branches/origin &&
 +              test "$(git config remote.origin.url)" = "quux" &&
 +              test "$(git config remote.origin.fetch)" = "refs/heads/foom:refs/heads/origin"
 +              test "$(git config remote.origin.push)" = "HEAD:refs/heads/foom"
 +      )
 +'
 +
 +test_expect_success 'remote prune to cause a dangling symref' '
 +      git clone one eight &&
        (
                cd one &&
                git checkout side2 &&
                git branch -D master
        ) &&
        (
 -              cd seven &&
 +              cd eight &&
                git remote prune origin
        ) >err 2>&1 &&
        test_i18ngrep "has become dangling" err &&
  
        : And the dangling symref will not cause other annoying errors &&
        (
 -              cd seven &&
 +              cd eight &&
                git branch -a
        ) 2>err &&
        ! grep "points nowhere" err &&
        (
 -              cd seven &&
 +              cd eight &&
                test_must_fail git branch nomore origin
        ) 2>err &&
        grep "dangling symref" err
  '
  
  test_expect_success 'show empty remote' '
 -
        test_create_repo empty &&
        git clone empty empty-clone &&
        (