git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stefan Sonski <s.sonski@gmail.com>
To: git@vger.kernel.org
Subject: Setting submodule.recurse true can lead to loose of changes
Date: Wed, 15 May 2019 16:02:17 +0200	[thread overview]
Message-ID: <CAGR_whtu75fcWGz-EALyXLTWkPCu-rHK8r0M7Lr2t71RKT-kww@mail.gmail.com> (raw)

Hi all,

I discovered a potential bug regarding submodules and the use of
rebase and stash.

When setting the configuration submodule.recurse true, doing changes
in the super project and also given submodule, these changes are lost,
when doing a rebase or stash. The stash even shows these changes with
stash show -p, but trying to apply them, leads also to a lost of these
changes.

Removing submodule.recurse and setting fetch.recurseSubmodules and
push.recurseSubmodules fixes this problem, because the submodule is
not touched.

Stefan

                 reply	other threads:[~2019-05-15 14:02 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=CAGR_whtu75fcWGz-EALyXLTWkPCu-rHK8r0M7Lr2t71RKT-kww@mail.gmail.com \
    --to=s.sonski@gmail.com \
    --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).