diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-13 11:58:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-13 11:58:56 -0800 |
| commit | dc96c5ee703fb7265619b1ecb2b5f2c5ab3ef40d (patch) | |
| tree | 2d81a990aa60381e5ab751e1c88a7e7e6e2142ae /read-cache.c | |
| parent | 73d66323ac78c750ba42fef23b1cb8fd2110e023 (diff) | |
| parent | d7eed8cbef2d15e87e9002f5e3ce08830b40b292 (diff) | |
| download | git-dc96c5ee703fb7265619b1ecb2b5f2c5ab3ef40d.tar.gz git-dc96c5ee703fb7265619b1ecb2b5f2c5ab3ef40d.tar.xz | |
Merge branch 'cc/reset-more'
* cc/reset-more:
t7111: check that reset options work as described in the tables
Documentation: reset: add some missing tables
Fix bit assignment for CE_CONFLICTED
"reset --merge": fix unmerged case
reset: use "unpack_trees()" directly instead of "git read-tree"
reset: add a few tests for "git reset --merge"
Documentation: reset: add some tables to describe the different options
reset: improve mixed reset error message when in a bare repo
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/read-cache.c b/read-cache.c index a0adb272f..d214abab1 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1617,9 +1617,8 @@ int read_index_unmerged(struct index_state *istate) len = strlen(ce->name); size = cache_entry_size(len); new_ce = xcalloc(1, size); - hashcpy(new_ce->sha1, ce->sha1); memcpy(new_ce->name, ce->name, len); - new_ce->ce_flags = create_ce_flags(len, 0); + new_ce->ce_flags = create_ce_flags(len, 0) | CE_CONFLICTED; new_ce->ce_mode = ce->ce_mode; if (add_index_entry(istate, new_ce, 0)) return error("%s: cannot drop to stage #0", |