Thread (7 messages) flat view 7 messages, 2 authors, 2016-06-15

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

From: Jaime Soriano Pastor <hidden>
Date: 2016-06-15 23:02:17

Possibly related (same subject, not in this thread)

Yes, --index-info worked for this purpouse, thanks!

https://github.com/jsoriano/git/blob/remove-unmerged-index-entry/t/t9904-unmerged-file-with-merged-entry.sh#L25

I'll try to send the patches to the mailing lists later today or tomorrow.

On Mon, Aug 18, 2014 at 6:34 PM, Junio C Hamano [off-list ref] wrote:
Jaime Soriano Pastor [off-list ref] writes:
quoted
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?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help