Re: [PATCH v2] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

2015-08-19 Thread Junio C Hamano
Paul Tan writes: > (In addition, I fixed a small mistake with the "struct tree_desc" array > size.) Yeah, one thing I forgot to mention was that I suspect this kind of "oneway merge" already in other places in the code, and a future mini-project might be to inspect them all and try to see if the

[PATCH v2] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

2015-08-19 Thread Paul Tan
have a test for that, too? So yeah, we should have a test for that too. (In addition, I fixed a small mistake with the "struct tree_desc" array size.) Thanks, Paul -- >8 -- Subject: [PATCH v2] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index After running "git am --abort&q