Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index fb51ab3dbea92be5f345517e35c2fcc432c59f45..752adaac850862caf50e3573338b9cb742781147 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -827,7 +827,7 @@ test_expect_success 'no warning with an explicit --no-chain-reply-to' '
        --dry-run \
        --from="Example <nobody@example.com>" \
        --to=nobody@example.com \
-       --no-chain-reply-to \
+       --nochain-reply-to \
        outdir/000?-*.patch 2>errors >out &&
        ! grep "no-chain-reply-to" errors
 '