Matthieu Moy <matthieu....@grenoble-inp.fr> writes:
>> + if (argc != 1)
>> + usage_with_options(upload_pack_usage, options);
>>
>> - setup_path();
>> + if (timeout)
>> + daemon_mode = 1;
>>
>> - dir = argv[i];
>> + setup_path();
>>
>> + dir = argv[0];
>
> Not a problem with your code, but the patch shows "setup_path()"
> as moved while it is not really. Maybe using "send-email
> --patience" or some other diff option could make the patch nicer.
Encouraging use of "send-email" with "--patience" is a losing
approach if your goal is to present more reviewable diff, isn't it?
Using "send-email" as if it is a front-end of "format-patch" means
you lose the opportunity for the final proof-reading (not just
finding typoes in the message, but the shape of diff, like you are
pointing out).
Using "format-patch --patience" or some other diff option, and pick
the best one to give to "send-email" would indeed be a way to do so.
> Not really important as it does not change the final state.
I wondered if this is an example of real-world fallout from
0018da1^2~1 (xdiff: implement empty line chunk heuristic,
2016-04-19), but it does not seem to be so.
What is happening is that Antoine's patch (which is slightly
different from what you quoted above) has trailing whitespace after
"setup_path();", so it indeed is the original setup_path(); is
removed, a few lines were inserted, argv[i] reference is removed
and then a totally different "setup_path(); " was added there.
With that whitespace-breakage corrected, the resulting patch ends
more like this:
+ if (argc != 1)
+ usage_with_options(upload_pack_usage, options);
- if (i != argc-1)
- usage(upload_pack_usage);
+ if (timeout)
+ daemon_mode = 1;
setup_path();
- dir = argv[i];
-
+ dir = argv[0];
if (!enter_repo(dir, strict))
die("'%s' does not appear to be a git repository", dir);
which is more reasonable.
So in the end, this was not "Not a problem with your code" ;-) It
was.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
