On Mon, Feb 29, 2016 at 11:10:09AM -0800, Junio C Hamano wrote: > >> - wargs = xmalloc_array(st_add(st_mult(2, args.len), 1), sizeof(wchar_t)); > >> + wargs = ALLOC_ARRAY(st_add(st_mult(2, args.len), 1), sizeof(wchar_t)); > >> xutftowcs(wargs, args.buf, 2 * args.len + 1); > >> strbuf_release(&args); > > > > Argh. Let me write "git commit -a" on the inside of my brown paper bag, > > so that I actually send out the fix sitting in my working tree, not the > > half-finished thing I ran "git add" on. > > Just to make sure that I am not confused, what you wrote below > matches what I received from you two message upthread. > > I am assuming that it is intended that the two messages from you > have the same patch, and the assignment of ALLOC_ARRAY to wargs was > a bug Torsten introduced only to his tree when cutting and pasting. > > With that assumption, will queue this one (or the original one, > which to me is the same thing). Oh, <phew>. I am only half as incompetent as I thought, then. I didn't even re-check what I sent, and just assumed Torsten was quoting it exactly (I _did_ write something like that while making the fix, and assumed I had just failed to properly commit). So yes, what I sent both times is the right thing. ;) -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html