diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-21 23:57:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-22 02:37:45 -0700 |
| commit | 6973dcaee76ef7b7bfcabd2f26e76205aae07858 (patch) | |
| tree | d402af70d42da329136fe82692c91eb8d7d68260 /t/t1002-read-tree-m-u-2way.sh | |
| parent | Merge branch 'jc/diff' (diff) | |
| download | tgif-6973dcaee76ef7b7bfcabd2f26e76205aae07858.tar.xz | |
Libify diff-files.
This is the first installment to libify diff brothers.
The updated diff-files uses revision.c::setup_revisions()
infrastructure to parse its command line arguments, which means
the pathname arguments are checked more strictly than before.
The tests are adjusted to separate possibly missing paths from
the rest of arguments with double-dashes, to show the kosher
way.
As Linus pointed out, renaming diff.c to diff-lib.c was simply
stupid, so I am renaming it back. The new diff-lib.c is to
contain pieces extracted from diff brothers.
Signed-off-by: Junio C Hamano <junkio@cox.net>
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" ;; |