~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Repository.rev_parse: support commits, trees, and blobs
[stgit]
/
t
/
t0001-subdir-branches.sh
diff --git
a/t/t0001-subdir-branches.sh
b/t/t0001-subdir-branches.sh
index
1685233
..
5ea787e
100755
(executable)
--- a/
t/t0001-subdir-branches.sh
+++ b/
t/t0001-subdir-branches.sh
@@
-14,34
+14,31
@@
containing slashes (that is, branches living in a subdirectory of
test_expect_success 'Create a patch' \
'stg init &&
echo "foo" > foo.txt &&
test_expect_success 'Create a patch' \
'stg init &&
echo "foo" > foo.txt &&
-
git
add foo.txt &&
+
stg
add foo.txt &&
stg new foo -m "Add foo.txt" &&
stg refresh'
stg new foo -m "Add foo.txt" &&
stg refresh'
-test_expect_success 'Old and new id with non-slashy branch' \
- 'stg id foo &&
- stg id foo// &&
- stg id foo/ &&
- stg id foo//top &&
- stg id foo/top &&
- stg id foo@master &&
- stg id foo@master//top &&
- stg id foo@master/top'
+test_expect_success 'Try id with non-slashy branch' \
+ 'stg id &&
+ stg id foo &&
+ stg id foo^ &&
+ stg id master:foo &&
+ stg id master:foo^'
test_expect_success 'Clone branch to slashier name' \
'stg branch --clone x/y/z'
test_expect_success 'Clone branch to slashier name' \
'stg branch --clone x/y/z'
-test_expect_success 'Try new
form of
id with slashy branch' \
+test_expect_success 'Try new id with slashy branch' \
'stg id foo &&
'stg id foo &&
- stg id foo// &&
- stg id foo//top &&
- stg id foo@x/y/z &&
- stg id foo@x/y/z//top'
+ stg id foo^ &&
+ stg id x/y/z:foo &&
+ stg id x/y/z:foo^'
-test_expect_failure 'Try old id with slashy branch' \
- 'stg id foo/ ||
- stg id foo/top ||
- stg id foo@x/y/z/top'
+test_expect_success 'Try old id with slashy branch' '
+ command_error stg id foo/ &&
+ command_error stg id foo/top &&
+ command_error stg id foo@x/y/z/top
+ '
test_expect_success 'Create patch in slashy branch' \
'echo "bar" >> foo.txt &&
test_expect_success 'Create patch in slashy branch' \
'echo "bar" >> foo.txt &&
@@
-50,11
+47,11
@@
test_expect_success 'Create patch in slashy branch' \
test_expect_success 'Rename branches' \
'stg branch --rename master goo/gaa &&
test_expect_success 'Rename branches' \
'stg branch --rename master goo/gaa &&
-
!
git show-ref --verify --quiet refs/heads/master &&
+
must_fail
git show-ref --verify --quiet refs/heads/master &&
stg branch --rename goo/gaa x1/x2/x3/x4 &&
stg branch --rename goo/gaa x1/x2/x3/x4 &&
-
!
git show-ref --verify --quiet refs/heads/goo/gaa &&
+
must_fail
git show-ref --verify --quiet refs/heads/goo/gaa &&
stg branch --rename x1/x2/x3/x4 servant &&
stg branch --rename x1/x2/x3/x4 servant &&
-
!
git show-ref --verify --quiet refs/heads/x1/x2/x3/x4
+
must_fail
git show-ref --verify --quiet refs/heads/x1/x2/x3/x4
'
test_done
'
test_done