From: Junio C Hamano <gitster@pobox•com>
To: K Jayatheerth <jayatheerthkulkarni2005@gmail•com>
Cc: smacdonald@kaimaging•com, git@vger•kernel.org
Subject: Re: [PATCH] stash: fix incorrect branch name in stash message
Date: Mon, 12 May 2025 10:49:34 -0700 [thread overview]
Message-ID: <xmqqtt5psor5.fsf@gitster.g> (raw)
In-Reply-To: <20250512164001.62065-1-jayatheerthkulkarni2005@gmail.com> (K. Jayatheerth's message of "Mon, 12 May 2025 22:10:01 +0530")
K Jayatheerth <jayatheerthkulkarni2005@gmail•com> writes:
> @@ -1377,6 +1377,7 @@ static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_b
> struct strbuf msg = STRBUF_INIT;
> struct strbuf commit_tree_label = STRBUF_INIT;
> struct strbuf untracked_files = STRBUF_INIT;
> + char *branch_name_buf = NULL;
>
> prepare_fallback_ident("git stash", "git@stash");
>
> @@ -1404,11 +1405,20 @@ static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_b
>
> branch_ref = refs_resolve_ref_unsafe(get_main_ref_store(the_repository),
> "HEAD", 0, NULL, &flags);
> - if (flags & REF_ISSYMREF)
> - skip_prefix(branch_ref, "refs/heads/", &branch_name);
> - head_short_sha1 = repo_find_unique_abbrev(the_repository,
> - &head_commit->object.oid,
> - DEFAULT_ABBREV);
> +
> + if (flags & REF_ISSYMREF) {
> + const char *tmp = NULL;
> + if (skip_prefix(branch_ref, "refs/heads/", &tmp))
> + branch_name_buf = xstrdup(tmp);
> + }
> + if (branch_name_buf)
> + branch_name = branch_name_buf;
> + else
> + branch_name = "(no branch)";
> +
> + head_short_sha1 = repo_find_unique_abbrev(the_repository,
> + &head_commit->object.oid,
> + DEFAULT_ABBREV);
> strbuf_addf(&msg, "%s: %s ", branch_name, head_short_sha1);
> pp_commit_easy(CMIT_FMT_ONELINE, head_commit, &msg);
Funny indentation, and branch_name_buf needs to be free'ed after use
but other than that, nice digging!
Thanks.
next prev parent reply other threads:[~2025-05-12 17:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-12 15:19 [BUG] git stash incorrectly showing submodule branch instead of superproject branch Stuart MacDonald
2025-05-12 16:12 ` Re " K Jayatheerth
2025-05-12 16:26 ` Stuart MacDonald
2025-05-12 16:40 ` [PATCH] stash: fix incorrect branch name in stash message K Jayatheerth
2025-05-12 16:42 ` JAYATHEERTH K
2025-05-12 17:09 ` Stuart MacDonald
2025-05-12 17:49 ` Junio C Hamano [this message]
2025-05-12 18:54 ` Eric Sunshine
2025-05-13 1:21 ` JAYATHEERTH K
2025-05-14 13:28 ` Junio C Hamano
2025-06-08 6:35 ` K Jayatheerth
2025-06-08 13:11 ` René Scharfe
2025-06-08 14:45 ` [PATCH v2] " K Jayatheerth
2025-06-08 16:20 ` Junio C Hamano
2025-06-11 1:32 ` JAYATHEERTH K
2025-06-11 1:42 ` [PATCH v3] " K Jayatheerth
2025-06-11 16:00 ` Junio C Hamano
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=xmqqtt5psor5.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jayatheerthkulkarni2005@gmail$(echo .)com \
--cc=smacdonald@kaimaging$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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