public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Mirko Faina <mroik@delayed.space>
Cc: git@vger.kernel.org,  Jeff King <peff@peff.net>,
	 Tian Yuchen <a3205153416@gmail.com>
Subject: Re: [PATCH] apply.c: fix -p argument parsing
Date: Mon, 16 Mar 2026 12:56:48 -0700	[thread overview]
Message-ID: <xmqqikavo8e7.fsf@gitster.g> (raw)
In-Reply-To: <20260316005120.7079-1-mroik@delayed.space> (Mirko Faina's message of "Mon, 16 Mar 2026 01:51:16 +0100")

Mirko Faina <mroik@delayed.space> writes:

> "git apply" has an option -p that takes an integer as its argument.
> Unfortunately the function apply_option_parse_p() in charge of parsing
> this argument uses atoi() to convert from string to integer, which
> allows a non-digit after the number (e.g. "1q") to be silently ignored.
> As a consequence, an argument that does not begin with a digit silently
> becomes a zero. Despite this command working fine when a non-positive
> argument is passed, it might be useful for the end user to know that
> their input contains non-digits that might've been unintended.
>
> Replace atoi() with strtol_i() to catch malformed inputs.
>
> Signed-off-by: Mirko Faina <mroik@delayed.space>
> ---
> Sending a new version 'cause Tian pointed out that the die message is
> not explicit enough, and a user might not understand which option we're
> referring to if there are multiple.

The updated error message does look more helpful.  Will replace.

Also the post-test clean-up in each test is more thorough, which is
a very good thing to see.

Thanks.

  parent reply	other threads:[~2026-03-16 19:56 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-09 23:26 [PATCH] apply.c: fix -p argument parsing Mirko Faina
2026-03-09 23:43 ` Junio C Hamano
2026-03-10  0:54 ` [PATCH v2] " Mirko Faina
2026-03-10  3:31   ` Junio C Hamano
2026-03-10  4:45     ` Mirko Faina
2026-03-10  5:06   ` [PATCH v3] " Mirko Faina
2026-03-10 13:13     ` Junio C Hamano
2026-03-13  0:16     ` Jeff King
2026-03-13  1:12       ` Jeff King
2026-03-13  1:29         ` Jeff King
2026-03-13  4:27         ` Junio C Hamano
2026-03-13  4:19       ` Junio C Hamano
2026-03-13  3:19     ` [PATCH v4] " Mirko Faina
2026-03-13  4:39       ` Junio C Hamano
2026-03-16  0:51       ` [PATCH] " Mirko Faina
2026-03-16  0:52         ` Mirko Faina
2026-03-16 19:56         ` Junio C Hamano [this message]
2026-03-15 17:22 ` Tian Yuchen
2026-03-15 17:56   ` Mirko Faina

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqikavo8e7.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=a3205153416@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=mroik@delayed.space \
    --cc=peff@peff.net \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox