Re: What's cooking in git.git (Jun 2015, #06; Wed, 24)

[Johannes Schindelin <johannes.schindelin@gmx.de>]

Hi,

On 2015-06-25 03:01, Stefan Beller wrote:
>> * pt/pull-builtin (2015-06-18) 19 commits
>>  - pull: remove redirection to git-pull.sh
>>  - pull --rebase: error on no merge candidate cases
>>  - pull --rebase: exit early when the working directory is dirty
>>  - pull: configure --rebase via branch.<name>.rebase or pull.rebase
>>  - pull: teach git pull about --rebase
>>  - pull: set reflog message
>>  - pull: implement pulling into an unborn branch
>>  - pull: fast-forward working tree if head is updated
>>  - pull: check if in unresolved merge state
>>  - pull: support pull.ff config
>>  - pull: error on no merge candidates
>>  - pull: pass git-fetch's options to git-fetch
>>  - pull: pass git-merge's options to git-merge
>>  - pull: pass verbosity, --progress flags to fetch and merge
>>  - pull: implement fetch + merge
>>  - pull: implement skeletal builtin pull
>>  - argv-array: implement argv_array_pushv()
>>  - parse-options-cb: implement parse_opt_passthru_argv()
>>  - parse-options-cb: implement parse_opt_passthru()
>>
>>  Reimplement 'git pull' in C.
>>
>>  This is v4 ($gmane/271943).
>>  Comments from mentors and others?
> 
> I think the series is good as is.

I just had a fresh look. Some comments:

- I *think* that the current `recreate_opt()` is fine, but if it is used more, we will have to quote the arguments to guard against spaces and quotes and whatnot

- There is a loop

        for (; *argv; argv++)
               argv_array_push(array, *argv);

  which might want to be written as

        while (*argv)
               argv_array_push(array, *(argv)++);

  to conform better with Git's coding style, but this one is not crucial at all.

Having said that, I really think this is impressive work, and not only the outcome. It is a real pleasure to have you, Paul!

I vote for merging, too,
Dscho