diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-09 08:21:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-09 08:21:44 (GMT) |
| commit | 5d4138a66d265e7ddbe21d44f79bcaa1e9a6b6ff (patch) | |
| tree | 47ff3839458d806fee14824f616c55cdd55b82fb /t | |
| parent | 063036af0832710cfcb1380cc4f9c4597b98cc26 (diff) | |
| parent | b9217c09386e5313ac6a54cc91cf03149514154b (diff) | |
| download | git-5d4138a66d265e7ddbe21d44f79bcaa1e9a6b6ff.zip git-5d4138a66d265e7ddbe21d44f79bcaa1e9a6b6ff.tar.gz git-5d4138a66d265e7ddbe21d44f79bcaa1e9a6b6ff.tar.bz2 | |
Merge branch 'maint'
* maint:
Start preparing for 1.5.3.6
git-send-email: Change the prompt for the subject of the initial message.
SubmittingPatches: improve the 'Patch:' section of the checklist
instaweb: Minor cleanups and fixes for potential problems
stop t1400 hiding errors in tests
Makefile: add missing dependency on wt-status.h
refresh_index_quietly(): express "optional" nature of index writing better
Fix sed string regex escaping in module_name.
Avoid a few unportable, needlessly nested "...`...".
git-mailsplit: with maildirs not only process cur/, but also new/
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1400-update-ref.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index ce045b2..a90824b 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -205,7 +205,7 @@ test_expect_success \ echo $h_TEST >.git/MERGE_HEAD && GIT_AUTHOR_DATE="2005-05-26 23:45" \ GIT_COMMITTER_DATE="2005-05-26 23:45" git-commit -F M && - h_MERGED=$(git rev-parse --verify HEAD) + h_MERGED=$(git rev-parse --verify HEAD) && rm -f M' cat >expect <<EOF |