2005-09-08 04:13:26 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2005 Amos Waterland
|
|
|
|
|
#
|
|
|
|
|
|
2012-02-06 02:13:36 +01:00
|
|
|
test_description='git branch assorted tests'
|
2005-09-08 04:13:26 +02:00
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
2013-03-20 13:30:12 +01:00
|
|
|
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." &&
|
2013-08-31 06:31:48 +02:00
|
|
|
HEAD=$(git rev-parse --verify HEAD)
|
|
|
|
|
'
|
2013-03-20 13:30:12 +01:00
|
|
|
|
|
|
|
|
test_expect_success 'git branch --help should not have created a bogus branch' '
|
2013-10-26 20:48:46 +02:00
|
|
|
test_might_fail git branch --man --help </dev/null >/dev/null 2>&1 &&
|
2013-03-20 13:30:12 +01:00
|
|
|
test_path_is_missing .git/refs/heads/--help
|
2008-02-01 10:50:53 +01:00
|
|
|
'
|
2005-09-08 04:13:26 +02:00
|
|
|
|
2010-10-22 08:42:58 +02:00
|
|
|
test_expect_success 'branch -h in broken repository' '
|
|
|
|
|
mkdir broken &&
|
|
|
|
|
(
|
|
|
|
|
cd broken &&
|
|
|
|
|
git init &&
|
|
|
|
|
>.git/refs/heads/master &&
|
|
|
|
|
test_expect_code 129 git branch -h >usage 2>&1
|
|
|
|
|
) &&
|
2012-08-27 07:36:55 +02:00
|
|
|
test_i18ngrep "[Uu]sage" broken/usage
|
2010-10-22 08:42:58 +02:00
|
|
|
'
|
|
|
|
|
|
2013-03-20 13:30:12 +01:00
|
|
|
test_expect_success 'git branch abc should create a branch' '
|
|
|
|
|
git branch abc && test_path_is_file .git/refs/heads/abc
|
|
|
|
|
'
|
2005-11-14 23:10:59 +01:00
|
|
|
|
2013-03-20 13:30:12 +01:00
|
|
|
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
|
|
|
|
|
'
|
2005-11-14 23:10:59 +01:00
|
|
|
|
2013-04-01 17:59:14 +02:00
|
|
|
test_expect_success 'git branch HEAD should fail' '
|
|
|
|
|
test_must_fail git branch HEAD
|
|
|
|
|
'
|
2013-02-23 13:22:27 +01:00
|
|
|
|
2006-05-25 05:34:04 +02:00
|
|
|
cat >expect <<EOF
|
2011-04-24 07:34:13 +02:00
|
|
|
$_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
|
2006-05-25 05:34:04 +02:00
|
|
|
EOF
|
2013-03-20 13:30:12 +01:00
|
|
|
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 &&
|
2013-04-03 18:34:40 +02:00
|
|
|
test_i18ngrep "branch name required" err
|
2013-03-20 13:30:12 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
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 &&
|
2011-12-08 14:10:15 +01:00
|
|
|
git branch -m n/n n &&
|
2013-03-20 13:30:12 +01:00
|
|
|
test_path_is_file .git/logs/refs/heads/n
|
|
|
|
|
'
|
2006-11-28 15:47:40 +01:00
|
|
|
|
2008-02-01 10:50:53 +01:00
|
|
|
test_expect_success 'git branch -m o/o o should fail when o/p exists' '
|
|
|
|
|
git branch o/o &&
|
2013-03-20 13:30:12 +01:00
|
|
|
git branch o/p &&
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git branch -m o/o o
|
2008-02-01 10:50:53 +01:00
|
|
|
'
|
2006-11-28 15:47:40 +01:00
|
|
|
|
2008-02-01 10:50:53 +01:00
|
|
|
test_expect_success 'git branch -m q r/q should fail when r exists' '
|
|
|
|
|
git branch q &&
|
|
|
|
|
git branch r &&
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git branch -m q r/q
|
2008-02-01 10:50:53 +01:00
|
|
|
'
|
2006-11-28 15:47:40 +01:00
|
|
|
|
2011-08-20 23:49:48 +02:00
|
|
|
test_expect_success 'git branch -M foo bar should fail when bar is checked out' '
|
|
|
|
|
git branch bar &&
|
|
|
|
|
git checkout -b foo &&
|
|
|
|
|
test_must_fail git branch -M bar foo
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git branch -M baz bam should succeed when baz is checked out' '
|
|
|
|
|
git checkout -b baz &&
|
|
|
|
|
git branch bam &&
|
|
|
|
|
git branch -M baz bam
|
|
|
|
|
'
|
|
|
|
|
|
2011-11-26 03:30:02 +01:00
|
|
|
test_expect_success 'git branch -M master should work when master is checked out' '
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git branch -M master
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git branch -M master master should work when master is checked out' '
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git branch -M master master
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git branch -M master2 master2 should work when master is checked out' '
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git branch master2 &&
|
|
|
|
|
git branch -M master2 master2
|
|
|
|
|
'
|
|
|
|
|
|
2011-08-28 16:54:31 +02:00
|
|
|
test_expect_success 'git branch -v -d t should work' '
|
|
|
|
|
git branch t &&
|
2011-09-13 18:13:58 +02:00
|
|
|
test_path_is_file .git/refs/heads/t &&
|
2011-08-28 16:54:31 +02:00
|
|
|
git branch -v -d t &&
|
2011-09-13 18:13:58 +02:00
|
|
|
test_path_is_missing .git/refs/heads/t
|
2011-08-28 16:54:31 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git branch -v -m t s should work' '
|
|
|
|
|
git branch t &&
|
2011-09-13 18:13:58 +02:00
|
|
|
test_path_is_file .git/refs/heads/t &&
|
2011-08-28 16:54:31 +02:00
|
|
|
git branch -v -m t s &&
|
2011-09-13 18:13:58 +02:00
|
|
|
test_path_is_missing .git/refs/heads/t &&
|
|
|
|
|
test_path_is_file .git/refs/heads/s &&
|
2011-08-28 16:54:31 +02:00
|
|
|
git branch -d s
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git branch -m -d t s should fail' '
|
|
|
|
|
git branch t &&
|
2011-09-13 18:13:58 +02:00
|
|
|
test_path_is_file .git/refs/heads/t &&
|
2011-08-28 16:54:31 +02:00
|
|
|
test_must_fail git branch -m -d t s &&
|
|
|
|
|
git branch -d t &&
|
2011-09-13 18:13:58 +02:00
|
|
|
test_path_is_missing .git/refs/heads/t
|
2011-08-28 16:54:31 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git branch --list -d t should fail' '
|
|
|
|
|
git branch t &&
|
2011-09-13 18:13:58 +02:00
|
|
|
test_path_is_file .git/refs/heads/t &&
|
2011-08-28 16:54:31 +02:00
|
|
|
test_must_fail git branch --list -d t &&
|
|
|
|
|
git branch -d t &&
|
2011-09-13 18:13:58 +02:00
|
|
|
test_path_is_missing .git/refs/heads/t
|
2011-08-28 16:54:31 +02:00
|
|
|
'
|
|
|
|
|
|
2012-04-13 12:54:38 +02:00
|
|
|
test_expect_success 'git branch --column' '
|
|
|
|
|
COLUMNS=81 git branch --column=column >actual &&
|
|
|
|
|
cat >expected <<\EOF &&
|
|
|
|
|
a/b/c bam foo l * master n o/p r
|
|
|
|
|
abc bar j/k m/m master2 o/o q
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git branch --column with an extremely long branch name' '
|
|
|
|
|
long=this/is/a/part/of/long/branch/name &&
|
|
|
|
|
long=z$long/$long/$long/$long &&
|
|
|
|
|
test_when_finished "git branch -d $long" &&
|
|
|
|
|
git branch $long &&
|
|
|
|
|
COLUMNS=80 git branch --column=column >actual &&
|
|
|
|
|
cat >expected <<EOF &&
|
|
|
|
|
a/b/c
|
|
|
|
|
abc
|
|
|
|
|
bam
|
|
|
|
|
bar
|
|
|
|
|
foo
|
|
|
|
|
j/k
|
|
|
|
|
l
|
|
|
|
|
m/m
|
|
|
|
|
* master
|
|
|
|
|
master2
|
|
|
|
|
n
|
|
|
|
|
o/o
|
|
|
|
|
o/p
|
|
|
|
|
q
|
|
|
|
|
r
|
|
|
|
|
$long
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git branch with column.*' '
|
|
|
|
|
git config column.ui column &&
|
|
|
|
|
git config column.branch "dense" &&
|
|
|
|
|
COLUMNS=80 git branch >actual &&
|
|
|
|
|
git config --unset column.branch &&
|
|
|
|
|
git config --unset column.ui &&
|
|
|
|
|
cat >expected <<\EOF &&
|
|
|
|
|
a/b/c bam foo l * master n o/p r
|
|
|
|
|
abc bar j/k m/m master2 o/o q
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git branch --column -v should fail' '
|
|
|
|
|
test_must_fail git branch --column -v
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git branch -v with column.ui ignored' '
|
|
|
|
|
git config column.ui column &&
|
|
|
|
|
COLUMNS=80 git branch -v | cut -c -10 | sed "s/ *$//" >actual &&
|
|
|
|
|
git config --unset column.ui &&
|
|
|
|
|
cat >expected <<\EOF &&
|
|
|
|
|
a/b/c
|
|
|
|
|
abc
|
|
|
|
|
bam
|
|
|
|
|
bar
|
|
|
|
|
foo
|
|
|
|
|
j/k
|
|
|
|
|
l
|
|
|
|
|
m/m
|
|
|
|
|
* master
|
|
|
|
|
master2
|
|
|
|
|
n
|
|
|
|
|
o/o
|
|
|
|
|
o/p
|
|
|
|
|
q
|
|
|
|
|
r
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
2007-04-05 16:20:55 +02:00
|
|
|
mv .git/config .git/config-saved
|
|
|
|
|
|
2007-04-06 07:42:04 +02:00
|
|
|
test_expect_success 'git branch -m q q2 without config should succeed' '
|
2007-07-03 07:52:14 +02:00
|
|
|
git branch -m q q2 &&
|
|
|
|
|
git branch -m q2 q
|
2007-04-05 16:20:55 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
mv .git/config-saved .git/config
|
|
|
|
|
|
2007-07-03 07:52:14 +02:00
|
|
|
git config branch.s/s.dummy Hello
|
2006-12-16 15:15:02 +01:00
|
|
|
|
2013-03-20 13:30:12 +01:00
|
|
|
test_expect_success 'git branch -m s/s s should work when s/t is deleted' '
|
|
|
|
|
git branch -l s/s &&
|
2011-09-13 18:13:58 +02:00
|
|
|
test_path_is_file .git/logs/refs/heads/s/s &&
|
2013-03-20 13:30:12 +01:00
|
|
|
git branch -l s/t &&
|
2011-09-13 18:13:58 +02:00
|
|
|
test_path_is_file .git/logs/refs/heads/s/t &&
|
2013-03-20 13:30:12 +01:00
|
|
|
git branch -d s/t &&
|
|
|
|
|
git branch -m s/s s &&
|
|
|
|
|
test_path_is_file .git/logs/refs/heads/s
|
|
|
|
|
'
|
2006-11-28 15:47:40 +01:00
|
|
|
|
2013-03-20 13:30:12 +01:00
|
|
|
test_expect_success 'config information was renamed, too' '
|
|
|
|
|
test $(git config branch.s.dummy) = Hello &&
|
|
|
|
|
test_must_fail git config branch.s/s/dummy
|
|
|
|
|
'
|
2006-12-16 15:15:02 +01:00
|
|
|
|
2012-10-18 14:05:17 +02:00
|
|
|
test_expect_success 'deleting a symref' '
|
|
|
|
|
git branch target &&
|
|
|
|
|
git symbolic-ref refs/heads/symref refs/heads/target &&
|
2012-10-18 14:08:03 +02:00
|
|
|
echo "Deleted branch symref (was refs/heads/target)." >expect &&
|
2012-10-18 14:05:17 +02:00
|
|
|
git branch -d symref >actual &&
|
|
|
|
|
test_path_is_file .git/refs/heads/target &&
|
|
|
|
|
test_path_is_missing .git/refs/heads/symref &&
|
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2012-10-18 14:07:11 +02:00
|
|
|
test_expect_success 'deleting a dangling symref' '
|
|
|
|
|
git symbolic-ref refs/heads/dangling-symref nowhere &&
|
|
|
|
|
test_path_is_file .git/refs/heads/dangling-symref &&
|
2012-10-18 14:08:03 +02:00
|
|
|
echo "Deleted branch dangling-symref (was nowhere)." >expect &&
|
2012-10-18 14:07:11 +02:00
|
|
|
git branch -d dangling-symref >actual &&
|
|
|
|
|
test_path_is_missing .git/refs/heads/dangling-symref &&
|
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2013-03-20 13:30:12 +01:00
|
|
|
test_expect_success 'renaming a symref is not allowed' '
|
2008-10-26 03:33:56 +01:00
|
|
|
git symbolic-ref refs/heads/master2 refs/heads/master &&
|
2008-10-29 01:05:27 +01:00
|
|
|
test_must_fail git branch -m master2 master3 &&
|
|
|
|
|
git symbolic-ref refs/heads/master2 &&
|
2011-09-13 18:13:58 +02:00
|
|
|
test_path_is_file .git/refs/heads/master &&
|
|
|
|
|
test_path_is_missing .git/refs/heads/master3
|
2008-10-26 03:33:56 +01:00
|
|
|
'
|
|
|
|
|
|
2013-03-20 13:30:12 +01:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
The current code for validating tracking branches (e.g. the argument to
the -t/--track option) hardcodes refs/heads/* and refs/remotes/* as the
potential locations for tracking branches. This works with the refspecs
created by "git clone" or "git remote add", but is suboptimal in other
cases:
- If "refs/remotes/foo/bar" exists without any association to a remote
(i.e. there is no remote named "foo", or no remote with a refspec
that matches "refs/remotes/foo/bar"), then it is impossible to set up
a valid upstream config that tracks it. Currently, the code defaults
to using "refs/remotes/foo/bar" from repo "." as the upstream, which
works, but is probably not what the user had in mind when running
"git branch baz --track foo/bar".
- If the user has tweaked the fetch refspec for a remote to put its
remote-tracking branches outside of refs/remotes/*, e.g. by running
git config remote.foo.fetch "+refs/heads/*:refs/foo_stuff/*"
then the current code will refuse to use its remote-tracking branches
as --track arguments, since they do not match refs/remotes/*.
This patch removes the "refs/remotes/*" requirement for upstream branches,
and replaces it with explicit checking of the refspecs for each remote to
determine whether a given --track argument is a valid remote-tracking
branch. This solves both of the above problems, since the matching refspec
guarantees that there is a both a remote name and a remote branch name
that can be used for the upstream config.
However, this means that refs located within refs/remotes/* without a
corresponding remote/refspec will no longer be usable as upstreams.
The few existing tests which depended on this behavioral quirk has
already been fixed in the preceding patches.
This patch fixes the last remaining test failure in t2024-checkout-dwim.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-21 23:52:05 +02:00
|
|
|
test_expect_success 'tracking setup fails on non-matching refspec' '
|
2013-03-20 13:30:12 +01:00
|
|
|
git config remote.local.url . &&
|
2013-09-08 22:58:12 +02:00
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
2013-03-20 13:30:12 +01:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2013-09-08 22:58:12 +02:00
|
|
|
git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
|
2013-04-21 23:52:02 +02:00
|
|
|
test_must_fail git branch --track my5 local/master &&
|
|
|
|
|
test_must_fail git config branch.my5.remote &&
|
|
|
|
|
test_must_fail git config branch.my5.merge
|
2013-03-20 13:30:12 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
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 &&
|
2013-08-31 06:31:49 +02:00
|
|
|
git config branch.autosetupmerge false &&
|
2013-03-20 13:30:12 +01:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2013-04-01 17:59:14 +02:00
|
|
|
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 -
|
|
|
|
|
'
|
|
|
|
|
|
2013-04-02 21:02:53 +02:00
|
|
|
test_expect_success '--set-upstream-to fails on a missing dst branch' '
|
|
|
|
|
test_must_fail git branch --set-upstream-to master does-not-exist
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '--set-upstream-to fails on a missing src branch' '
|
|
|
|
|
test_must_fail git branch --set-upstream-to does-not-exist master
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '--set-upstream-to fails on a non-ref' '
|
|
|
|
|
test_must_fail git branch --set-upstream-to HEAD^{}
|
|
|
|
|
'
|
|
|
|
|
|
2013-03-20 13:30:12 +01:00
|
|
|
test_expect_success 'use --set-upstream-to modify HEAD' '
|
|
|
|
|
test_config branch.master.remote foo &&
|
|
|
|
|
test_config branch.master.merge foo &&
|
2013-08-31 06:31:50 +02:00
|
|
|
git branch my12 &&
|
2013-03-20 13:30:12 +01:00
|
|
|
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' '
|
2013-08-31 06:31:50 +02:00
|
|
|
git branch my13 &&
|
2013-03-20 13:30:12 +01:00
|
|
|
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' '
|
2013-08-31 06:31:50 +02:00
|
|
|
git branch my14 &&
|
2013-03-20 13:30:12 +01:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2013-04-01 17:59:14 +02:00
|
|
|
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 -
|
|
|
|
|
'
|
|
|
|
|
|
2013-03-20 13:30:12 +01:00
|
|
|
test_expect_success 'test --unset-upstream on a particular branch' '
|
2013-08-31 06:31:50 +02:00
|
|
|
git branch my15 &&
|
2013-03-20 13:30:12 +01:00
|
|
|
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 &&
|
2012-08-30 19:23:13 +02:00
|
|
|
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:
|
|
|
|
|
|
|
|
|
|
git branch -d origin/master
|
|
|
|
|
git branch --set-upstream-to origin/master
|
|
|
|
|
EOF
|
2013-03-20 13:30:12 +01:00
|
|
|
test_cmp expected actual
|
2012-08-30 19:23:13 +02:00
|
|
|
'
|
|
|
|
|
|
2013-03-20 13:30:12 +01:00
|
|
|
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 &&
|
2012-08-30 19:23:13 +02:00
|
|
|
The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
|
|
|
|
|
EOF
|
2013-03-20 13:30:12 +01:00
|
|
|
test_cmp expected actual
|
2012-08-30 19:23:13 +02:00
|
|
|
'
|
|
|
|
|
|
2013-03-20 13:30:12 +01:00
|
|
|
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 &&
|
2012-08-30 19:23:13 +02:00
|
|
|
The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
|
|
|
|
|
EOF
|
2013-03-20 13:30:12 +01:00
|
|
|
test_cmp expected actual
|
2012-08-30 19:23:13 +02:00
|
|
|
'
|
|
|
|
|
|
2014-03-05 08:31:55 +01:00
|
|
|
test_expect_success '--set-upstream-to notices an error to set branch as own upstream' '
|
|
|
|
|
git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
|
|
|
|
|
cat >expected <<-\EOF &&
|
|
|
|
|
warning: Not setting branch my13 as its own upstream.
|
|
|
|
|
EOF
|
|
|
|
|
test_expect_code 1 git config branch.my13.remote &&
|
|
|
|
|
test_expect_code 1 git config branch.my13.merge &&
|
|
|
|
|
test_i18ncmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
2007-03-08 10:58:35 +01:00
|
|
|
# Keep this test last, as it changes the current branch
|
|
|
|
|
cat >expect <<EOF
|
2011-04-24 07:34:13 +02:00
|
|
|
$_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
|
2007-03-08 10:58:35 +01:00
|
|
|
EOF
|
2013-03-20 13:30:12 +01:00
|
|
|
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
|
|
|
|
|
'
|
2007-03-08 10:58:35 +01:00
|
|
|
|
2010-05-22 02:28:38 +02:00
|
|
|
test_expect_success 'checkout -b makes reflog by default' '
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git config --unset core.logAllRefUpdates &&
|
|
|
|
|
git checkout -b alpha &&
|
2010-07-21 21:47:48 +02:00
|
|
|
git rev-parse --verify alpha@{0}
|
2010-05-22 02:28:38 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'checkout -b does not make reflog when core.logAllRefUpdates = false' '
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git config core.logAllRefUpdates false &&
|
|
|
|
|
git checkout -b beta &&
|
2010-07-21 21:47:48 +02:00
|
|
|
test_must_fail git rev-parse --verify beta@{0}
|
2010-05-22 02:28:38 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates = false' '
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git checkout -lb gamma &&
|
|
|
|
|
git config --unset core.logAllRefUpdates &&
|
2010-07-21 21:47:48 +02:00
|
|
|
git rev-parse --verify gamma@{0}
|
2010-05-22 02:28:38 +02:00
|
|
|
'
|
|
|
|
|
|
2008-03-18 03:04:40 +01:00
|
|
|
test_expect_success 'avoid ambiguous track' '
|
|
|
|
|
git config branch.autosetupmerge true &&
|
|
|
|
|
git config remote.ambi1.url lalala &&
|
|
|
|
|
git config remote.ambi1.fetch refs/heads/lalala:refs/heads/master &&
|
|
|
|
|
git config remote.ambi2.url lilili &&
|
|
|
|
|
git config remote.ambi2.fetch refs/heads/lilili:refs/heads/master &&
|
|
|
|
|
git branch all1 master &&
|
|
|
|
|
test -z "$(git config branch.all1.merge)"
|
|
|
|
|
'
|
|
|
|
|
|
2008-05-11 00:36:29 +02:00
|
|
|
test_expect_success 'autosetuprebase local on a tracked local branch' '
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
|
|
|
|
git config branch.autosetuprebase local &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/o || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch mybase &&
|
|
|
|
|
git branch --track myr1 mybase &&
|
|
|
|
|
test "$(git config branch.myr1.remote)" = . &&
|
|
|
|
|
test "$(git config branch.myr1.merge)" = refs/heads/mybase &&
|
|
|
|
|
test "$(git config branch.myr1.rebase)" = true
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase always on a tracked local branch' '
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
|
|
|
|
git config branch.autosetuprebase always &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/o || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch mybase2 &&
|
|
|
|
|
git branch --track myr2 mybase &&
|
|
|
|
|
test "$(git config branch.myr2.remote)" = . &&
|
|
|
|
|
test "$(git config branch.myr2.merge)" = refs/heads/mybase &&
|
|
|
|
|
test "$(git config branch.myr2.rebase)" = true
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase remote on a tracked local branch' '
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
|
|
|
|
git config branch.autosetuprebase remote &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/o || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch mybase3 &&
|
|
|
|
|
git branch --track myr3 mybase2 &&
|
|
|
|
|
test "$(git config branch.myr3.remote)" = . &&
|
|
|
|
|
test "$(git config branch.myr3.merge)" = refs/heads/mybase2 &&
|
|
|
|
|
! test "$(git config branch.myr3.rebase)" = true
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase never on a tracked local branch' '
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
|
|
|
|
git config branch.autosetuprebase never &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/o || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch mybase4 &&
|
|
|
|
|
git branch --track myr4 mybase2 &&
|
|
|
|
|
test "$(git config branch.myr4.remote)" = . &&
|
|
|
|
|
test "$(git config branch.myr4.merge)" = refs/heads/mybase2 &&
|
|
|
|
|
! test "$(git config branch.myr4.rebase)" = true
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase local on a tracked remote branch' '
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
|
|
|
|
git config branch.autosetuprebase local &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --track myr5 local/master &&
|
|
|
|
|
test "$(git config branch.myr5.remote)" = local &&
|
|
|
|
|
test "$(git config branch.myr5.merge)" = refs/heads/master &&
|
|
|
|
|
! test "$(git config branch.myr5.rebase)" = true
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase never on a tracked remote branch' '
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
|
|
|
|
git config branch.autosetuprebase never &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --track myr6 local/master &&
|
|
|
|
|
test "$(git config branch.myr6.remote)" = local &&
|
|
|
|
|
test "$(git config branch.myr6.merge)" = refs/heads/master &&
|
|
|
|
|
! test "$(git config branch.myr6.rebase)" = true
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase remote on a tracked remote branch' '
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
|
|
|
|
git config branch.autosetuprebase remote &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --track myr7 local/master &&
|
|
|
|
|
test "$(git config branch.myr7.remote)" = local &&
|
|
|
|
|
test "$(git config branch.myr7.merge)" = refs/heads/master &&
|
|
|
|
|
test "$(git config branch.myr7.rebase)" = true
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase always on a tracked remote branch' '
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
|
|
|
|
git config branch.autosetuprebase remote &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --track myr8 local/master &&
|
|
|
|
|
test "$(git config branch.myr8.remote)" = local &&
|
|
|
|
|
test "$(git config branch.myr8.merge)" = refs/heads/master &&
|
|
|
|
|
test "$(git config branch.myr8.rebase)" = true
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase unconfigured on a tracked remote branch' '
|
|
|
|
|
git config --unset branch.autosetuprebase &&
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --track myr9 local/master &&
|
|
|
|
|
test "$(git config branch.myr9.remote)" = local &&
|
|
|
|
|
test "$(git config branch.myr9.merge)" = refs/heads/master &&
|
|
|
|
|
test "z$(git config branch.myr9.rebase)" = z
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase unconfigured on a tracked local branch' '
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/o || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch mybase10 &&
|
|
|
|
|
git branch --track myr10 mybase2 &&
|
|
|
|
|
test "$(git config branch.myr10.remote)" = . &&
|
|
|
|
|
test "$(git config branch.myr10.merge)" = refs/heads/mybase2 &&
|
|
|
|
|
test "z$(git config branch.myr10.rebase)" = z
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase unconfigured on untracked local branch' '
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --no-track myr11 mybase2 &&
|
|
|
|
|
test "z$(git config branch.myr11.remote)" = z &&
|
|
|
|
|
test "z$(git config branch.myr11.merge)" = z &&
|
|
|
|
|
test "z$(git config branch.myr11.rebase)" = z
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase unconfigured on untracked remote branch' '
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --no-track myr12 local/master &&
|
|
|
|
|
test "z$(git config branch.myr12.remote)" = z &&
|
|
|
|
|
test "z$(git config branch.myr12.merge)" = z &&
|
|
|
|
|
test "z$(git config branch.myr12.rebase)" = z
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase never on an untracked local branch' '
|
|
|
|
|
git config branch.autosetuprebase never &&
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --no-track myr13 mybase2 &&
|
|
|
|
|
test "z$(git config branch.myr13.remote)" = z &&
|
|
|
|
|
test "z$(git config branch.myr13.merge)" = z &&
|
|
|
|
|
test "z$(git config branch.myr13.rebase)" = z
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase local on an untracked local branch' '
|
|
|
|
|
git config branch.autosetuprebase local &&
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --no-track myr14 mybase2 &&
|
|
|
|
|
test "z$(git config branch.myr14.remote)" = z &&
|
|
|
|
|
test "z$(git config branch.myr14.merge)" = z &&
|
|
|
|
|
test "z$(git config branch.myr14.rebase)" = z
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase remote on an untracked local branch' '
|
|
|
|
|
git config branch.autosetuprebase remote &&
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --no-track myr15 mybase2 &&
|
|
|
|
|
test "z$(git config branch.myr15.remote)" = z &&
|
|
|
|
|
test "z$(git config branch.myr15.merge)" = z &&
|
|
|
|
|
test "z$(git config branch.myr15.rebase)" = z
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase always on an untracked local branch' '
|
|
|
|
|
git config branch.autosetuprebase always &&
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --no-track myr16 mybase2 &&
|
|
|
|
|
test "z$(git config branch.myr16.remote)" = z &&
|
|
|
|
|
test "z$(git config branch.myr16.merge)" = z &&
|
|
|
|
|
test "z$(git config branch.myr16.rebase)" = z
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase never on an untracked remote branch' '
|
|
|
|
|
git config branch.autosetuprebase never &&
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --no-track myr17 local/master &&
|
|
|
|
|
test "z$(git config branch.myr17.remote)" = z &&
|
|
|
|
|
test "z$(git config branch.myr17.merge)" = z &&
|
|
|
|
|
test "z$(git config branch.myr17.rebase)" = z
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase local on an untracked remote branch' '
|
|
|
|
|
git config branch.autosetuprebase local &&
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --no-track myr18 local/master &&
|
|
|
|
|
test "z$(git config branch.myr18.remote)" = z &&
|
|
|
|
|
test "z$(git config branch.myr18.merge)" = z &&
|
|
|
|
|
test "z$(git config branch.myr18.rebase)" = z
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase remote on an untracked remote branch' '
|
|
|
|
|
git config branch.autosetuprebase remote &&
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --no-track myr19 local/master &&
|
|
|
|
|
test "z$(git config branch.myr19.remote)" = z &&
|
|
|
|
|
test "z$(git config branch.myr19.merge)" = z &&
|
|
|
|
|
test "z$(git config branch.myr19.rebase)" = z
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'autosetuprebase always on an untracked remote branch' '
|
|
|
|
|
git config branch.autosetuprebase always &&
|
|
|
|
|
git config remote.local.url . &&
|
|
|
|
|
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
|
2008-09-03 10:59:27 +02:00
|
|
|
(git show-ref -q refs/remotes/local/master || git fetch local) &&
|
2008-05-11 00:36:29 +02:00
|
|
|
git branch --no-track myr20 local/master &&
|
|
|
|
|
test "z$(git config branch.myr20.remote)" = z &&
|
|
|
|
|
test "z$(git config branch.myr20.merge)" = z &&
|
|
|
|
|
test "z$(git config branch.myr20.rebase)" = z
|
|
|
|
|
'
|
|
|
|
|
|
2011-02-17 00:12:20 +01:00
|
|
|
test_expect_success 'autosetuprebase always on detached HEAD' '
|
|
|
|
|
git config branch.autosetupmerge always &&
|
|
|
|
|
test_when_finished git checkout master &&
|
|
|
|
|
git checkout HEAD^0 &&
|
|
|
|
|
git branch my11 &&
|
|
|
|
|
test -z "$(git config branch.my11.remote)" &&
|
|
|
|
|
test -z "$(git config branch.my11.merge)"
|
|
|
|
|
'
|
|
|
|
|
|
2008-05-11 00:36:29 +02:00
|
|
|
test_expect_success 'detect misconfigured autosetuprebase (bad value)' '
|
|
|
|
|
git config branch.autosetuprebase garbage &&
|
|
|
|
|
test_must_fail git branch
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'detect misconfigured autosetuprebase (no value)' '
|
|
|
|
|
git config --unset branch.autosetuprebase &&
|
2013-03-20 13:30:12 +01:00
|
|
|
echo "[branch] autosetuprebase" >>.git/config &&
|
2008-05-11 00:36:29 +02:00
|
|
|
test_must_fail git branch &&
|
|
|
|
|
git config --unset branch.autosetuprebase
|
|
|
|
|
'
|
|
|
|
|
|
2009-12-30 07:43:04 +01:00
|
|
|
test_expect_success 'attempt to delete a branch without base and unmerged to HEAD' '
|
|
|
|
|
git checkout my9 &&
|
|
|
|
|
git config --unset branch.my8.merge &&
|
|
|
|
|
test_must_fail git branch -d my8
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'attempt to delete a branch merged to its base' '
|
|
|
|
|
# we are on my9 which is the initial commit; traditionally
|
|
|
|
|
# we would not have allowed deleting my8 that is not merged
|
|
|
|
|
# to my9, but it is set to track master that already has my8
|
|
|
|
|
git config branch.my8.merge refs/heads/master &&
|
|
|
|
|
git branch -d my8
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'attempt to delete a branch merged to its base' '
|
|
|
|
|
git checkout master &&
|
|
|
|
|
echo Third >>A &&
|
|
|
|
|
git commit -m "Third commit" A &&
|
|
|
|
|
git branch -t my10 my9 &&
|
|
|
|
|
git branch -f my10 HEAD^ &&
|
|
|
|
|
# we are on master which is at the third commit, and my10
|
|
|
|
|
# is behind us, so traditionally we would have allowed deleting
|
|
|
|
|
# it; but my10 is set to track my9 that is further behind.
|
|
|
|
|
test_must_fail git branch -d my10
|
|
|
|
|
'
|
|
|
|
|
|
2011-09-17 01:28:38 +02:00
|
|
|
test_expect_success 'use set-upstream on the current branch' '
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git --bare init myupstream.git &&
|
|
|
|
|
git push myupstream.git master:refs/heads/frotz &&
|
|
|
|
|
git remote add origin myupstream.git &&
|
|
|
|
|
git fetch &&
|
|
|
|
|
git branch --set-upstream master origin/frotz &&
|
|
|
|
|
|
|
|
|
|
test "z$(git config branch.master.remote)" = "zorigin" &&
|
|
|
|
|
test "z$(git config branch.master.merge)" = "zrefs/heads/frotz"
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2012-02-06 02:13:36 +01:00
|
|
|
test_expect_success 'use --edit-description' '
|
|
|
|
|
write_script editor <<-\EOF &&
|
|
|
|
|
echo "New contents" >"$1"
|
|
|
|
|
EOF
|
|
|
|
|
EDITOR=./editor git branch --edit-description &&
|
|
|
|
|
write_script editor <<-\EOF &&
|
|
|
|
|
git stripspace -s <"$1" >"EDITOR_OUTPUT"
|
|
|
|
|
EOF
|
|
|
|
|
EDITOR=./editor git branch --edit-description &&
|
|
|
|
|
echo "New contents" >expect &&
|
|
|
|
|
test_cmp EDITOR_OUTPUT expect
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'detect typo in branch name when using --edit-description' '
|
|
|
|
|
write_script editor <<-\EOF &&
|
|
|
|
|
echo "New contents" >"$1"
|
|
|
|
|
EOF
|
2014-03-18 19:54:05 +01:00
|
|
|
test_must_fail env EDITOR=./editor git branch --edit-description no-such-branch
|
2012-02-06 02:13:36 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'refuse --edit-description on unborn branch for now' '
|
|
|
|
|
write_script editor <<-\EOF &&
|
|
|
|
|
echo "New contents" >"$1"
|
|
|
|
|
EOF
|
|
|
|
|
git checkout --orphan unborn &&
|
2014-03-18 19:54:05 +01:00
|
|
|
test_must_fail env EDITOR=./editor git branch --edit-description
|
2012-02-06 02:13:36 +01:00
|
|
|
'
|
|
|
|
|
|
2012-02-27 16:11:53 +01:00
|
|
|
test_expect_success '--merged catches invalid object names' '
|
|
|
|
|
test_must_fail git branch --merged 0000000000000000000000000000000000000000
|
|
|
|
|
'
|
|
|
|
|
|
2013-09-08 22:58:15 +02:00
|
|
|
test_expect_success 'tracking with unexpected .fetch refspec' '
|
2013-09-14 09:36:24 +02:00
|
|
|
rm -rf a b c d &&
|
t3200: Add test demonstrating minor regression in 41c21f2
In 41c21f2 (branch.c: Validate tracking branches with refspecs instead of
refs/remotes/*), we changed the rules for what is considered a valid tracking
branch (a.k.a. upstream branch). We now use the configured remotes and their
refspecs to determine whether a proposed tracking branch is in fact within
the domain of a remote, and we then use that information to deduce the
upstream configuration (branch.<name>.remote and branch.<name>.merge).
However, with that change, we also check that - in addition to a matching
refspec - the result of mapping the tracking branch through that refspec
(i.e. the corresponding ref name in the remote repo) happens to start with
"refs/heads/". In other words, we require that a tracking branch refers to
a _branch_ in the remote repo.
Now, consider that you are e.g. setting up an automated building/testing
infrastructure for a group of similar "source" repositories. The build/test
infrastructure consists of a central scheduler, and a number of build/test
"slave" machines that perform the actual build/test work. The scheduler
monitors the group of similar repos for changes (e.g. with a periodic
"git fetch"), and triggers builds/tests to be run on one or more slaves.
Graphically the changes flow between the repos like this:
Source #1 -------v ----> Slave #1
/
Source #2 -----> Scheduler -----> Slave #2
\
Source #3 -------^ ----> Slave #3
... ...
The scheduler maintains a single Git repo with each of the source repos set
up as distinct remotes. The slaves also need access to all the changes from
all of the source repos, so they pull from the scheduler repo, but using the
following custom refspec:
remote.origin.fetch = "+refs/remotes/*:refs/remotes/*"
This makes all of the scheduler's remote-tracking branches automatically
available as identical remote-tracking branches in each of the slaves.
Now, consider what happens if a slave tries to create a local branch with
one of the remote-tracking branches as upstream:
git branch local_branch --track refs/remotes/source-1/some_branch
Git now looks at the configured remotes (in this case there is only "origin",
pointing to the scheduler's repo) and sees refs/remotes/source-1/some_branch
matching origin's refspec. Mapping through that refspec we find that the
corresponding remote ref name is "refs/remotes/source-1/some_branch".
However, since this remote ref name does not start with "refs/heads/", we
discard it as a suitable upstream, and the whole command fails.
This patch adds a testcase demonstrating this failure by creating two
source repos ("a" and "b") that are forwarded through a scheduler ("c")
to a slave repo ("d"), that then tries create a local branch with an
upstream. See the next patch in this series for the exciting conclusion
to this story...
Reported-by: Per Cederqvist <cederp@opera.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-08 22:58:14 +02:00
|
|
|
git init a &&
|
|
|
|
|
(
|
|
|
|
|
cd a &&
|
|
|
|
|
test_commit a
|
|
|
|
|
) &&
|
|
|
|
|
git init b &&
|
|
|
|
|
(
|
|
|
|
|
cd b &&
|
|
|
|
|
test_commit b
|
|
|
|
|
) &&
|
|
|
|
|
git init c &&
|
|
|
|
|
(
|
|
|
|
|
cd c &&
|
|
|
|
|
test_commit c &&
|
|
|
|
|
git remote add a ../a &&
|
|
|
|
|
git remote add b ../b &&
|
|
|
|
|
git fetch --all
|
|
|
|
|
) &&
|
|
|
|
|
git init d &&
|
|
|
|
|
(
|
|
|
|
|
cd d &&
|
|
|
|
|
git remote add c ../c &&
|
|
|
|
|
git config remote.c.fetch "+refs/remotes/*:refs/remotes/*" &&
|
|
|
|
|
git fetch c &&
|
|
|
|
|
git branch --track local/a/master remotes/a/master &&
|
|
|
|
|
test "$(git config branch.local/a/master.remote)" = "c" &&
|
|
|
|
|
test "$(git config branch.local/a/master.merge)" = "refs/remotes/a/master" &&
|
|
|
|
|
git rev-parse --verify a >expect &&
|
|
|
|
|
git rev-parse --verify local/a/master >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2005-09-08 04:13:26 +02:00
|
|
|
test_done
|