git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* git subtree pull vs git pull
@ 2021-02-18 19:49 Sven R. Kunze
  0 siblings, 0 replies; only message in thread
From: Sven R. Kunze @ 2021-02-18 19:49 UTC (permalink / raw)
  To: git

Hey everyone,

that's my first question here, so please bare with me. I got an 
unexplained behavior using git-subtree.


Please consider (git --version := 2.30.0):

me@host:~/repo$ git status
On branch master
Your branch is 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: somechanges

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

me@host:~/repo$ git pull --no-rebase
Already up to date.

me@host:~/repo$ git subtree pull --prefix=prefix/ subtree-origin master
Working tree has modifications.  Cannot add.


My expectation would be that I can pull the subtree as I could pull the 
main repo without any issue. The subtree does not even touch the 
modified file.

Is there a reason for this or can this restriction be lifted?

Where am I coming from? The work-around would be "git stash, git subtree 
pull, git stash pop" which would work on a first glance, but other tools 
like IDEs lose their context information regarding these changes (e.g. 
changelists). This can be a little bit annoying given that mostly there 
are not changes at the subtree-origin.

Best regards,
Sven


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-02-18 19:59 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-18 19:49 git subtree pull vs git pull Sven R. Kunze

Code repositories for project(s) associated with this 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).