summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-29 07:56:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-29 07:56:13 (GMT)
commita9ed6ce0e7057b94809d3c51094ba96fe96fded8 (patch)
tree71e9dce5864dd1a885b8853903b6d9ae2219f91a /t
parent9530eb1db874a6eb1278aa904406d379c601856e (diff)
parent9800a754f931d05c2d26da9c1b188ae2c2b80eb4 (diff)
downloadgit-a9ed6ce0e7057b94809d3c51094ba96fe96fded8.zip
git-a9ed6ce0e7057b94809d3c51094ba96fe96fded8.tar.gz
git-a9ed6ce0e7057b94809d3c51094ba96fe96fded8.tar.bz2
Merge branch 'jc/maint-format-patch-o-relative' into maint
* 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-xt/t4014-format-patch.sh52
1 files changed, 51 insertions, 1 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 9d99dc2..f045898 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