diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-22 03:07:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-22 03:07:08 -0700 |
| commit | 0bc6c140587092bf831786bb81bd7dc0102f752c (patch) | |
| tree | d9b9432628daeef27133d43b8eed80c35710cc8e /t/t1002-read-tree-m-u-2way.sh | |
| parent | Merge branch 'jc/fmt-patch' into next (diff) | |
| parent | Libify diff-index. (diff) | |
| download | tgif-0bc6c140587092bf831786bb81bd7dc0102f752c.tar.xz | |
Merge branch 'jc/diff' into next
* jc/diff:
Libify diff-index.
Libify diff-files.
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" ;; |