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/t7502-status.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/t7502-status.sh')
-rwxr-xr-x | t/t7502-status.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t7502-status.sh b/t/t7502-status.sh index b64ce30ff1..e00607490b 100755 --- a/t/t7502-status.sh +++ b/t/t7502-status.sh @@ -128,4 +128,25 @@ test_expect_success 'status without relative paths' ' ' +cat <<EOF >expect +# On branch master +# Changes to be committed: +# (use "git reset HEAD <file>..." to unstage) +# +# modified: dir1/modified +# +# Untracked files: +# (use "git add <file>..." to include in what will be committed) +# +# dir1/untracked +# dir2/ +# expect +# output +# untracked +EOF +test_expect_success 'status of partial commit excluding new file in index' ' + git status dir1/modified >output && + diff -u expect output +' + test_done |