Jay Soffian <jaysoffian@xxxxxxxxx> writes: > * There is one semantic change. You can't use "-s=<strategy>" anymore. That's not > really proper usage of a short option (it's either "-s<strategy>" or > "-s <strategy>"). Is it okay to not accept the "-s=<strategy>" form? Well, with my maintainer hat on, I must resist _any_ change ;-). Personally I would not mind this. It is a borderline between regression and making the option parameters more consistent. > * Is it worth doing this at all? If the plan is to rewrite everything as > builtins I kinda feel like I'm wasting my time. If a contributor feels wasting his time, what should reviewers feel reviewing such patches ;-)? > * You can see I added the GIT_PULL_DEBUG_ARGS blob. Frankly, I can't really > think of a good way to test this change other than to do > something like that and then add a test for each individual option. I see this would be useful while you are developing. But the testsuite is meant to check the behaviour that is externally observable. It does not matter if you change the way you internally represent --verbose option from settting $verbose to resetting $quiet, but tests based on GIT_PULL_DEBUG_ARGS would notice the difference in the implementation detail, so I do not see much point leaving this in; it would not be useful for test scripts, I suspect. > +git pull [options] [<repo>] [<refspec>] > +-- > + fetch options > +q,quiet make the fetch process less verbose > +v,verbose make the fetch process more verbose > +a,append append to FETCH_HEAD instead of overwritting > +upload-pack=, specify path to git-fetch-pack on remote end > +f,force force local branch to be updated by remote branch > +t,tags fetch all remote tags While it is technically correct that you _can_ feed any option meant for git-fetch to this command, some options do not make any sense in the context of git-pull, and we should not advertise them, or better yet, actively reject them if you can. I think --tags is one of them. > . git-sh-setup > set_reflog_action "pull $*" > require_work_tree > @@ -23,46 +49,33 @@ rebase=$(git config --bool branch.$curr_branch_short.rebase) > while : > do > case "$1" in > ... > ;; > *) > # Pass thru anything that may be meant for fetch. > break Because the loop breaks here, the option description above should mention that options meant for fetch should come after all the options you want to give to git-pull itself. For example, I do not think "git pull -q -s stupid $there $that" is meant to work. A better long-term alternative would be to lift that restriction. I do not recall offhand but does the parse-options reorder the options in any way? If that is the case, it makes the above not a long-term thing but a must-be-done in a patch that starts to use parse-options. - 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
