Re: [PATCH v2 05/19] pull: implement fetch + merge

2015-06-09 Thread Junio C Hamano
Paul Tan writes: > +/** > + * Parses argv into [ [...]], returning their values in > `repo` > + * as a string and `refspecs` as a null-terminated array of strings. If > `repo` > + * is not provided in argv, it is set to NULL. > + */ > +static void parse_repo_refspecs(int argc, const char **argv

[PATCH v2 05/19] pull: implement fetch + merge

2015-06-02 Thread Paul Tan
Implement the fetch + merge functionality of git-pull, by first running git-fetch with the repo and refspecs provided on the command line, then running git-merge on FETCH_HEAD to merge the fetched refs into the current branch. Signed-off-by: Paul Tan --- builtin/pull.c | 61 +