From: Junio C Hamano <gitster@pobox.com>
To: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Cc: Antoine Queru <Antoine.Queru@ensimag.grenoble-inp.fr>,
git@vger.kernel.org,
william duclot <william.duclot@ensimag.grenoble-inp.fr>,
simon rabourg <simon.rabourg@ensimag.grenoble-inp.fr>,
francois beutin <francois.beutin@ensimag.grenoble-inp.fr>
Subject: Re: [PATCH v2] upload-pack.c: use of parse-options API
Date: Thu, 19 May 2016 09:58:55 -0700 [thread overview]
Message-ID: <xmqq60uakmr4.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <431335092.10912437.1463674220365.JavaMail.zimbra@imag.fr> (Matthieu Moy's message of "Thu, 19 May 2016 18:10:20 +0200 (CEST)")
Matthieu Moy <matthieu.moy@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.
next prev parent reply other threads:[~2016-05-19 16:59 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-18 16:40 [PATCH] upload-pack.c: use of parse-options API Antoine Queru
2016-05-18 18:08 ` Jeff King
2016-05-19 10:10 ` Antoine Queru
2016-05-19 11:57 ` Jeff King
2016-05-19 14:36 ` Matthieu Moy
2016-05-19 15:39 ` [PATCH v2] " Antoine Queru
2016-05-19 16:10 ` Matthieu Moy
2016-05-19 16:46 ` Junio C Hamano
2016-05-20 6:55 ` Matthieu Moy
2016-05-19 16:58 ` Junio C Hamano [this message]
2016-05-20 6:53 ` Matthieu Moy
2016-05-20 16:52 ` Junio C Hamano
2016-05-23 13:02 ` [PATCH v3] " Antoine Queru
2016-05-23 18:03 ` Matthieu Moy
2016-05-27 14:16 ` [PATCH v4] " Antoine Queru
2016-05-27 14:52 ` Matthieu Moy
2016-05-27 16:59 ` Eric Sunshine
2016-05-30 14:27 ` Antoine Queru
2016-05-30 14:53 ` [PATCH v5] upload-pack.c: use " Antoine Queru
2016-05-30 15:06 ` Matthieu Moy
2016-05-30 19:26 ` Junio C Hamano
2016-05-31 9:53 ` Antoine Queru
2016-05-31 11:27 ` Matthieu Moy
2016-05-31 17:16 ` Junio C Hamano
2016-06-01 15:49 ` Antoine Queru
2016-05-31 9:57 ` [PATCH v6] " Antoine Queru
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq60uakmr4.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Antoine.Queru@ensimag.grenoble-inp.fr \
--cc=francois.beutin@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=matthieu.moy@grenoble-inp.fr \
--cc=simon.rabourg@ensimag.grenoble-inp.fr \
--cc=william.duclot@ensimag.grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).