diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-01-22 03:50:19 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-22 03:50:19 +0300 |
commit | a14f15427bca9af70127f26cd3cb0fcd78c8d36f (patch) | |
tree | 7ad560fc9b61303201846577c32fc653245dcbe1 /t | |
parent | 8318eb795e4bda87d16871ac8ddd5afed033d551 (diff) | |
parent | 9800a754f931d05c2d26da9c1b188ae2c2b80eb4 (diff) |
Merge branch 'jc/maint-format-patch-o-relative'
* jc/maint-format-patch-o-relative:
Teach format-patch to handle output directory relative to cwd
Conflicts:
t/t4014-format-patch.sh
Diffstat (limited to 't')
-rwxr-xr-x | t/t4014-format-patch.sh | 52 |
1 files changed, 51 insertions, 1 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 9d99dc2887..f045898fe3 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -3,7 +3,7 @@ # Copyright (c) 2006 Junio C Hamano # -test_description='Format-patch skipping already incorporated patches' +test_description='various format-patch tests' . ./test-lib.sh @@ -255,4 +255,54 @@ test_expect_success 'format-patch respects -U' ' ' +test_expect_success 'format-patch from a subdirectory (1)' ' + filename=$( + rm -rf sub && + mkdir -p sub/dir && + cd sub/dir && + git format-patch -1 + ) && + case "$filename" in + 0*) + ;; # ok + *) + echo "Oops? $filename" + false + ;; + esac && + test -f "$filename" +' + +test_expect_success 'format-patch from a subdirectory (2)' ' + filename=$( + rm -rf sub && + mkdir -p sub/dir && + cd sub/dir && + git format-patch -1 -o .. + ) && + case "$filename" in + ../0*) + ;; # ok + *) + echo "Oops? $filename" + false + ;; + esac && + basename=$(expr "$filename" : ".*/\(.*\)") && + test -f "sub/$basename" +' + +test_expect_success 'format-patch from a subdirectory (3)' ' + here="$TEST_DIRECTORY/$test" && + rm -f 0* && + filename=$( + rm -rf sub && + mkdir -p sub/dir && + cd sub/dir && + git format-patch -1 -o "$here" + ) && + basename=$(expr "$filename" : ".*/\(.*\)") && + test -f "$basename" +' + test_done |