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

Re: [PATCH/WIP v3 10/31] am: refresh the index at start

From: Paul Tan <hidden>
Date: 2016-06-15 23:05:23

On Fri, Jun 19, 2015 at 5:28 AM, Junio C Hamano [off-list ref] wrote:
Paul Tan [off-list ref] writes:
quoted
If a file is unchanged but stat-dirty, git-apply may erroneously fail to
apply patches, thinking that they conflict with a dirty working tree.

As such, since 2a6f08a (am: refresh the index at start and --resolved,
2011-08-15), git-am will refresh the index before applying patches.
Re-implement this behavior.
Good.

I would actually have expected to see this as part of 08/31, though.
Ah right, makes sense since this patch is primarily about git-apply.

I've squashed this patch into 08/31.

Regards,
Paul
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help