diff options
author | Nanako Shiraishi <nanako3@lavabit.com> | 2008-09-03 17:59:27 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 12:41:46 -0700 |
commit | 0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0 (patch) | |
tree | a190ecd0ca6dae9a32895793ff6c4c0341c2a8c9 /t/t3500-cherry.sh | |
parent | 7e44c93558e7c0b12624d76cf07753d0480ed96a (diff) | |
download | git-0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0.tar.gz git-0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0.tar.xz |
tests: use "git xyzzy" form (t0000 - t3599)
Converts tests between t0050-t3903.
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3500-cherry.sh')
-rwxr-xr-x | t/t3500-cherry.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t3500-cherry.sh b/t/t3500-cherry.sh index 4911c4837..dadbbc2a9 100755 --- a/t/t3500-cherry.sh +++ b/t/t3500-cherry.sh @@ -17,25 +17,25 @@ test_expect_success \ 'prepare repository with topic branch, and check cherry finds the 2 patches from there' \ 'echo First > A && git update-index --add A && - git-commit -m "Add A." && + git commit -m "Add A." && - git-checkout -b my-topic-branch && + git checkout -b my-topic-branch && echo Second > B && git update-index --add B && - git-commit -m "Add B." && + git commit -m "Add B." && sleep 2 && echo AnotherSecond > C && git update-index --add C && - git-commit -m "Add C." && + git commit -m "Add C." && - git-checkout -f master && + git checkout -f master && rm -f B C && echo Third >> A && git update-index A && - git-commit -m "Modify A." && + git commit -m "Modify A." && expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*" ' |