mirror of
https://github.com/git/git.git
synced 2024-11-18 06:54:55 +01:00
a567fdcb01
format-patch is most commonly used for multiple patches at once when sending a patchset, in which case we want to number the patches; on the other hand, single patches are not usually expected to be numbered. In other words, the typical behavior expected from format-patch is the one obtained by enabling autonumber, so we set it to be the default. Users that want to disable numbering for a particular patchset can do so with the existing -N command-line switch. Users that want to change the default behavior can use the format.numbering config key. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Test-updates-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
111 lines
2 KiB
Bash
Executable file
111 lines
2 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Brian C Gernhardt
|
|
#
|
|
|
|
test_description='Format-patch numbering options'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
echo A > file &&
|
|
git add file &&
|
|
git commit -m First &&
|
|
|
|
echo B >> file &&
|
|
git commit -a -m Second &&
|
|
|
|
echo C >> file &&
|
|
git commit -a -m Third
|
|
|
|
'
|
|
|
|
# Each of these gets used multiple times.
|
|
|
|
test_num_no_numbered() {
|
|
cnt=$(grep "^Subject: \[PATCH\]" $1 | wc -l) &&
|
|
test $cnt = $2
|
|
}
|
|
|
|
test_single_no_numbered() {
|
|
test_num_no_numbered $1 1
|
|
}
|
|
|
|
test_no_numbered() {
|
|
test_num_no_numbered $1 2
|
|
}
|
|
|
|
test_single_numbered() {
|
|
grep "^Subject: \[PATCH 1/1\]" $1
|
|
}
|
|
|
|
test_numbered() {
|
|
grep "^Subject: \[PATCH 1/2\]" $1 &&
|
|
grep "^Subject: \[PATCH 2/2\]" $1
|
|
}
|
|
|
|
test_expect_success 'single patch defaults to no numbers' '
|
|
git format-patch --stdout HEAD~1 >patch0.single &&
|
|
test_single_no_numbered patch0.single
|
|
'
|
|
|
|
test_expect_success 'multiple patch defaults to numbered' '
|
|
|
|
git format-patch --stdout HEAD~2 >patch0.multiple &&
|
|
test_numbered patch0.multiple
|
|
|
|
'
|
|
|
|
test_expect_success 'Use --numbered' '
|
|
|
|
git format-patch --numbered --stdout HEAD~1 >patch1 &&
|
|
test_single_numbered patch1
|
|
|
|
'
|
|
|
|
test_expect_success 'format.numbered = true' '
|
|
|
|
git config format.numbered true &&
|
|
git format-patch --stdout HEAD~2 >patch2 &&
|
|
test_numbered patch2
|
|
|
|
'
|
|
|
|
test_expect_success 'format.numbered && single patch' '
|
|
|
|
git format-patch --stdout HEAD^ > patch3 &&
|
|
test_single_numbered patch3
|
|
|
|
'
|
|
|
|
test_expect_success 'format.numbered && --no-numbered' '
|
|
|
|
git format-patch --no-numbered --stdout HEAD~2 >patch4 &&
|
|
test_no_numbered patch4
|
|
|
|
'
|
|
|
|
test_expect_success 'format.numbered = auto' '
|
|
|
|
git config format.numbered auto
|
|
git format-patch --stdout HEAD~2 > patch5 &&
|
|
test_numbered patch5
|
|
|
|
'
|
|
|
|
test_expect_success 'format.numbered = auto && single patch' '
|
|
|
|
git format-patch --stdout HEAD^ > patch6 &&
|
|
test_single_no_numbered patch6
|
|
|
|
'
|
|
|
|
test_expect_success 'format.numbered = auto && --no-numbered' '
|
|
|
|
git format-patch --no-numbered --stdout HEAD~2 > patch7 &&
|
|
test_no_numbered patch7
|
|
|
|
'
|
|
|
|
test_done
|