[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    git pull --recurse-submodules wipes uncommitted submodule changes without warning
From:       Guillaume Girol <symphorien () xlumurb ! eu>
Date:       2022-05-31 20:18:54
Message-ID: eb2d8ce45e556afd81216746f190bc5c883cdb81.camel () xlumurb ! eu
[Download RAW message or body]

What did you do before the bug happened? (Steps to reproduce your
issue)

The repository has a submodule bar.
In the current checkout, bar has new commits, but this is not commited:

----------------------------

$ git status
On branch master
Your branch is behind 'origin/master' by 1 commit, and can be fast-
forwarded.
  (use "git pull" to update your local branch)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   bar (new commits)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	git-bugreport-2022-05-31-2142.txt

no changes added to commit (use "git add" and/or "git commit -a")

----------------------------

There is one commit to pull. It affects a file in the superproject, but
not the submodule.

The issue arises with:

$ git pull --recurse-submodule=on-demand --no-rebase

What did you expect to happen? (Expected behavior)

The file affected by the pulled commit is modified, but the submodule
is left untouched.
The output of git status should look like:

----------------------------

$ git status
On branch master
Your branch up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   bar (new commits)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	git-bugreport-2022-05-31-2142.txt

no changes added to commit (use "git add" and/or "git commit -a")

----------------------------

What happened instead? (Actual behavior)

--------------------------

$  git pull --recurse-submodule=on-demand --no-rebase
Updating 67627dd..80f5c51
Fast-forward
 foo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Submodule path 'bar': checked out
'ef3c0711fedca48b0b43aadfd01b7bb94b519a13'

$  git status
On branch master
Your branch is up to date with 'origin/master'.

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	git-bugreport-2022-05-31-2142.txt

nothing added to commit but untracked files present (use "git add" to
track)

-----------------------

my uncommitted changes to the submodule have been wiped, and the commit
of the pulled revision was checked out.

What's different between what you expected and what actually happened?

When there are uncommitted changes to a file foo in a repo, and that I
`git pull` a commit that does not affect this file foo, git pull does
not wipe my changes to `foo`. I expect the same for submodules. If
there is a conflict, I am told about it and nothing is wiped either.


Anything else you want to add:

git pull is able to detect conflicts on submodules, so why not non-
conflicts on submodules?

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.36.0
cpu: x86_64
no commit associated with this build
sizeof-long: 8
sizeof-size_t: 8
shell-path: /nix/store/0d3wgx8x6dxdb2cpnq105z23hah07z7l-bash-5.1-
p16/bin/bash
uname: Linux 5.15.39 #1-NixOS SMP Thu May 12 10:30:34 UTC 2022 x86_64
compiler info: gnuc: 11.3
libc info: glibc: 2.34
$SHELL (typically, interactive shell): /run/current-system/sw/bin/zsh


[Enabled Hooks]

[prev in list] [next in list] [prev in thread] [next in thread]