Re: [PATCH v4 5/5] stash: implement builtin stash

2017-06-27 Thread Thomas Gummerer
On Mon, Jun 26, 2017 at 8:53 AM Matthieu Moy wrote: > > Thomas Gummerer writes: > > > After the line > > > > test -n "$seen_non_option" || set "push" "$@" > > > > it's not possible that $# is 0 anymore, so this will never be > > printed. From a quick look at the history it seems like it wasn't >

Re: [PATCH v4 5/5] stash: implement builtin stash

2017-06-26 Thread Matthieu Moy
Thomas Gummerer writes: > After the line > > test -n "$seen_non_option" || set "push" "$@" > > it's not possible that $# is 0 anymore, so this will never be > printed. From a quick look at the history it seems like it wasn't > possible to trigger that codepath for a while. If I'm reading things

Re: [PATCH v4 5/5] stash: implement builtin stash

2017-06-25 Thread Thomas Gummerer
On 06/19, Joel Teichroeb wrote: > On Sun, Jun 11, 2017 at 2:27 PM, Thomas Gummerer wrote: > >> + > >> +int cmd_stash(int argc, const char **argv, const char *prefix) > >> +{ > >> + int result = 0; > >> + pid_t pid = getpid(); > >> + > >> + struct option options[] = { > >> +

Re: [PATCH v4 5/5] stash: implement builtin stash

2017-06-22 Thread Junio C Hamano
Joel Teichroeb writes: > On Fri, Jun 16, 2017 at 3:47 PM, Junio C Hamano wrote: > ... >> Then you write exactly the same index contents again, this time to >> info->u_tree here. I am not sure why you need to do this twice, and >> I do not see how orig_tree.hash you wrote earlier is used? > > I'

Re: [PATCH v4 5/5] stash: implement builtin stash

2017-06-22 Thread Junio C Hamano
Joel Teichroeb writes: > +static int patch_working_tree(struct stash_info *info, const char *prefix, > + const char **argv) > +{ > + struct argv_array args = ARGV_ARRAY_INIT; > + struct child_process cp = CHILD_PROCESS_INIT; > + struct strbuf out = STRBUF_INIT; > + siz

Re: [PATCH v4 5/5] stash: implement builtin stash

2017-06-19 Thread Joel Teichroeb
On Sun, Jun 11, 2017 at 2:27 PM, Thomas Gummerer wrote: >> + >> +int cmd_stash(int argc, const char **argv, const char *prefix) >> +{ >> + int result = 0; >> + pid_t pid = getpid(); >> + >> + struct option options[] = { >> + OPT_END() >> + }; >> + >> + git_config(gi

Re: [PATCH v4 5/5] stash: implement builtin stash

2017-06-19 Thread Joel Teichroeb
On Fri, Jun 16, 2017 at 3:47 PM, Junio C Hamano wrote: > Joel Teichroeb writes: >> +/* >> + * Untracked files are stored by themselves in a parentless commit, for >> + * ease of unpacking later. >> + */ >> +static int save_untracked(struct stash_info *info, const char *message, >> + i

Re: [PATCH v4 5/5] stash: implement builtin stash

2017-06-19 Thread Jeff King
On Mon, Jun 19, 2017 at 03:16:48PM +0200, Johannes Schindelin wrote: > And if you disagree with this assessment, you should point out the same > issues in literally all of my patches, as I always put initialized > variables first, uninitialized last. Yeah, I am scratching my head here. If we do h

Re: [PATCH v4 5/5] stash: implement builtin stash

2017-06-19 Thread Johannes Schindelin
Hi Junio, On Fri, 16 Jun 2017, Junio C Hamano wrote: > Joel Teichroeb writes: > > > +static void stash_create_callback(struct diff_queue_struct *q, > > + struct diff_options *opt, void *cbdata) > > +{ > > + int i; > > + > > + for (i = 0; i < q->nr; i++) { > > +

Re: [PATCH v4 5/5] stash: implement builtin stash

2017-06-16 Thread Junio C Hamano
Joel Teichroeb writes: > +static void stash_create_callback(struct diff_queue_struct *q, > + struct diff_options *opt, void *cbdata) > +{ > + int i; > + > + for (i = 0; i < q->nr; i++) { > + struct diff_filepair *p = q->queue[i]; > + con

Re: [PATCH v4 5/5] stash: implement builtin stash

2017-06-16 Thread Junio C Hamano
Joel Teichroeb writes: > diff --git a/builtin/stash.c b/builtin/stash.c > new file mode 100644 > index 00..a9680f2909 > --- /dev/null > +++ b/builtin/stash.c > ... > +static const char *ref_stash = "refs/stash"; > +static int quiet = 0; Let BSS take care of zero-initialization, i.e. drop

Re: [PATCH v4 5/5] stash: implement builtin stash

2017-06-11 Thread Thomas Gummerer
On 06/07, Joel Teichroeb wrote: > Implement all git stash functionality as a builtin command > > Signed-off-by: Joel Teichroeb > --- Thanks for working on this. A few comments from me below. Mainly on stash push, as that's what I'm most familiar with, and all I had time for today. Hope it hel

[PATCH v4 5/5] stash: implement builtin stash

2017-06-07 Thread Joel Teichroeb
Implement all git stash functionality as a builtin command Signed-off-by: Joel Teichroeb --- Makefile |2 +- builtin.h |1 + builtin/stash.c | 1224 + git-stash.