2005-09-08 02:13:26 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Amos Waterland
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='git branch --foo should not create bogus branch
|
|
|
|
|
|
|
|
This test runs git branch --help and checks that the argument is properly
|
|
|
|
handled. Specifically, that a bogus branch is not created.
|
|
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success \
|
2007-04-06 23:48:54 +00:00
|
|
|
'prepare a trivial repository' \
|
2005-09-08 02:13:26 +00:00
|
|
|
'echo Hello > A &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git update-index --add A &&
|
2006-05-25 03:34:04 +00:00
|
|
|
git-commit -m "Initial commit." &&
|
2007-07-03 05:52:14 +00:00
|
|
|
HEAD=$(git rev-parse --verify HEAD)'
|
2005-09-08 02:13:26 +00:00
|
|
|
|
|
|
|
test_expect_failure \
|
|
|
|
'git branch --help should not have created a bogus branch' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch --help </dev/null >/dev/null 2>/dev/null || :
|
2006-10-24 05:48:45 +00:00
|
|
|
test -f .git/refs/heads/--help'
|
2005-09-08 02:13:26 +00:00
|
|
|
|
2005-11-14 22:10:59 +00:00
|
|
|
test_expect_success \
|
|
|
|
'git branch abc should create a branch' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch abc && test -f .git/refs/heads/abc'
|
2005-11-14 22:10:59 +00:00
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'git branch a/b/c should create a branch' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch a/b/c && test -f .git/refs/heads/a/b/c'
|
2005-11-14 22:10:59 +00:00
|
|
|
|
2006-05-25 03:34:04 +00:00
|
|
|
cat >expect <<EOF
|
2006-10-24 05:48:45 +00:00
|
|
|
0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
|
2006-05-25 03:34:04 +00:00
|
|
|
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" \
|
2007-07-03 05:52:14 +00:00
|
|
|
git branch -l d/e/f &&
|
2006-05-25 03:34:04 +00:00
|
|
|
test -f .git/refs/heads/d/e/f &&
|
|
|
|
test -f .git/logs/refs/heads/d/e/f &&
|
|
|
|
diff expect .git/logs/refs/heads/d/e/f'
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'git branch -d d/e/f should delete a branch and a log' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch -d d/e/f &&
|
2006-05-25 03:34:04 +00:00
|
|
|
test ! -f .git/refs/heads/d/e/f &&
|
|
|
|
test ! -f .git/logs/refs/heads/d/e/f'
|
|
|
|
|
2006-09-26 05:23:37 +00:00
|
|
|
test_expect_success \
|
|
|
|
'git branch j/k should work after branch j has been deleted' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch j &&
|
|
|
|
git branch -d j &&
|
|
|
|
git branch j/k'
|
2006-09-26 05:23:37 +00:00
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'git branch l should work after branch l/m has been deleted' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch l/m &&
|
|
|
|
git branch -d l/m &&
|
|
|
|
git branch l'
|
2006-09-26 05:23:37 +00:00
|
|
|
|
2006-11-28 14:47:40 +00:00
|
|
|
test_expect_success \
|
|
|
|
'git branch -m m m/m should work' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch -l m &&
|
|
|
|
git branch -m m m/m &&
|
2006-11-28 14:47:40 +00:00
|
|
|
test -f .git/logs/refs/heads/m/m'
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'git branch -m n/n n should work' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch -l n/n &&
|
|
|
|
git branch -m n/n n
|
2006-11-28 14:47:40 +00:00
|
|
|
test -f .git/logs/refs/heads/n'
|
|
|
|
|
|
|
|
test_expect_failure \
|
|
|
|
'git branch -m o/o o should fail when o/p exists' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch o/o &&
|
|
|
|
git branch o/p &&
|
|
|
|
git branch -m o/o o'
|
2006-11-28 14:47:40 +00:00
|
|
|
|
|
|
|
test_expect_failure \
|
|
|
|
'git branch -m q r/q should fail when r exists' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch q &&
|
|
|
|
git branch r &&
|
|
|
|
git branch -m q r/q'
|
2006-11-28 14:47:40 +00:00
|
|
|
|
2007-04-05 14:20:55 +00:00
|
|
|
mv .git/config .git/config-saved
|
|
|
|
|
2007-04-06 05:42:04 +00:00
|
|
|
test_expect_success 'git branch -m q q2 without config should succeed' '
|
2007-07-03 05:52:14 +00:00
|
|
|
git branch -m q q2 &&
|
|
|
|
git branch -m q2 q
|
2007-04-05 14:20:55 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
mv .git/config-saved .git/config
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
git config branch.s/s.dummy Hello
|
2006-12-16 14:15:02 +00:00
|
|
|
|
2006-11-28 14:47:40 +00:00
|
|
|
test_expect_success \
|
|
|
|
'git branch -m s/s s should work when s/t is deleted' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch -l s/s &&
|
2006-11-28 14:47:40 +00:00
|
|
|
test -f .git/logs/refs/heads/s/s &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git branch -l s/t &&
|
2006-11-28 14:47:40 +00:00
|
|
|
test -f .git/logs/refs/heads/s/t &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git branch -d s/t &&
|
|
|
|
git branch -m s/s s &&
|
2006-11-28 14:47:40 +00:00
|
|
|
test -f .git/logs/refs/heads/s'
|
|
|
|
|
2006-12-16 14:15:02 +00:00
|
|
|
test_expect_success 'config information was renamed, too' \
|
2007-07-03 05:52:14 +00:00
|
|
|
"test $(git config branch.s.dummy) = Hello &&
|
|
|
|
! git config branch.s/s/dummy"
|
2006-12-16 14:15:02 +00:00
|
|
|
|
2006-11-29 20:44:56 +00:00
|
|
|
test_expect_failure \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch -m u v should fail when the reflog for u is a symlink' \
|
|
|
|
'git branch -l u &&
|
2006-11-29 20:44:56 +00:00
|
|
|
mv .git/logs/refs/heads/u real-u &&
|
|
|
|
ln -s real-u .git/logs/refs/heads/u &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git branch -m u v'
|
2006-11-29 20:44:56 +00:00
|
|
|
|
2007-03-08 09:58:35 +00:00
|
|
|
test_expect_success 'test tracking setup via --track' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'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'
|
2007-03-08 09:58:35 +00:00
|
|
|
|
|
|
|
test_expect_success 'test tracking setup (non-wildcard, matching)' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'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'
|
2007-03-08 09:58:35 +00:00
|
|
|
|
|
|
|
test_expect_success 'test tracking setup (non-wildcard, not matching)' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'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'
|
2007-03-08 09:58:35 +00:00
|
|
|
|
|
|
|
test_expect_success 'test tracking setup via config' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'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'
|
2007-03-08 09:58:35 +00:00
|
|
|
|
2007-07-10 17:50:44 +00:00
|
|
|
test_expect_success 'avoid ambiguous track' '
|
2007-07-08 12:41:21 +00:00
|
|
|
git config branch.autosetupmerge true &&
|
2007-07-10 17:50:44 +00:00
|
|
|
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 &&
|
2007-07-08 12:41:21 +00:00
|
|
|
git branch all1 master &&
|
2007-07-10 17:50:44 +00:00
|
|
|
test -z "$(git config branch.all1.merge)"
|
2007-07-08 12:41:21 +00:00
|
|
|
'
|
|
|
|
|
2007-03-08 09:58:35 +00:00
|
|
|
test_expect_success 'test overriding tracking setup via --no-track' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'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'
|
2007-03-08 09:58:35 +00:00
|
|
|
|
2007-07-10 17:50:44 +00:00
|
|
|
test_expect_success 'no tracking without .fetch entries' \
|
git-fetch, git-branch: Support local --track via a special remote '.'
This patch adds support for a dummy remote '.' to avoid having
to declare a fake remote like
[remote "local"]
url = .
fetch = refs/heads/*:refs/heads/*
Such a builtin remote simplifies the operation of "git-fetch",
which will populate FETCH_HEAD but will not pretend that two
repositories are in use, will not create a thin pack, and will
not perform any useless remapping of names. The speed
improvement is around 20%, and it should improve more if
"git-fetch" is converted to a builtin.
To this end, git-parse-remote is grown with a new kind of
remote, 'builtin'. In git-fetch.sh, we treat the builtin remote
specially in that it needs no pack/store operations. In fact,
doing git-fetch on a builtin remote will simply populate
FETCH_HEAD appropriately.
The patch also improves of the --track/--no-track support,
extending it so that branch.<name>.remote items referring '.'
can be created. Finally, it fixes a typo in git-checkout.sh.
Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-03-15 08:23:20 +00:00
|
|
|
'git branch --track my6 s &&
|
2007-07-10 17:50:44 +00:00
|
|
|
test -z "$(git config branch.my6.remote)" &&
|
|
|
|
test -z "$(git config branch.my6.merge)"'
|
git-fetch, git-branch: Support local --track via a special remote '.'
This patch adds support for a dummy remote '.' to avoid having
to declare a fake remote like
[remote "local"]
url = .
fetch = refs/heads/*:refs/heads/*
Such a builtin remote simplifies the operation of "git-fetch",
which will populate FETCH_HEAD but will not pretend that two
repositories are in use, will not create a thin pack, and will
not perform any useless remapping of names. The speed
improvement is around 20%, and it should improve more if
"git-fetch" is converted to a builtin.
To this end, git-parse-remote is grown with a new kind of
remote, 'builtin'. In git-fetch.sh, we treat the builtin remote
specially in that it needs no pack/store operations. In fact,
doing git-fetch on a builtin remote will simply populate
FETCH_HEAD appropriately.
The patch also improves of the --track/--no-track support,
extending it so that branch.<name>.remote items referring '.'
can be created. Finally, it fixes a typo in git-checkout.sh.
Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-03-15 08:23:20 +00:00
|
|
|
|
2007-06-06 08:10:14 +00:00
|
|
|
test_expect_success 'test tracking setup via --track but deeper' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'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'
|
2007-06-06 08:10:14 +00:00
|
|
|
|
2007-06-09 12:40:35 +00:00
|
|
|
test_expect_success 'test deleting branch deletes branch config' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch -d my7 &&
|
2007-07-10 17:50:44 +00:00
|
|
|
test -z "$(git config branch.my7.remote)" &&
|
|
|
|
test -z "$(git config branch.my7.merge)"'
|
2007-06-09 12:40:35 +00:00
|
|
|
|
|
|
|
test_expect_success 'test deleting branch without config' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git branch my7 s &&
|
|
|
|
test "$(git branch -d my7 2>&1)" = "Deleted branch my7."'
|
2007-06-09 12:40:35 +00:00
|
|
|
|
2007-03-08 09:58:35 +00:00
|
|
|
# Keep this test last, as it changes the current branch
|
|
|
|
cat >expect <<EOF
|
|
|
|
0000000000000000000000000000000000000000 $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 -f .git/refs/heads/g/h/i &&
|
|
|
|
test -f .git/logs/refs/heads/g/h/i &&
|
|
|
|
diff expect .git/logs/refs/heads/g/h/i'
|
|
|
|
|
2005-09-08 02:13:26 +00:00
|
|
|
test_done
|