diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-14 17:51:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-14 17:51:02 -0800 |
| commit | 756e3ee0c62b44bd700ffb2d58c371b45ea4598e (patch) | |
| tree | 132be7871bba8e865aa4ae1a5f7632ddc002dc6d /diff-files.c | |
| parent | 9b6c66e05cc26cc5f688b0e700ee0cb151fc6c09 (diff) | |
| parent | bba319b5cecacaccef85ce3c4cf9e3593532e328 (diff) | |
| download | git-756e3ee0c62b44bd700ffb2d58c371b45ea4598e.tar.gz | |
Merge branch 'jc/commit'
* jc/commit:
commit: detect misspelled pathspec while making a partial commit.
combine-diff: diff-files fix (#2)
combine-diff: diff-files fix.
Diffstat (limited to 'diff-files.c')
| -rw-r--r-- | diff-files.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/diff-files.c b/diff-files.c index 7db5ce6407..0c3f80046b 100644 --- a/diff-files.c +++ b/diff-files.c @@ -150,6 +150,8 @@ int main(int argc, const char **argv) nce->sha1, 20); combine.p.parent[stage-2].mode = DIFF_FILE_CANON_MODE(mode); + combine.p.parent[stage-2].status = + DIFF_STATUS_MODIFIED; } /* diff against the proper unmerged stage */ |