From: "Ефимов Василий" <real@ispras.ru>
To: git@vger.kernel.org
Subject: Bug: cherry-pick & submodule
Date: Fri, 10 Nov 2017 19:41:15 +0300 [thread overview]
Message-ID: <743acc29-85bb-3773-b6a0-68d4a0b8fd63@ispras.ru> (raw)
I faced an unexpected behaviour during cherry-picking
a commit to a branch with a submodule.
Git graph:
A -- B [master]
\
`- C -- D [test]
Both branches have a file with name `a_file`.
It has been added by commit A.
Commits B and C add a folder with name `a_submodule` to the respective
branches.
Commit C does it regularly by adding a file with name `a_submodule/content`.
Commit B adds a submodule with name `a_submodule`.
Commit D only modifies `a_file`.
Note that `a_file` and `a_submodule` are not related.
[repo]
|- a_file
`- a_submodule
When I trying to cherry pick commit D on commit B, I got
a conflict with `a_submodule`. Changes of `a_file` are
successfully cherry-picked.
I expected, that there would be no conflicts.
A bash script reproducing the bug is listed below.
Vasily.
====
rm -rf a_submodule a_repo
mkdir a_submodule
cd a_submodule
git init
touch a_file_in_a_submodule
git add a_file_in_a_submodule
git commit -m "add a file in a submodule"
cd ..
mkdir a_repo
cd a_repo
git init
touch a_file
git add a_file
git commit -m "add a file"
git branch test
git checkout test
mkdir a_submodule
touch a_submodule/content
git add a_submodule/content
git commit -m "add a regular folder with name a_submodule"
echo "123" > a_file
git add a_file
git commit -m "modify a file"
git checkout master
git submodule add ../a_submodule a_submodule
git submodule update a_submodule
git commit -m "add a submodule info folder with name a_submodule"
# Trying to cherry-pick modification of a file from test branch.
git cherry-pick test
# some debug
git status
====
next reply other threads:[~2017-11-10 16:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 16:41 Ефимов Василий [this message]
2017-11-11 0:04 ` [PATCH] t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure Stefan Beller
-- strict thread matches above, loose matches on Subject: below --
2017-11-10 16:00 Bug: cherry-pick & submodule Ефимов Василий
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=743acc29-85bb-3773-b6a0-68d4a0b8fd63@ispras.ru \
--to=real@ispras.ru \
--cc=git@vger.kernel.org \
/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).