diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-16 19:49:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-16 19:49:42 -0700 |
| commit | 671d1bc6a098d1015fbdd6e085d6daf12c1dce15 (patch) | |
| tree | 20fa2bf3411f0ac3b3185a2f354b03341b92aa14 /t | |
| parent | 8a94bc7bdc54db0d77058e63baf173ff932cba7c (diff) | |
| parent | e4b09dad9f65395fd4bb8ab165012a3a6698a75b (diff) | |
| download | git-671d1bc6a098d1015fbdd6e085d6daf12c1dce15.tar.gz git-671d1bc6a098d1015fbdd6e085d6daf12c1dce15.tar.xz | |
Merge branch 'maint'
* maint:
test: checkout shouldn't say that HEAD has moved if it didn't
completion: enhance "current branch" display
completion: simplify "current branch" in __git_ps1()
completion: fix PS1 display during a merge on detached HEAD
builtin-checkout: Don't tell user that HEAD has moved before it has
pre-commit.sample: don't print incidental SHA1
tests: Add tests for missing format-patch long options
api-parse-options.txt: use 'func' instead of 'funct'
Turn on USE_ST_TIMESPEC for OpenBSD
ls-tree manpage: output of ls-tree is compatible with update-index
ls-tree manpage: use "unless" instead of "when ... is not"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4014-format-patch.sh | 11 | ||||
| -rwxr-xr-x | t/t4021-format-patch-numbered.sh | 6 | ||||
| -rwxr-xr-x | t/t7201-co.sh | 8 |
3 files changed, 25 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 11061ddd5..922a8941e 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -505,4 +505,15 @@ test_expect_success 'format-patch from a subdirectory (3)' ' test -f "$basename" ' +test_expect_success 'format-patch --in-reply-to' ' + git format-patch -1 --stdout --in-reply-to "baz@foo.bar" > patch8 && + grep "^In-Reply-To: <baz@foo.bar>" patch8 && + grep "^References: <baz@foo.bar>" patch8 +' + +test_expect_success 'format-patch --signoff' ' + git format-patch -1 --signoff --stdout | + grep "^Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" +' + test_done diff --git a/t/t4021-format-patch-numbered.sh b/t/t4021-format-patch-numbered.sh index 390af2389..3c27f0dc1 100755 --- a/t/t4021-format-patch-numbered.sh +++ b/t/t4021-format-patch-numbered.sh @@ -108,4 +108,10 @@ test_expect_success 'format.numbered = auto && --no-numbered' ' ' +test_expect_success '--start-number && --numbered' ' + + git format-patch --start-number 3 --numbered --stdout HEAD~1 > patch8 && + grep "^Subject: \[PATCH 3/3\]" patch8 +' + test_done diff --git a/t/t7201-co.sh b/t/t7201-co.sh index bdb808af1..ebfd34df3 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -534,4 +534,12 @@ test_expect_success 'failing checkout -b should not break working tree' ' ' +test_expect_success 'switch out of non-branch' ' + git reset --hard master && + git checkout master^0 && + echo modified >one && + test_must_fail git checkout renamer 2>error.log && + ! grep "^Previous HEAD" error.log +' + test_done |