diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-02-22 21:50:10 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-22 20:59:55 -0800 |
| commit | d516c2d11945cf13ed3d961fa63817c60b7a566b (patch) | |
| tree | 7d9aa00054be3a60e6ababc94aa0ccaa573b768f /diff.c | |
| parent | f5a92647694f18fb3544060a1a964ac082d072b2 (diff) | |
| download | git-d516c2d11945cf13ed3d961fa63817c60b7a566b.tar.gz | |
Teach git-diff-files the new option `--no-index`
With this flag and given two paths, git-diff-files behaves as a GNU diff
lookalike (plus the git goodies like --check, colour, etc.). This flag
is also available in git-diff. It also works outside of a git repository.
In addition, if git-diff{,-files} is called without revision or stage
parameter, and with exactly two paths at least one of which is not tracked,
the default is --no-index.
So, you can now say
git diff /etc/inittab /etc/fstab
and it actually works!
This also unifies the duplicated argument parsing between cmd_diff_files()
and builtin_diff_files().
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2406,7 +2406,8 @@ static void diff_resolve_rename_copy(void) p->status = DIFF_STATUS_RENAMED; } else if (hashcmp(p->one->sha1, p->two->sha1) || - p->one->mode != p->two->mode) + p->one->mode != p->two->mode || + is_null_sha1(p->one->sha1)) p->status = DIFF_STATUS_MODIFIED; else { /* This is a "no-change" entry and should not |