diff options
| author |  Martin Langhoff <martin@catalyst.net.nz> | 2006-05-01 10:20:56 +1200 |
|---|---|---|
| committer | Martin Langhoff <martin@catalyst.net.nz> | 2006-05-01 10:20:56 +1200 |
| commit | e660e3997fbad830e5723336d61883f3a50dbc92 (patch) | |
| tree | 0c02dced98df9982415c8328e8c07c1001e3dc31 /t/t1002-read-tree-m-u-2way.sh | |
| parent | git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups. (diff) | |
| parent | Merge branch 'fix' (diff) | |
| download | tgif-e660e3997fbad830e5723336d61883f3a50dbc92.tar.xz | |
Merge with git://kernel.org/pub/scm/git/git.git
Diffstat (limited to 't/t1002-read-tree-m-u-2way.sh')
| -rwxr-xr-x | t/t1002-read-tree-m-u-2way.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh index 861ef4c0c6..4d175d8ea1 100755 --- a/t/t1002-read-tree-m-u-2way.sh +++ b/t/t1002-read-tree-m-u-2way.sh @@ -20,7 +20,7 @@ compare_change () { } check_cache_at () { - clean_if_empty=`git-diff-files "$1"` + clean_if_empty=`git-diff-files -- "$1"` case "$clean_if_empty" in '') echo "$1: clean" ;; ?*) echo "$1: dirty" ;; |