diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-09-07 17:26:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-07 17:45:20 -0700 |
| commit | 215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7 (patch) | |
| tree | 6bc7aa4f652d0ef49108d9e30a7ea7fbf8e44639 /t | |
| parent | GIT 0.99.6 (diff) | |
| download | tgif-215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7.tar.xz | |
Big tool rename.
As promised, this is the "big tool rename" patch. The primary differences
since 0.99.6 are:
(1) git-*-script are no more. The commands installed do not
have any such suffix so users do not have to remember if
something is implemented as a shell script or not.
(2) Many command names with 'cache' in them are renamed with
'index' if that is what they mean.
There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support is expected to be removed in the near
future.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
36 files changed, 321 insertions, 321 deletions
@@ -20,9 +20,9 @@ the tests. *** t0000-basic.sh *** * ok 1: .git/objects should be empty after git-init-db in an empty repo. * ok 2: .git/objects should have 256 subdirectories. - * ok 3: git-update-cache without --add should fail adding. + * ok 3: git-update-index without --add should fail adding. ... - * ok 23: no diff after checkout and git-update-cache --refresh. + * ok 23: no diff after checkout and git-update-index --refresh. * passed all 23 test(s) *** t0100-environment-names.sh *** * ok 1: using old names should issue warnings. @@ -33,7 +33,7 @@ Or you can run each test individually from command line, like this: $ sh ./t3001-ls-files-killed.sh - * ok 1: git-update-cache --add to add various paths. + * ok 1: git-update-index --add to add various paths. * ok 2: git-ls-files -k to show killed files. * ok 3: validate git-ls-files -k output. * passed all 3 test(s) @@ -163,8 +163,8 @@ library for your script to use. Example: test_expect_failure \ - 'git-update-cache without --add should fail adding.' \ - 'git-update-cache should-be-empty' + 'git-update-index without --add should fail adding.' \ + 'git-update-index should-be-empty' - test_debug <script> diff --git a/t/lib-read-tree-m-3way.sh b/t/lib-read-tree-m-3way.sh index d6645b4f42..d195603dfa 100755 --- a/t/lib-read-tree-m-3way.sh +++ b/t/lib-read-tree-m-3way.sh @@ -10,14 +10,14 @@ do echo This is Z/$p from the original tree. >Z/$p test_expect_success \ "adding test file $p and Z/$p" \ - 'git-update-cache --add $p && - git-update-cache --add Z/$p' + 'git-update-index --add $p && + git-update-index --add Z/$p' done done echo This is SS from the original tree. >SS test_expect_success \ 'adding test file SS' \ - 'git-update-cache --add SS' + 'git-update-index --add SS' cat >TT <<\EOF This is a trivial merge sample text. Branch A is expected to upcase this word, here. @@ -32,7 +32,7 @@ This concludes the trivial merge sample file. EOF test_expect_success \ 'adding test file TT' \ - 'git-update-cache --add TT' + 'git-update-index --add TT' test_expect_success \ 'prepare initial tree' \ 'tree_O=$(git-write-tree)' @@ -47,14 +47,14 @@ to_remove=$(echo D? Z/D?) rm -f $to_remove test_expect_success \ 'change in branch A (removal)' \ - 'git-update-cache --remove $to_remove' + 'git-update-index --remove $to_remove' for p in M? Z/M? do echo This is modified $p in the branch A. >$p test_expect_success \ 'change in branch A (modification)' \ - "git-update-cache $p" + "git-update-index $p" done for p in AN AA Z/AN Z/AA @@ -62,27 +62,27 @@ do echo This is added $p in the branch A. >$p test_expect_success \ 'change in branch A (addition)' \ - "git-update-cache --add $p" + "git-update-index --add $p" done echo This is SS from the modified tree. >SS echo This is LL from the modified tree. >LL test_expect_success \ 'change in branch A (addition)' \ - 'git-update-cache --add LL && - git-update-cache SS' + 'git-update-index --add LL && + git-update-index SS' mv TT TT- sed -e '/Branch A/s/word/WORD/g' <TT- >TT rm -f TT- test_expect_success \ 'change in branch A (edit)' \ - 'git-update-cache TT' + 'git-update-index TT' mkdir DF echo Branch A makes a file at DF/DF, creating a directory DF. >DF/DF test_expect_success \ 'change in branch A (change file to directory)' \ - 'git-update-cache --add DF/DF' + 'git-update-index --add DF/DF' test_expect_success \ 'recording branch A tree' \ @@ -97,20 +97,20 @@ mkdir Z test_expect_success \ 'reading original tree and checking out' \ 'git-read-tree $tree_O && - git-checkout-cache -a' + git-checkout-index -a' to_remove=$(echo ?D Z/?D) rm -f $to_remove test_expect_success \ 'change in branch B (removal)' \ - "git-update-cache --remove $to_remove" + "git-update-index --remove $to_remove" for p in ?M Z/?M do echo This is modified $p in the branch B. >$p test_expect_success \ 'change in branch B (modification)' \ - "git-update-cache $p" + "git-update-index $p" done for p in NA AA Z/NA Z/AA @@ -118,25 +118,25 @@ do echo This is added $p in the branch B. >$p test_expect_success \ 'change in branch B (addition)' \ - "git-update-cache --add $p" + "git-update-index --add $p" done echo This is SS from the modified tree. >SS echo This is LL from the modified tree. >LL test_expect_success \ 'change in branch B (addition and modification)' \ - 'git-update-cache --add LL && - git-update-cache SS' + 'git-update-index --add LL && + git-update-index SS' mv TT TT- sed -e '/Branch B/s/word/WORD/g' <TT- >TT rm -f TT- test_expect_success \ 'change in branch B (modification)' \ - 'git-update-cache TT' + 'git-update-index TT' echo Branch B makes a file at DF. >DF test_expect_success \ 'change in branch B (addition of a file to conflict with directory)' \ - 'git-update-cache --add DF' + 'git-update-index --add DF' test_expect_success \ 'recording branch B tree' \ @@ -147,12 +147,12 @@ test_expect_success \ 'rm -f .git/index && git-read-tree $tree_O && mkdir .orig-O && - git-checkout-cache --prefix=.orig-O/ -f -q -a && + git-checkout-index --prefix=.orig-O/ -f -q -a && rm -f .git/index && git-read-tree $tree_A && mkdir .orig-A && - git-checkout-cache --prefix=.orig-A/ -f -q -a && + git-checkout-index --prefix=.orig-A/ -f -q -a && rm -f .git/index && git-read-tree $tree_B && mkdir .orig-B && - git-checkout-cache --prefix=.orig-B/ -f -q -a' + git-checkout-index --prefix=.orig-B/ -f -q -a' diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 142b7bf388..3649f0f745 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -40,13 +40,13 @@ test_expect_success \ # updating a new file without --add should fail. test_expect_failure \ - 'git-update-cache without --add should fail adding.' \ - 'git-update-cache should-be-empty' + 'git-update-index without --add should fail adding.' \ + 'git-update-index should-be-empty' # and with --add it should succeed, even if it is empty (it used to fail). test_expect_success \ - 'git-update-cache with --add should succeed.' \ - 'git-update-cache --add should-be-empty' + 'git-update-index with --add should succeed.' \ + 'git-update-index --add should-be-empty' test_expect_success \ 'writing tree out with git-write-tree' \ @@ -60,12 +60,12 @@ test_expect_success \ # Removing paths. rm -f should-be-empty full-of-directories test_expect_failure \ - 'git-update-cache without --remove should fail removing.' \ - 'git-update-cache should-be-empty' + 'git-update-index without --remove should fail removing.' \ + 'git-update-index should-be-empty' test_expect_success \ - 'git-update-cache with --remove should be able to remove.' \ - 'git-update-cache --remove should-be-empty' + 'git-update-index with --remove should be able to remove.' \ + 'git-update-index --remove should-be-empty' # Empty tree can be written with recent write-tree. test_expect_success \ @@ -84,8 +84,8 @@ do ln -s "hello $p" ${p}sym done test_expect_success \ - 'adding various types of objects with git-update-cache --add.' \ - 'find path* ! -type d -print0 | xargs -0 git-update-cache --add' + 'adding various types of objects with git-update-index --add.' \ + 'find path* ! -type d -print0 | xargs -0 git-update-index --add' # Show them and see that matches what we expect. test_expect_success \ @@ -170,11 +170,11 @@ test_expect_success \ 'git-diff-files >current && diff >/dev/null -b current expected' test_expect_success \ - 'git-update-cache --refresh should succeed.' \ - 'git-update-cache --refresh' + 'git-update-index --refresh should succeed.' \ + 'git-update-index --refresh' test_expect_success \ - 'no diff after checkout and git-update-cache --refresh.' \ + 'no diff after checkout and git-update-index --refresh.' \ 'git-diff-files >current && cmp -s current /dev/null' test_done diff --git a/t/t0100-environment-names.sh b/t/t0100-environment-names.sh index 9f851bc114..3493bd4de2 100755 --- a/t/t0100-environment-names.sh +++ b/t/t0100-environment-names.sh @@ -34,7 +34,7 @@ export_them () { } date >path0 -git-update-cache --add path0 +git-update-index --add path0 tree=$(git-write-tree) AUTHOR_DATE='Wed May 11 23:55:18 2005' diff --git a/t/t0110-environment-names-old.sh b/t/t0110-environment-names-old.sh index c548b9b497..5d602cc21a 100755 --- a/t/t0110-environment-names-old.sh +++ b/t/t0110-environment-names-old.sh @@ -54,8 +54,8 @@ test_expect_success \ date >path0 test_expect_success \ - 'using GIT_DIR in git-update-cache' \ - 'git-update-cache --add path0 && test -f .svn/index' + 'using GIT_DIR in git-update-index' \ + 'git-update-index --add path0 && test -f .svn/index' sedScript='s|\(..\)|.svn/objects/\1/|' diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh index 89f0e81f23..f1cd50cee9 100755 --- a/t/t1000-read-tree-m-3way.sh +++ b/t/t1000-read-tree-m-3way.sh @@ -150,7 +150,7 @@ test_expect_success \ "rm -fr [NDMALTS][NDMALTSF] Z && rm .git/index && git-read-tree $tree_A && - git-checkout-cache -f -u -a && + git-checkout-index -f -u -a && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -230,21 +230,21 @@ test_expect_failure \ '1 - must not have an entry not in A.' \ "rm -f .git/index XX && echo XX >XX && - git-update-cache --add XX && + git-update-index --add XX && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '2 - must match B in !O && !A && B case.' \ "rm -f .git/index NA && cp .orig-B/NA NA && - git-update-cache --add NA && + git-update-index --add NA && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '2 - matching B alone is OK in !O && !A && B case.' \ "rm -f .git/index NA && cp .orig-B/NA NA && - git-update-cache --add NA && + git-update-index --add NA && echo extra >>NA && git-read-tree -m $tree_O $tree_A $tree_B" @@ -252,7 +252,7 @@ test_expect_success \ '3 - must match A in !O && A && !B case.' \ "rm -f .git/index AN && cp .orig-A/AN AN && - git-update-cache --add AN && + git-update-index --add AN && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -260,7 +260,7 @@ test_expect_success \ '3 - matching A alone is OK in !O && A && !B case.' \ "rm -f .git/index AN && cp .orig-A/AN AN && - git-update-cache --add AN && + git-update-index --add AN && echo extra >>AN && git-read-tree -m $tree_O $tree_A $tree_B" @@ -269,14 +269,14 @@ test_expect_failure \ "rm -f .git/index AN && cp .orig-A/AN AN && echo extra >>AN && - git-update-cache --add AN && + git-update-index --add AN && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '4 - must match and be up-to-date in !O && A && B && A!=B case.' \ "rm -f .git/index AA && cp .orig-A/AA AA && - git-update-cache --add AA && + git-update-index --add AA && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -284,7 +284,7 @@ test_expect_failure \ '4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.' \ "rm -f .git/index AA && cp .orig-A/AA AA && - git-update-cache --add AA && + git-update-index --add AA && echo extra >>AA && git-read-tree -m $tree_O $tree_A $tree_B" @@ -293,14 +293,14 @@ test_expect_failure \ "rm -f .git/index AA && cp .orig-A/AA AA && echo extra >>AA && - git-update-cache --add AA && + git-update-index --add AA && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '5 - must match in !O && A && B && A==B case.' \ "rm -f .git/index LL && cp .orig-A/LL LL && - git-update-cache --add LL && + git-update-index --add LL && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -308,7 +308,7 @@ test_expect_success \ '5 - must match in !O && A && B && A==B case.' \ "rm -f .git/index LL && cp .orig-A/LL LL && - git-update-cache --add LL && + git-update-index --add LL && echo extra >>LL && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -318,35 +318,35 @@ test_expect_failure \ "rm -f .git/index LL && cp .orig-A/LL LL && echo extra >>LL && - git-update-cache --add LL && + git-update-index --add LL && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_failure \ '6 - must not exist in O && !A && !B case' \ "rm -f .git/index DD && echo DD >DD - git-update-cache --add DD && + git-update-index --add DD && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_failure \ '7 - must not exist in O && !A && B && O!=B case' \ "rm -f .git/index DM && cp .orig-B/DM DM && - git-update-cache --add DM && + git-update-index --add DM && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_failure \ '8 - must not exist in O && !A && B && O==B case' \ "rm -f .git/index DN && cp .orig-B/DN DN && - git-update-cache --add DN && + git-update-index --add DN && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '9 - must match and be up-to-date in O && A && !B && O!=A case' \ "rm -f .git/index MD && cp .orig-A/MD MD && - git-update-cache --add MD && + git-update-index --add MD && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -354,7 +354,7 @@ test_expect_failure \ '9 (fail) - must match and be up-to-date in O && A && !B && O!=A case' \ "rm -f .git/index MD && cp .orig-A/MD MD && - git-update-cache --add MD && + git-update-index --add MD && echo extra >>MD && git-read-tree -m $tree_O $tree_A $tree_B" @@ -363,14 +363,14 @@ test_expect_failure \ "rm -f .git/index MD && cp .orig-A/MD MD && echo extra >>MD && - git-update-cache --add MD && + git-update-index --add MD && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '10 - must match and be up-to-date in O && A && !B && O==A case' \ "rm -f .git/index ND && cp .orig-A/ND ND && - git-update-cache --add ND && + git-update-index --add ND && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -378,7 +378,7 @@ test_expect_failure \ '10 (fail) - must match and be up-to-date in O && A && !B && O==A case' \ "rm -f .git/index ND && cp .orig-A/ND ND && - git-update-cache --add ND && + git-update-index --add ND && echo extra >>ND && git-read-tree -m $tree_O $tree_A $tree_B" @@ -387,14 +387,14 @@ test_expect_failure \ "rm -f .git/index ND && cp .orig-A/ND ND && echo extra >>ND && - git-update-cache --add ND && + git-update-index --add ND && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case' \ "rm -f .git/index MM && cp .orig-A/MM MM && - git-update-cache --add MM && + git-update-index --add MM && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -402,7 +402,7 @@ test_expect_failure \ '11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case' \ "rm -f .git/index MM && cp .orig-A/MM MM && - git-update-cache --add MM && + git-update-index --add MM && echo extra >>MM && git-read-tree -m $tree_O $tree_A $tree_B" @@ -411,14 +411,14 @@ test_expect_failure \ "rm -f .git/index MM && cp .orig-A/MM MM && echo extra >>MM && - git-update-cache --add MM && + git-update-index --add MM && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '12 - must match A in O && A && B && O!=A && A==B case' \ "rm -f .git/index SS && cp .orig-A/SS SS && - git-update-cache --add SS && + git-update-index --add SS && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -426,7 +426,7 @@ test_expect_success \ '12 - must match A in O && A && B && O!=A && A==B case' \ "rm -f .git/index SS && cp .orig-A/SS SS && - git-update-cache --add SS && + git-update-index --add SS && echo extra >>SS && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -436,14 +436,14 @@ test_expect_failure \ "rm -f .git/index SS && cp .orig-A/SS SS && echo extra >>SS && - git-update-cache --add SS && + git-update-index --add SS && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '13 - must match A in O && A && B && O!=A && O==B case' \ "rm -f .git/index MN && cp .orig-A/MN MN && - git-update-cache --add MN && + git-update-index --add MN && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -451,7 +451,7 @@ test_expect_success \ '13 - must match A in O && A && B && O!=A && O==B case' \ "rm -f .git/index MN && cp .orig-A/MN MN && - git-update-cache --add MN && + git-update-index --add MN && echo extra >>MN && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -460,7 +460,7 @@ test_expect_success \ '14 - must match and be up-to-date in O && A && B && O==A && O!=B case' \ "rm -f .git/index NM && cp .orig-A/NM NM && - git-update-cache --add NM && + git-update-index --add NM && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -468,7 +468,7 @@ test_expect_success \ '14 - may match B in O && A && B && O==A && O!=B case' \ "rm -f .git/index NM && cp .orig-B/NM NM && - git-update-cache --add NM && + git-update-index --add NM && echo extra >>NM && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -477,7 +477,7 @@ test_expect_failure \ '14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case' \ "rm -f .git/index NM && cp .orig-A/NM NM && - git-update-cache --add NM && + git-update-index --add NM && echo extra >>NM && git-read-tree -m $tree_O $tree_A $tree_B" @@ -486,14 +486,14 @@ test_expect_failure \ "rm -f .git/index NM && cp .orig-A/NM NM && echo extra >>NM && - git-update-cache --add NM && + git-update-index --add NM && git-read-tree -m $tree_O $tree_A $tree_B" test_expect_success \ '15 - must match A in O && A && B && O==A && O==B case' \ "rm -f .git/index NN && cp .orig-A/NN NN && - git-update-cache --add NN && + git-update-index --add NN && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -501,7 +501,7 @@ test_expect_success \ '15 - must match A in O && A && B && O==A && O==B case' \ "rm -f .git/index NN && cp .orig-A/NN NN && - git-update-cache --add NN && + git-update-index --add NN && echo extra >>NN && git-read-tree -m $tree_O $tree_A $tree_B && check_result" @@ -511,7 +511,7 @@ test_expect_failure \ "rm -f .git/index NN && cp .orig-A/NN NN && echo extra >>NN && - git-update-cache --add NN && + git-update-index --add NN && git-read-tree -m $tree_O $tree_A $tree_B" test_done diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index 919f2b3109..5b69681c52 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -68,13 +68,13 @@ test_expect_success \ cat bozbar-old >bozbar && echo rezrov >rezrov && echo yomin >yomin && - git-update-cache --add nitfol bozbar rezrov && + git-update-index --add nitfol bozbar rezrov && treeH=`git-write-tree` && echo treeH $treeH && git-ls-tree $treeH && cat bozbar-new >bozbar && - git-update-cache --add frotz bozbar --force-remove rezrov && + git-update-index --add frotz bozbar --force-remove rezrov && git-ls-files --stage >M.out && treeM=`git-write-tree` && echo treeM $treeM && @@ -97,8 +97,8 @@ test_expect_success \ '4 - carry forward local addition.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && - git-update-cache --add yomin && + git-checkout-index -u -f -q -a && + git-update-index --add yomin && read_tree_twoway $treeH $treeM && git-ls-files --stage >4.out || return 1 diff -u M.out 4.out >4diff.out @@ -109,9 +109,9 @@ test_expect_success \ '5 - carry forward local addition.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo yomin >yomin && - git-update-cache --add yomin && + git-update-index --add yomin && echo yomin yomin >yomin && read_tree_twoway $treeH $treeM && git-ls-files --stage >5.out || return 1 @@ -123,8 +123,8 @@ test_expect_success \ '6 - local addition already has the same.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && - git-update-cache --add frotz && + git-checkout-index -u -f -q -a && + git-update-index --add frotz && read_tree_twoway $treeH $treeM && git-ls-files --stage >6.out && diff -u M.out 6.out && @@ -134,9 +134,9 @@ test_expect_success \ '7 - local addition already has the same.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo frotz >frotz && - git-update-cache --add frotz && + git-update-index --add frotz && echo frotz frotz >frotz && read_tree_twoway $treeH $treeM && git-ls-files --stage >7.out && @@ -147,18 +147,18 @@ test_expect_success \ '8 - conflicting addition.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo frotz frotz >frotz && - git-update-cache --add frotz && + git-update-index --add frotz && if read_tree_twoway $treeH $treeM; then false; else :; fi' test_expect_success \ '9 - conflicting addition.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo frotz frotz >frotz && - git-update-cache --add frotz && + git-update-index --add frotz && echo frotz >frotz && if read_tree_twoway $treeH $treeM; then false; else :; fi' @@ -166,9 +166,9 @@ test_expect_success \ '10 - path removed.' \ 'rm -f .git/index && git-read-tree $treeH && - git-checkout-cache -u -f -q -a && + git-checkout-index -u -f -q -a && echo rezrov >rezrov && - git-update-cache --add rezrov && + git-update-index --add rezrov && read_tree_twoway $treeH $treeM && git-ls-files --stage >10.out && diff -u M.out 10.out' @@ -177,9 +177,9 |