(off-list ancestor, not in this archive)
Re: [PATCH] read-cache.c: Ensure unmerged entries are removed · Junio C Hamano <hidden> · 2016-06-15
Re: [PATCH] read-cache.c: Ensure unmerged entries are removed · Jaime Soriano Pastor <hidden> · 2016-06-15
[PATCH 0/4] Handling unmerged files with merged entries · Jaime Soriano Pastor <hidden> · 2016-06-15
[PATCH 4/4] git update-index --cacheinfo can be used to select a stage when there are merged and unmerged entries · Jaime Soriano Pastor <hidden> · 2016-06-15
[PATCH 3/4] Added tests for the case of merged and unmerged entries for the same file · Jaime Soriano Pastor <hidden> · 2016-06-15
[PATCH 1/4] read_index_unmerged doesn't loop forever if merged stage exists for unmerged file · Jaime Soriano Pastor <hidden> · 2016-06-15
[PATCH 2/4] Error out when adding a file with merged and unmerged entries · Jaime Soriano Pastor <hidden> · 2016-06-15

Re: [PATCH] read-cache.c: Ensure unmerged entries are removed

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:02:17

Possibly related (same subject, not in this thread)

2016-06-15 · Re: [PATCH] read-cache.c: Ensure unmerged entries are removed · Jaime Soriano Pastor <hidden>
2016-06-15 · Re: [PATCH] read-cache.c: Ensure unmerged entries are removed · Jaime Soriano Pastor <hidden>
2016-06-15 · Re: [PATCH] read-cache.c: Ensure unmerged entries are removed · Junio C Hamano <hidden>
2016-06-15 · Re: [PATCH] read-cache.c: Ensure unmerged entries are removed · Jaime Soriano Pastor <hidden>
2016-06-15 · Re: [PATCH] read-cache.c: Ensure unmerged entries are removed · Junio C Hamano <hidden>

Jaime Soriano Pastor [off-list ref] writes:

I'd like to add some tests too for this, but I don't know how to
reproduce this state with git commands only, is there any way to add
entries to the index without checkings?

Perhaps feeding "update-index --index-info" four input lines would work?

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help