LKML Archive on
help / color / mirror / Atom feed
From: Ariel Marcovitch <>
Subject: [PATCH v2] Forbid passing 'HEAD' to --commit
Date: Wed,  1 Sep 2021 17:52:12 +0300	[thread overview]
Message-ID: <> (raw)

As opposed to the --diff option, --commit can get ref names instead of
commit hashes.

When using the --commit option, the script resets the working directory
to the commit before the given ref, by adding '~' to the end of the ref.

However, the 'HEAD' ref is relative, and so when the working directory
is reset to 'HEAD~', 'HEAD' points to what was 'HEAD~'. Then when the
script resets to 'HEAD' it actually stays in the same commit. In this
case, the script won't report any cases because there is no diff between
the cases of the two refs.

Prevent the user from using HEAD refs.

A better solution might be to resolve the refs before doing the
reset, but for now just disallow such refs.

Signed-off-by: Ariel Marcovitch <>
Signed-off-by: Masahiro Yamada <>
 scripts/ | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/ b/scripts/
index b9b0f15e5880..c57c990c3244 100755
--- a/scripts/
+++ b/scripts/
@@ -102,6 +102,9 @@ def parse_options():
     if args.commit:
+        if args.commit.startswith('HEAD'):
+            sys.exit("The --commit option can't use the HEAD ref")
         args.find = False
     if args.ignore:

base-commit: 087e856cfb76e9eef9a3a6e000854794f3c36e24

             reply	other threads:[~2021-09-01 14:52 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-01 14:52 Ariel Marcovitch [this message]
2021-09-10  2:13 ` Masahiro Yamada

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:

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

  git send-email \ \ \ \ \ \ \
    --subject='Re: [PATCH v2] Forbid passing '\''HEAD'\'' to --commit' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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 NNTP newsgroup(s).