git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Kevin Bernard <kevin.bernard@fiveco.ch>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: bug: checkout --recurse-submodules discard uncommited changes in submodule
Date: Thu, 14 Jan 2021 08:35:47 +0000	[thread overview]
Message-ID: <570e77a07f0b4d4ea09307e5fa819d6f@fiveco.ch> (raw)

Thank you for filling out a Git bug report!
Please answer the following questions to help us understand your issue.

What did you do before the bug happened? (Steps to reproduce your issue)
Make a git repository with a submodule in it.
Make two different commits in the main repository with two different versions of
the submodule, one of them is the head of the branch.
Checkout the head of the branch in the main repository, and make a submodule update.
Make a modification, do not commit it, in a submodule file that will not result
in a "error: Your local changes to the following files would be overwritten by
checkout" when the other version of the library will be checked out.
Go back to the main repository and make a checkout of the other commit with the
switch --recurse-submodules.

What did you expect to happen? (Expected behavior)
The checkout with the switch --recurse-submodules should fail when there are
uncommitted changes in the submodule.

What happened instead? (Actual behavior)
Uncommitted changes in the submodule are discarded without any notifications.

What's different between what you expected and what actually happened?
Loss of the uncommitted changes in the submodule.

Anything else you want to add:
I stay at your disposal if you need more information.

Please review the rest of the bug report below.
You can delete any lines you don't wish to share.


[System Info]
git version:
git version 2.30.0.windows.1
cpu: x86_64
built from commit: 18da6dbba950f8cc7b7d07057f7c30bf7cf207b6
sizeof-long: 4
sizeof-size_t: 8
shell-path: /bin/sh
uname: Windows 10.0 19041 
compiler info: gnuc: 10.2
libc info: no libc information available
$SHELL (typically, interactive shell): C:\Program Files\Git\usr\bin\bash.exe


[Enabled Hooks]

Sincerely yours,

Kevin Bernard


             reply	other threads:[~2021-01-14  8:55 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-14  8:35 Kevin Bernard [this message]
2021-01-14 13:54 ` bug: checkout --recurse-submodules discard uncommited changes in submodule Philippe Blain
2021-01-14 16:40   ` Kevin Bernard

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=570e77a07f0b4d4ea09307e5fa819d6f@fiveco.ch \
    --to=kevin.bernard@fiveco.ch \
    --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).