Merge branch 'jm/branch-rename-nothing-error'

"git branch -m" without any argument noticed an error, but with an
incorrect error message.

* jm/branch-rename-nothing-error:
branch: give better message when no names specified for rename

diff --combined builtin/branch.c
index e09ce51c2ee59ee4a9f44dbf43c97a2d31911b7b,580107fd78e0415c0c95814b95056f8ad508bea1..3f0fbc082aef95b3d02a8b677116264eea892369
--- 1/builtin/branch.c
--- 2/builtin/branch.c
+++ b/builtin/branch.c
@@@ -18,7 -18,6 +18,7 @@@
  #include "string-list.h"
  #include "column.h"
  #include "utf8.h"
 +#include "wt-status.h"
  
  static const char * const builtin_branch_usage[] = {
        N_("git branch [options] [-r | -a] [--merged | --no-merged]"),
@@@ -551,29 -550,6 +551,29 @@@ static int calc_maxwidth(struct ref_lis
        return w;
  }
  
 +static char *get_head_description(void)
 +{
 +      struct strbuf desc = STRBUF_INIT;
 +      struct wt_status_state state;
 +      memset(&state, 0, sizeof(state));
 +      wt_status_get_state(&state, 1);
 +      if (state.rebase_in_progress ||
 +          state.rebase_interactive_in_progress)
 +              strbuf_addf(&desc, _("(no branch, rebasing %s)"),
 +                          state.branch);
 +      else if (state.bisect_in_progress)
 +              strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
 +                          state.branch);
 +      else if (state.detached_from)
 +              strbuf_addf(&desc, _("(detached from %s)"),
 +                          state.detached_from);
 +      else
 +              strbuf_addstr(&desc, _("(no branch)"));
 +      free(state.branch);
 +      free(state.onto);
 +      free(state.detached_from);
 +      return strbuf_detach(&desc, NULL);
 +}
  
  static void show_detached(struct ref_list *ref_list)
  {
@@@ -581,7 -557,7 +581,7 @@@
  
        if (head_commit && is_descendant_of(head_commit, ref_list->with_commit)) {
                struct ref_item item;
 -              item.name = xstrdup(_("(no branch)"));
 +              item.name = get_head_description();
                item.width = utf8_strwidth(item.name);
                item.kind = REF_LOCAL_BRANCH;
                item.dest = NULL;
@@@ -904,7 -880,9 +904,9 @@@ int cmd_branch(int argc, const char **a
                if (edit_branch_description(branch_name))
                        return 1;
        } else if (rename) {
-               if (argc == 1)
+               if (!argc)
+                       die(_("branch name required"));
+               else if (argc == 1)
                        rename_branch(head, argv[0], rename > 1);
                else if (argc == 2)
                        rename_branch(argv[0], argv[1], rename > 1);

diff --combined t/t3200-branch.sh
index b08c9f22951bf447cc769c043a165d087fa5e38d,a64c9d2dd3732170918e7891854c0400d7f88b9e..8311c7da440a5932107cd8e4787f236c29518861
--- 1/t/t3200-branch.sh
--- 2/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@@ -7,18 -7,20 +7,18 @@@ test_description='git branch assorted t
  
  . ./test-lib.sh
  
 -test_expect_success \
 -    'prepare a trivial repository' \
 -    'echo Hello > A &&
 -     git update-index --add A &&
 -     git commit -m "Initial commit." &&
 -     echo World >> A &&
 -     git update-index --add A &&
 -     git commit -m "Second commit." &&
 -     HEAD=$(git rev-parse --verify HEAD)'
 -
 -test_expect_success \
 -    'git branch --help should not have created a bogus branch' '
 -     test_might_fail git branch --help </dev/null >/dev/null 2>/dev/null &&
 -     test_path_is_missing .git/refs/heads/--help
 +test_expect_success 'prepare a trivial repository' '
 +      echo Hello >A &&
 +      git update-index --add A &&
 +      git commit -m "Initial commit." &&
 +      echo World >>A &&
 +      git update-index --add A &&
 +      git commit -m "Second commit." &&
 +      HEAD=$(git rev-parse --verify HEAD)'
 +
 +test_expect_success 'git branch --help should not have created a bogus branch' '
 +      test_might_fail git branch --help </dev/null >/dev/null 2>/dev/null &&
 +      test_path_is_missing .git/refs/heads/--help
  '
  
  test_expect_success 'branch -h in broken repository' '
@@@ -32,67 -34,67 +32,67 @@@
        test_i18ngrep "[Uu]sage" broken/usage
  '
  
 -test_expect_success \
 -    'git branch abc should create a branch' \
 -    'git branch abc && test_path_is_file .git/refs/heads/abc'
 +test_expect_success 'git branch abc should create a branch' '
 +      git branch abc && test_path_is_file .git/refs/heads/abc
 +'
  
 -test_expect_success \
 -    'git branch a/b/c should create a branch' \
 -    'git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c'
 +test_expect_success 'git branch a/b/c should create a branch' '
 +      git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c
 +'
  
 -test_expect_success \
 -    'git branch HEAD should fail' \
 -    'test_must_fail git branch HEAD'
 +test_expect_success 'git branch HEAD should fail' '
 +      test_must_fail git branch HEAD
 +'
  
  cat >expect <<EOF
  $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000       branch: Created from master
  EOF
 -test_expect_success \
 -    'git branch -l d/e/f should create a branch and a log' \
 -      'GIT_COMMITTER_DATE="2005-05-26 23:30" \
 -     git branch -l d/e/f &&
 -       test_path_is_file .git/refs/heads/d/e/f &&
 -       test_path_is_file .git/logs/refs/heads/d/e/f &&
 -       test_cmp expect .git/logs/refs/heads/d/e/f'
 -
 -test_expect_success \
 -    'git branch -d d/e/f should delete a branch and a log' \
 -      'git branch -d d/e/f &&
 -       test_path_is_missing .git/refs/heads/d/e/f &&
 -       test_path_is_missing .git/logs/refs/heads/d/e/f'
 -
 -test_expect_success \
 -    'git branch j/k should work after branch j has been deleted' \
 -       'git branch j &&
 -        git branch -d j &&
 -        git branch j/k'
 -
 -test_expect_success \
 -    'git branch l should work after branch l/m has been deleted' \
 -       'git branch l/m &&
 -        git branch -d l/m &&
 -        git branch l'
 -
 -test_expect_success \
 -    'git branch -m dumps usage' \
 -       'test_expect_code 128 git branch -m 2>err &&
 -      test_i18ngrep "branch name required" err'
 -
 -test_expect_success \
 -    'git branch -m m m/m should work' \
 -       'git branch -l m &&
 -        git branch -m m m/m &&
 -      test_path_is_file .git/logs/refs/heads/m/m'
 -
 -test_expect_success \
 -    'git branch -m n/n n should work' \
 -       'git branch -l n/n &&
 +test_expect_success 'git branch -l d/e/f should create a branch and a log' '
 +      GIT_COMMITTER_DATE="2005-05-26 23:30" \
 +      git branch -l d/e/f &&
 +      test_path_is_file .git/refs/heads/d/e/f &&
 +      test_path_is_file .git/logs/refs/heads/d/e/f &&
 +      test_cmp expect .git/logs/refs/heads/d/e/f
 +'
 +
 +test_expect_success 'git branch -d d/e/f should delete a branch and a log' '
 +      git branch -d d/e/f &&
 +      test_path_is_missing .git/refs/heads/d/e/f &&
 +      test_path_is_missing .git/logs/refs/heads/d/e/f
 +'
 +
 +test_expect_success 'git branch j/k should work after branch j has been deleted' '
 +      git branch j &&
 +      git branch -d j &&
 +      git branch j/k
 +'
 +
 +test_expect_success 'git branch l should work after branch l/m has been deleted' '
 +      git branch l/m &&
 +      git branch -d l/m &&
 +      git branch l
 +'
 +
 +test_expect_success 'git branch -m dumps usage' '
 +      test_expect_code 128 git branch -m 2>err &&
-       test_i18ngrep "too many branches for a rename operation" err
++      test_i18ngrep "branch name required" err
 +'
 +
 +test_expect_success 'git branch -m m m/m should work' '
 +      git branch -l m &&
 +      git branch -m m m/m &&
 +      test_path_is_file .git/logs/refs/heads/m/m
 +'
 +
 +test_expect_success 'git branch -m n/n n should work' '
 +      git branch -l n/n &&
        git branch -m n/n n &&
 -      test_path_is_file .git/logs/refs/heads/n'
 +      test_path_is_file .git/logs/refs/heads/n
 +'
  
  test_expect_success 'git branch -m o/o o should fail when o/p exists' '
        git branch o/o &&
 -        git branch o/p &&
 +      git branch o/p &&
        test_must_fail git branch -m o/o o
  '
  
@@@ -250,20 -252,19 +250,20 @@@ mv .git/config-saved .git/confi
  
  git config branch.s/s.dummy Hello
  
 -test_expect_success \
 -    'git branch -m s/s s should work when s/t is deleted' \
 -       'git branch -l s/s &&
 +test_expect_success 'git branch -m s/s s should work when s/t is deleted' '
 +      git branch -l s/s &&
        test_path_is_file .git/logs/refs/heads/s/s &&
 -        git branch -l s/t &&
 +      git branch -l s/t &&
        test_path_is_file .git/logs/refs/heads/s/t &&
 -        git branch -d s/t &&
 -        git branch -m s/s s &&
 -      test_path_is_file .git/logs/refs/heads/s'
 +      git branch -d s/t &&
 +      git branch -m s/s s &&
 +      test_path_is_file .git/logs/refs/heads/s
 +'
  
 -test_expect_success 'config information was renamed, too' \
 -      "test $(git config branch.s.dummy) = Hello &&
 -       test_must_fail git config branch.s/s/dummy"
 +test_expect_success 'config information was renamed, too' '
 +      test $(git config branch.s.dummy) = Hello &&
 +      test_must_fail git config branch.s/s/dummy
 +'
  
  test_expect_success 'deleting a symref' '
        git branch target &&
@@@ -284,7 -285,8 +284,7 @@@ test_expect_success 'deleting a danglin
        test_i18ncmp expect actual
  '
  
 -test_expect_success 'renaming a symref is not allowed' \
 -'
 +test_expect_success 'renaming a symref is not allowed' '
        git symbolic-ref refs/heads/master2 refs/heads/master &&
        test_must_fail git branch -m master2 master3 &&
        git symbolic-ref refs/heads/master2 &&
@@@ -292,179 -294,163 +292,179 @@@
        test_path_is_missing .git/refs/heads/master3
  '
  
 -test_expect_success SYMLINKS \
 -    'git branch -m u v should fail when the reflog for u is a symlink' '
 -     git branch -l u &&
 -     mv .git/logs/refs/heads/u real-u &&
 -     ln -s real-u .git/logs/refs/heads/u &&
 -     test_must_fail git branch -m u v
 -'
 -
 -test_expect_success 'test tracking setup via --track' \
 -    'git config remote.local.url . &&
 -     git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 -     (git show-ref -q refs/remotes/local/master || git fetch local) &&
 -     git branch --track my1 local/master &&
 -     test $(git config branch.my1.remote) = local &&
 -     test $(git config branch.my1.merge) = refs/heads/master'
 -
 -test_expect_success 'test tracking setup (non-wildcard, matching)' \
 -    'git config remote.local.url . &&
 -     git config remote.local.fetch refs/heads/master:refs/remotes/local/master &&
 -     (git show-ref -q refs/remotes/local/master || git fetch local) &&
 -     git branch --track my4 local/master &&
 -     test $(git config branch.my4.remote) = local &&
 -     test $(git config branch.my4.merge) = refs/heads/master'
 -
 -test_expect_success 'test tracking setup (non-wildcard, not matching)' \
 -    'git config remote.local.url . &&
 -     git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
 -     (git show-ref -q refs/remotes/local/master || git fetch local) &&
 -     git branch --track my5 local/master &&
 -     ! test "$(git config branch.my5.remote)" = local &&
 -     ! test "$(git config branch.my5.merge)" = refs/heads/master'
 -
 -test_expect_success 'test tracking setup via config' \
 -    'git config branch.autosetupmerge true &&
 -     git config remote.local.url . &&
 -     git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 -     (git show-ref -q refs/remotes/local/master || git fetch local) &&
 -     git branch my3 local/master &&
 -     test $(git config branch.my3.remote) = local &&
 -     test $(git config branch.my3.merge) = refs/heads/master'
 -
 -test_expect_success 'test overriding tracking setup via --no-track' \
 -    'git config branch.autosetupmerge true &&
 -     git config remote.local.url . &&
 -     git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 -     (git show-ref -q refs/remotes/local/master || git fetch local) &&
 -     git branch --no-track my2 local/master &&
 -     git config branch.autosetupmerge false &&
 -     ! test "$(git config branch.my2.remote)" = local &&
 -     ! test "$(git config branch.my2.merge)" = refs/heads/master'
 -
 -test_expect_success 'no tracking without .fetch entries' \
 -    'git config branch.autosetupmerge true &&
 -     git branch my6 s &&
 -     git config branch.automsetupmerge false &&
 -     test -z "$(git config branch.my6.remote)" &&
 -     test -z "$(git config branch.my6.merge)"'
 -
 -test_expect_success 'test tracking setup via --track but deeper' \
 -    'git config remote.local.url . &&
 -     git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 -     (git show-ref -q refs/remotes/local/o/o || git fetch local) &&
 -     git branch --track my7 local/o/o &&
 -     test "$(git config branch.my7.remote)" = local &&
 -     test "$(git config branch.my7.merge)" = refs/heads/o/o'
 -
 -test_expect_success 'test deleting branch deletes branch config' \
 -    'git branch -d my7 &&
 -     test -z "$(git config branch.my7.remote)" &&
 -     test -z "$(git config branch.my7.merge)"'
 -
 -test_expect_success 'test deleting branch without config' \
 -    'git branch my7 s &&
 -     sha1=$(git rev-parse my7 | cut -c 1-7) &&
 -     echo "Deleted branch my7 (was $sha1)." >expect &&
 -     git branch -d my7 >actual 2>&1 &&
 -     test_i18ncmp expect actual'
 -
 -test_expect_success 'test --track without .fetch entries' \
 -    'git branch --track my8 &&
 -     test "$(git config branch.my8.remote)" &&
 -     test "$(git config branch.my8.merge)"'
 -
 -test_expect_success \
 -    'branch from non-branch HEAD w/autosetupmerge=always' \
 -    'git config branch.autosetupmerge always &&
 -     git branch my9 HEAD^ &&
 -     git config branch.autosetupmerge false'
 -
 -test_expect_success \
 -    'branch from non-branch HEAD w/--track causes failure' \
 -    'test_must_fail git branch --track my10 HEAD^'
 -
 -test_expect_success \
 -    'branch from tag w/--track causes failure' \
 -    'git tag foobar &&
 -     test_must_fail git branch --track my11 foobar'
 -
 -test_expect_success '--set-upstream-to fails on multiple branches' \
 -    'test_must_fail git branch --set-upstream-to master a b c'
 -
 -test_expect_success '--set-upstream-to fails on detached HEAD' \
 -    'git checkout HEAD^{} &&
 -     test_must_fail git branch --set-upstream-to master &&
 -     git checkout -'
 -
 -test_expect_success 'use --set-upstream-to modify HEAD' \
 -    'test_config branch.master.remote foo &&
 -     test_config branch.master.merge foo &&
 -     git branch my12
 -     git branch --set-upstream-to my12 &&
 -     test "$(git config branch.master.remote)" = "." &&
 -     test "$(git config branch.master.merge)" = "refs/heads/my12"'
 -
 -test_expect_success 'use --set-upstream-to modify a particular branch' \
 -    'git branch my13
 -     git branch --set-upstream-to master my13 &&
 -     test "$(git config branch.my13.remote)" = "." &&
 -     test "$(git config branch.my13.merge)" = "refs/heads/master"'
 -
 -test_expect_success '--unset-upstream should fail if given a non-existent branch' \
 -    'test_must_fail git branch --unset-upstream i-dont-exist'
 -
 -test_expect_success 'test --unset-upstream on HEAD' \
 -    'git branch my14
 -     test_config branch.master.remote foo &&
 -     test_config branch.master.merge foo &&
 -     git branch --set-upstream-to my14 &&
 -     git branch --unset-upstream &&
 -     test_must_fail git config branch.master.remote &&
 -     test_must_fail git config branch.master.merge &&
 -     # fail for a branch without upstream set
 -     test_must_fail git branch --unset-upstream
 -'
 -
 -test_expect_success '--unset-upstream should fail on multiple branches' \
 -    'test_must_fail git branch --unset-upstream a b c'
 -
 -test_expect_success '--unset-upstream should fail on detached HEAD' \
 -    'git checkout HEAD^{} &&
 -     test_must_fail git branch --unset-upstream &&
 -     git checkout -
 -'
 -
 -test_expect_success 'test --unset-upstream on a particular branch' \
 -    'git branch my15
 -     git branch --set-upstream-to master my14 &&
 -     git branch --unset-upstream my14 &&
 -     test_must_fail git config branch.my14.remote &&
 -     test_must_fail git config branch.my14.merge'
 -
 -test_expect_success '--set-upstream shows message when creating a new branch that exists as remote-tracking' \
 -    'git update-ref refs/remotes/origin/master HEAD &&
 -     git branch --set-upstream origin/master 2>actual &&
 -     test_when_finished git update-ref -d refs/remotes/origin/master &&
 -     test_when_finished git branch -d origin/master &&
 -     cat >expected <<EOF &&
 +test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' '
 +      git branch -l u &&
 +      mv .git/logs/refs/heads/u real-u &&
 +      ln -s real-u .git/logs/refs/heads/u &&
 +      test_must_fail git branch -m u v
 +'
 +
 +test_expect_success 'test tracking setup via --track' '
 +      git config remote.local.url . &&
 +      git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 +      (git show-ref -q refs/remotes/local/master || git fetch local) &&
 +      git branch --track my1 local/master &&
 +      test $(git config branch.my1.remote) = local &&
 +      test $(git config branch.my1.merge) = refs/heads/master
 +'
 +
 +test_expect_success 'test tracking setup (non-wildcard, matching)' '
 +      git config remote.local.url . &&
 +      git config remote.local.fetch refs/heads/master:refs/remotes/local/master &&
 +      (git show-ref -q refs/remotes/local/master || git fetch local) &&
 +      git branch --track my4 local/master &&
 +      test $(git config branch.my4.remote) = local &&
 +      test $(git config branch.my4.merge) = refs/heads/master
 +'
 +
 +test_expect_success 'test tracking setup (non-wildcard, not matching)' '
 +      git config remote.local.url . &&
 +      git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
 +      (git show-ref -q refs/remotes/local/master || git fetch local) &&
 +      git branch --track my5 local/master &&
 +      ! test "$(git config branch.my5.remote)" = local &&
 +      ! test "$(git config branch.my5.merge)" = refs/heads/master
 +'
 +
 +test_expect_success 'test tracking setup via config' '
 +      git config branch.autosetupmerge true &&
 +      git config remote.local.url . &&
 +      git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 +      (git show-ref -q refs/remotes/local/master || git fetch local) &&
 +      git branch my3 local/master &&
 +      test $(git config branch.my3.remote) = local &&
 +      test $(git config branch.my3.merge) = refs/heads/master
 +'
 +
 +test_expect_success 'test overriding tracking setup via --no-track' '
 +      git config branch.autosetupmerge true &&
 +      git config remote.local.url . &&
 +      git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 +      (git show-ref -q refs/remotes/local/master || git fetch local) &&
 +      git branch --no-track my2 local/master &&
 +      git config branch.autosetupmerge false &&
 +      ! test "$(git config branch.my2.remote)" = local &&
 +      ! test "$(git config branch.my2.merge)" = refs/heads/master
 +'
 +
 +test_expect_success 'no tracking without .fetch entries' '
 +      git config branch.autosetupmerge true &&
 +      git branch my6 s &&
 +      git config branch.automsetupmerge false &&
 +      test -z "$(git config branch.my6.remote)" &&
 +      test -z "$(git config branch.my6.merge)"
 +'
 +
 +test_expect_success 'test tracking setup via --track but deeper' '
 +      git config remote.local.url . &&
 +      git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 +      (git show-ref -q refs/remotes/local/o/o || git fetch local) &&
 +      git branch --track my7 local/o/o &&
 +      test "$(git config branch.my7.remote)" = local &&
 +      test "$(git config branch.my7.merge)" = refs/heads/o/o
 +'
 +
 +test_expect_success 'test deleting branch deletes branch config' '
 +      git branch -d my7 &&
 +      test -z "$(git config branch.my7.remote)" &&
 +      test -z "$(git config branch.my7.merge)"
 +'
 +
 +test_expect_success 'test deleting branch without config' '
 +      git branch my7 s &&
 +      sha1=$(git rev-parse my7 | cut -c 1-7) &&
 +      echo "Deleted branch my7 (was $sha1)." >expect &&
 +      git branch -d my7 >actual 2>&1 &&
 +      test_i18ncmp expect actual
 +'
 +
 +test_expect_success 'test --track without .fetch entries' '
 +      git branch --track my8 &&
 +      test "$(git config branch.my8.remote)" &&
 +      test "$(git config branch.my8.merge)"
 +'
 +
 +test_expect_success 'branch from non-branch HEAD w/autosetupmerge=always' '
 +      git config branch.autosetupmerge always &&
 +      git branch my9 HEAD^ &&
 +      git config branch.autosetupmerge false
 +'
 +
 +test_expect_success 'branch from non-branch HEAD w/--track causes failure' '
 +      test_must_fail git branch --track my10 HEAD^
 +'
 +
 +test_expect_success 'branch from tag w/--track causes failure' '
 +      git tag foobar &&
 +      test_must_fail git branch --track my11 foobar
 +'
 +
 +test_expect_success '--set-upstream-to fails on multiple branches' '
 +      test_must_fail git branch --set-upstream-to master a b c
 +'
 +
 +test_expect_success '--set-upstream-to fails on detached HEAD' '
 +      git checkout HEAD^{} &&
 +      test_must_fail git branch --set-upstream-to master &&
 +      git checkout -
 +'
 +
 +test_expect_success 'use --set-upstream-to modify HEAD' '
 +      test_config branch.master.remote foo &&
 +      test_config branch.master.merge foo &&
 +      git branch my12
 +      git branch --set-upstream-to my12 &&
 +      test "$(git config branch.master.remote)" = "." &&
 +      test "$(git config branch.master.merge)" = "refs/heads/my12"
 +'
 +
 +test_expect_success 'use --set-upstream-to modify a particular branch' '
 +      git branch my13
 +      git branch --set-upstream-to master my13 &&
 +      test "$(git config branch.my13.remote)" = "." &&
 +      test "$(git config branch.my13.merge)" = "refs/heads/master"
 +'
 +
 +test_expect_success '--unset-upstream should fail if given a non-existent branch' '
 +      test_must_fail git branch --unset-upstream i-dont-exist
 +'
 +
 +test_expect_success 'test --unset-upstream on HEAD' '
 +      git branch my14
 +      test_config branch.master.remote foo &&
 +      test_config branch.master.merge foo &&
 +      git branch --set-upstream-to my14 &&
 +      git branch --unset-upstream &&
 +      test_must_fail git config branch.master.remote &&
 +      test_must_fail git config branch.master.merge &&
 +      # fail for a branch without upstream set
 +      test_must_fail git branch --unset-upstream
 +'
 +
 +test_expect_success '--unset-upstream should fail on multiple branches' '
 +      test_must_fail git branch --unset-upstream a b c
 +'
 +
 +test_expect_success '--unset-upstream should fail on detached HEAD' '
 +      git checkout HEAD^{} &&
 +      test_must_fail git branch --unset-upstream &&
 +      git checkout -
 +'
 +
 +test_expect_success 'test --unset-upstream on a particular branch' '
 +      git branch my15
 +      git branch --set-upstream-to master my14 &&
 +      git branch --unset-upstream my14 &&
 +      test_must_fail git config branch.my14.remote &&
 +      test_must_fail git config branch.my14.merge
 +'
 +
 +test_expect_success '--set-upstream shows message when creating a new branch that exists as remote-tracking' '
 +      git update-ref refs/remotes/origin/master HEAD &&
 +      git branch --set-upstream origin/master 2>actual &&
 +      test_when_finished git update-ref -d refs/remotes/origin/master &&
 +      test_when_finished git branch -d origin/master &&
 +      cat >expected <<EOF &&
  The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
  
  If you wanted to make '"'master'"' track '"'origin/master'"', do this:
@@@ -472,38 -458,38 +472,38 @@@
      git branch -d origin/master
      git branch --set-upstream-to origin/master
  EOF
 -     test_cmp expected actual
 +      test_cmp expected actual
  '
  
 -test_expect_success '--set-upstream with two args only shows the deprecation message' \
 -    'git branch --set-upstream master my13 2>actual &&
 -     test_when_finished git branch --unset-upstream master &&
 -     cat >expected <<EOF &&
 +test_expect_success '--set-upstream with two args only shows the deprecation message' '
 +      git branch --set-upstream master my13 2>actual &&
 +      test_when_finished git branch --unset-upstream master &&
 +      cat >expected <<EOF &&
  The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
  EOF
 -     test_cmp expected actual
 +      test_cmp expected actual
  '
  
 -test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' \
 -    'git branch --set-upstream my13 2>actual &&
 -     test_when_finished git branch --unset-upstream my13 &&
 -     cat >expected <<EOF &&
 +test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' '
 +      git branch --set-upstream my13 2>actual &&
 +      test_when_finished git branch --unset-upstream my13 &&
 +      cat >expected <<EOF &&
  The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
  EOF
 -     test_cmp expected actual
 +      test_cmp expected actual
  '
  
  # Keep this test last, as it changes the current branch
  cat >expect <<EOF
  $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000       branch: Created from master
  EOF
 -test_expect_success \
 -    'git checkout -b g/h/i -l should create a branch and a log' \
 -      'GIT_COMMITTER_DATE="2005-05-26 23:30" \
 -     git checkout -b g/h/i -l master &&
 -       test_path_is_file .git/refs/heads/g/h/i &&
 -       test_path_is_file .git/logs/refs/heads/g/h/i &&
 -       test_cmp expect .git/logs/refs/heads/g/h/i'
 +test_expect_success 'git checkout -b g/h/i -l should create a branch and a log' '
 +      GIT_COMMITTER_DATE="2005-05-26 23:30" \
 +      git checkout -b g/h/i -l master &&
 +      test_path_is_file .git/refs/heads/g/h/i &&
 +      test_path_is_file .git/logs/refs/heads/g/h/i &&
 +      test_cmp expect .git/logs/refs/heads/g/h/i
 +'
  
  test_expect_success 'checkout -b makes reflog by default' '
        git checkout master &&
@@@ -774,7 -760,7 +774,7 @@@ test_expect_success 'detect misconfigur
  
  test_expect_success 'detect misconfigured autosetuprebase (no value)' '
        git config --unset branch.autosetuprebase &&
 -      echo "[branch] autosetuprebase" >> .git/config &&
 +      echo "[branch] autosetuprebase" >>.git/config &&
        test_must_fail git branch &&
        git config --unset branch.autosetuprebase
  '