diff options
author | Junio C Hamano <junkio@cox.net> | 2006-12-13 22:07:51 +0300 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-13 22:07:51 +0300 |
commit | abcb49cb56fc6fa047a8838cd47fbdfa48791798 (patch) | |
tree | 5381eab9fd6fc651250d2db8635e2f557675ff7c /t | |
parent | 490e092defd01ff645457cde4e96bc0d0d534ccd (diff) | |
parent | 678d0f4cbfa7a3b529c6e894f2977bef6a2d3e4c (diff) |
Merge branch 'lh/branch-rename'
* lh/branch-rename:
git-branch: let caller specify logmsg
rename_ref: use lstat(2) when testing for symlink
git-branch: add options and tests for branch renaming
Conflicts:
builtin-branch.c
Diffstat (limited to 't')
-rwxr-xr-x | t/t3200-branch.sh | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index acb54b6a07..5782c30b03 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -70,4 +70,45 @@ test_expect_success \ git-branch -d l/m && git-branch l' +test_expect_success \ + 'git branch -m m m/m should work' \ + 'git-branch -l m && + git-branch -m m m/m && + test -f .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 -f .git/logs/refs/heads/n' + +test_expect_failure \ + 'git branch -m o/o o should fail when o/p exists' \ + 'git-branch o/o && + git-branch o/p && + git-branch -m o/o o' + +test_expect_failure \ + 'git branch -m q r/q should fail when r exists' \ + 'git-branch q && + git-branch r && + git-branch -m q r/q' + +test_expect_success \ + 'git branch -m s/s s should work when s/t is deleted' \ + 'git-branch -l s/s && + test -f .git/logs/refs/heads/s/s && + git-branch -l s/t && + test -f .git/logs/refs/heads/s/t && + git-branch -d s/t && + git-branch -m s/s s && + test -f .git/logs/refs/heads/s' + +test_expect_failure \ + '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 && + git-branch -m u v' + test_done |