diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-22 13:01:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 13:01:23 -0700 |
| commit | 106ef55f3a303435519ac60a043755286f9e47f8 (patch) | |
| tree | b73df4ebbb14d4e5e3ed311748865118213e8749 /diffcore.h | |
| parent | 07873ca7b02a06d3f5a9db47333062aff6f18047 (diff) | |
| parent | 4682d8521c3ce9d722bd214fd7d5fc92063fdacb (diff) | |
| download | git-106ef55f3a303435519ac60a043755286f9e47f8.tar.gz git-106ef55f3a303435519ac60a043755286f9e47f8.tar.xz | |
Merge branch 'jc/refactor-diff-stdin' into maint
"git diff", "git status" and anything that internally uses the
comparison machinery was utterly broken when the difference
involved a file with "-" as its name. This was due to the way "git
diff --no-index" was incorrectly bolted on to the system, making
any comparison that involves a file "-" at the root level
incorrectly read from the standard input.
* jc/refactor-diff-stdin:
diff-index.c: "git diff" has no need to read blob from the standard input
diff-index.c: unify handling of command line paths
diff-index.c: do not pretend paths are pathspecs
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h index 8f32b824c..be0739c5c 100644 --- a/diffcore.h +++ b/diffcore.h @@ -43,6 +43,7 @@ struct diff_filespec { unsigned should_free : 1; /* data should be free()'ed */ unsigned should_munmap : 1; /* data should be munmap()'ed */ unsigned dirty_submodule : 2; /* For submodules: its work tree is dirty */ + unsigned is_stdin : 1; #define DIRTY_SUBMODULE_UNTRACKED 1 #define DIRTY_SUBMODULE_MODIFIED 2 unsigned has_more_entries : 1; /* only appear in combined diff */ |