Merge branch 'nd/commit-p-doc'

diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index baa9d3c82e8a54dc7501d90bc9da0527f2a72b2e..0288c17ec60b803d2815fb1b704c35f74e4a7753 100755 (executable)
--- a/t/t4204-patch-id.sh
+++ b/t/t4204-patch-id.sh
@@ -30,11 +30,11 @@ test_expect_success 'patch-id output is well-formed' '
 
 #calculate patch id. Make sure output is not empty.
 calc_patch_id () {
-       name="$1"
+       patch_name="$1"
        shift
        git patch-id "$@" |
-       sed "s/ .*//" >patch-id_"$name" &&
-       test_line_count -gt 0 patch-id_"$name"
+       sed "s/ .*//" >patch-id_"$patch_name" &&
+       test_line_count -gt 0 patch-id_"$patch_name"
 }
 
 get_top_diff () {
@@ -143,6 +143,20 @@ test_expect_success 'patch-id supports git-format-patch MIME output' '
        test_cmp patch-id_master patch-id_same
 '
 
+test_expect_success 'patch-id respects config from subdir' '
+       test_config patchid.stable true &&
+       mkdir subdir &&
+
+       # copy these because test_patch_id() looks for them in
+       # the current directory
+       cp bar-then-foo foo-then-bar subdir &&
+
+       (
+               cd subdir &&
+               test_patch_id irrelevant patchid.stable=true
+       )
+'
+
 cat >nonl <<\EOF
 diff --git i/a w/a
 index e69de29..2e65efe 100644