diff options
author | Junio C Hamano <junkio@cox.net> | 2005-09-19 15:11:15 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-09-20 15:07:53 -0700 |
commit | b0391890d25d9e7ca8f7df2199292df68ead8093 (patch) | |
tree | 9562d2c1387af4afb6f72317e8e1155b4b7fca48 /t | |
parent | 1991b223c05d45d2a915842990b2a7c4819dcbcf (diff) | |
download | git-b0391890d25d9e7ca8f7df2199292df68ead8093.tar.gz git-b0391890d25d9e7ca8f7df2199292df68ead8093.tar.xz |
Show modified files in git-ls-files
Add -m/--modified to show files that have been modified wrt. the index.
[jc: The original came from Brian Gerst on Sep 1st but it only checked
if the paths were cache dirty without actually checking the files were
modified. I also added the usage string and a new test.]
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-x | t/t3010-ls-files-killed-modified.sh (renamed from t/t3010-ls-files-killed.sh) | 41 |
1 files changed, 38 insertions, 3 deletions
diff --git a/t/t3010-ls-files-killed.sh b/t/t3010-ls-files-killed-modified.sh index 2e18baae5..5fc197671 100755 --- a/t/t3010-ls-files-killed.sh +++ b/t/t3010-ls-files-killed-modified.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Junio C Hamano # -test_description='git-ls-files -k flag test. +test_description='git-ls-files -k and -m flags test. This test prepares the following in the cache: @@ -24,6 +24,16 @@ and the following on the filesystem: git-ls-files -k should report that existing filesystem objects except path4, path5 and path6/file6 to be killed. + +Also for modification test, the cache and working tree have: + + path7 - an empty file, modified to a non-empty file. + path8 - a non-empty file, modified to an empty file. + path9 - an empty file, cache dirtied. + path10 - a non-empty file, cache dirtied. + +We should report path0, path1, path2/file2, path3/file3, path7 and path8 +modified without reporting path9 and path10. ' . ./test-lib.sh @@ -32,11 +42,15 @@ ln -s xyzzy path1 mkdir path2 path3 date >path2/file2 date >path3/file3 +: >path7 +date >path8 +: >path9 +date >path10 test_expect_success \ 'git-update-index --add to add various paths.' \ - "git-update-index --add -- path0 path1 path?/file?" + "git-update-index --add -- path0 path1 path?/file? path7 path8 path9 path10" -rm -fr path? +rm -fr path? ;# leave path10 alone date >path2 ln -s frotz path3 ln -s nitfol path5 @@ -44,6 +58,10 @@ mkdir path0 path1 path6 date >path0/file0 date >path1/file1 date >path6/file6 +date >path7 +: >path8 +: >path9 +touch path10 test_expect_success \ 'git-ls-files -k to show killed files.' \ @@ -58,4 +76,21 @@ EOF test_expect_success \ 'validate git-ls-files -k output.' \ 'diff .output .expected' + +test_expect_success \ + 'git-ls-files -m to show modified files.' \ + 'git-ls-files -m >.output' +cat >.expected <<EOF +path0 +path1 +path2/file2 +path3/file3 +path7 +path8 +EOF + +test_expect_success \ + 'validate git-ls-files -m output.' \ + 'diff .output .expected' + test_done |