Re: [PATCH v3 2/3] read-tree -m: make error message for merging 0 trees less smart aleck

2017-05-12 Thread Jean-Noël AVILA
On Friday, 12 May 2017, 15:28:53 CEST Junio C Hamano wrote: > Jonathan Nieder writes: > > >> @@ -226,9 +226,10 @@ int cmd_read_tree(int argc, const char **argv, const > >> char *unused_prefix) > >>setup_work_tree(); > >> > >>if (opts.merge) { > >> -

Re: [PATCH v3 2/3] read-tree -m: make error message for merging 0 trees less smart aleck

2017-05-12 Thread Junio C Hamano
Jonathan Nieder writes: >> @@ -226,9 +226,10 @@ int cmd_read_tree(int argc, const char **argv, const >> char *unused_prefix) >> setup_work_tree(); >> >> if (opts.merge) { >> -if (stage < 2) >> -die("just how do you expect

Re: [PATCH v3 2/3] read-tree -m: make error message for merging 0 trees less smart aleck

2017-05-11 Thread Jonathan Nieder
Hi, Jean-Noel Avila wrote: > Signed-off-by: Jean-Noel Avila > Signed-off-by: Jonathan Nieder Please remove my sign-off. I didn't write or carry this patch. If you want to acknowledge my contribution, you can use something like Helped-by, but it's not

[PATCH v3 2/3] read-tree -m: make error message for merging 0 trees less smart aleck

2017-05-11 Thread Jean-Noel Avila
"git read-tree -m" requires a tree argument to name the tree to be merged in. Git uses a cutesy error message to say so and why: $ git read-tree -m warning: read-tree: emptying the index with no arguments is deprecated; use --empty fatal: just how do you expect me to merge 0