From: JAYATHEERTH K <jayatheerthkulkarni2005@gmail.com>
To: smacdonald@kaimaging.com
Cc: git@vger.kernel.org
Subject: Re: [PATCH] stash: fix incorrect branch name in stash message
Date: Mon, 12 May 2025 22:12:50 +0530 [thread overview]
Message-ID: <CA+rGoLfv6E7=TCm99yt4SYsZ1P-QRxD+vMuaHtDWX=ufneiYUA@mail.gmail.com> (raw)
In-Reply-To: <20250512164001.62065-1-jayatheerthkulkarni2005@gmail.com>
Changing this I found results to be correct
I think you can use this patch if you want a solution on an immediate basis,
testing and merging this into the master usually takes some time.
After testing with similar use case listed above
jayatheerth@fedora:~/Documents/code/test$ # Clean up previous test directories
rm -rf ~/Documents/code/test/ui ~/Documents/code/test/sdk
mkdir -p ~/Documents/code/test && cd ~/Documents/code/test
# Step 1: Create the submodule repo
mkdir sdk && cd sdk
git init
echo "SDK file" > sdk.txt
git add sdk.txt
git commit -m "Initial commit in SDK"
git stash listk stash messagextsh itbmodule add ../sdk
hint: Using 'master' as the name for the initial branch. This default
branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint: git config --global init.defaultBranch <name>
hint:
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint:
hint: git branch -m <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in
/home/jayatheerth/Documents/code/test/sdk/.git/
[master (root-commit) 033e72f] Initial commit in SDK
1 file changed, 1 insertion(+)
create mode 100644 sdk.txt
hint: Using 'master' as the name for the initial branch. This default
branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint: git config --global init.defaultBranch <name>
hint:
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint:
hint: git branch -m <name>
hint:
hint: Disable this message with "git config set advice.defaultBranchName false"
Initialized empty Git repository in
/home/jayatheerth/Documents/code/test/ui/.git/
Cloning into '/home/jayatheerth/Documents/code/test/ui/sdk'...
done.
[master (root-commit) 870c575] Add SDK as submodule
2 files changed, 4 insertions(+)
create mode 100644 .gitmodules
create mode 160000 sdk
Switched to a new branch 'feature_foo'
Switched to a new branch 'feature_sdk_foo'
Switched to a new branch 'bugfix_bar'
Saved working directory and index state On bugfix_bar: debugging
stash@{0}: On bugfix_bar: debugging
I found it to be on the bugfix_bar correctly as intended.
-Jayatheerth
next prev parent reply other threads:[~2025-05-12 16:43 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 [this message]
2025-05-12 17:09 ` Stuart MacDonald
2025-05-12 17:49 ` Junio C Hamano
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='CA+rGoLfv6E7=TCm99yt4SYsZ1P-QRxD+vMuaHtDWX=ufneiYUA@mail.gmail.com' \
--to=jayatheerthkulkarni2005@gmail.com \
--cc=git@vger.kernel.org \
--cc=smacdonald@kaimaging.com \
/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;
as well as URLs for NNTP newsgroup(s).