diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-16 00:20:37 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-16 00:20:37 -0800 |
commit | d5558581d2583d18cdb6823065a8f812085fbc37 (patch) | |
tree | 9d9c40072aedd0fd0aaa5a717a5c56e54847a6cd /t/t5100-mailinfo.sh | |
parent | Merge branch 'maint' (diff) | |
parent | commit: discard index after setting up partial commit (diff) | |
download | tgif-d5558581d2583d18cdb6823065a8f812085fbc37.tar.xz |
Merge branch 'maint'
* maint:
commit: discard index after setting up partial commit
filter-branch: handle filenames that need quoting
diff: Fix miscounting of --check output
hg-to-git: fix parent analysis
mailinfo: feed only one line to handle_filter() for QP input
diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"
Add "const" qualifier to "char *excludes_file".
Add "const" qualifier to "char *editor_program".
Add "const" qualifier to "char *pager_program".
config: add 'git_config_string' to refactor string config variables.
diff.c: remove useless check for value != NULL
fast-import: check return value from unpack_entry()
Validate nicknames of remote branches to prohibit confusing ones
diff.c: replace a 'strdup' with 'xstrdup'.
diff.c: fixup garding of config parser from value=NULL
Diffstat (limited to 't/t5100-mailinfo.sh')
-rwxr-xr-x | t/t5100-mailinfo.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh index 9b1a74542a..d6c55c1157 100755 --- a/t/t5100-mailinfo.sh +++ b/t/t5100-mailinfo.sh @@ -11,7 +11,7 @@ test_expect_success 'split sample box' \ 'git mailsplit -o. ../t5100/sample.mbox >last && last=`cat last` && echo total is $last && - test `cat last` = 8' + test `cat last` = 9' for mail in `echo 00*` do |