Git copy file from another branch without staging it

Question

I've found how you can copy a file wholesale from one branch to another:

Edit please note, if you think this question is a duplicate of this, please observe that that's the question I linked above^^, and what follows below explains the different functionality that I want.

$ git checkout directory/somefile.php feature-B

However this solution stages the changes already:

$ git status
On branch feature-A
Your branch is up-to-date with 'origin/feature-A'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   directory/somefile.php

But I don't want to add all the changes. I want to do an add -p and take most, but not all, of the changes. What I want is this:

$ git status
On branch feature-A
Your branch is up-to-date with 'origin/feature-A'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   directory/somefile.php

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

Of course, I can do git reset to unstage the changes, but I would like to get what I want the first time, without a second step.

How can I copy a file from another branch without staging it?

@phd This question you linked is literally the one I linked at the start of my question, and my question expounds on how I want different functionality from the answer in that question. — user151841, May 08 '19 at 13:35
@phd and it never says that that method will copy, but not stage, commits. In other words, it doesn't answer my question; it presents it as an alternative to `git copy...`, with no indication of a difference in functionality, so a user would assume that it behaves the same way. If someone is googling to find an answer to my question, there is no information in those answers to indicate that it meets their desired behavior. — user151841, May 08 '19 at 14:34
@phd Which question in particular from the search contained the answer? — user151841, May 08 '19 at 16:26
@phd not a duplicate. this is a more precise question and answer. — worc, Feb 27 '20 at 19:24

score 6 · Accepted Answer · answered May 07 '19 at 19:48

6

you could use git show and then redirect... it's not very elegant, though

git show feature-B:directory/somefile.php > directory/somefile.php

answered May 07 '19 at 19:48

eftshift0

16,836
2
23
36

Good enough to make an alias out of! – user151841 May 08 '19 at 13:36
`copy = ! "gitcopy() { git show $1:$2 > $2 ; }; gitcopy"` -- you need to make a bash function as an alias, in order to use parameters – user151841 Aug 29 '19 at 14:09

score 2 · Answer 2 · answered Mar 25 '20 at 18:11

You can use git restore

git restore --source feature-B directory/somefile.php

I didn't pass any option saying where it should restore the file and by befault it's working directory (without index/staging area). From documentation:

> -W
> --worktree
> -S
> --staged
> 
>     Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying --staged will only restore the index. Specifying both restores both.

Git copy file from another branch without staging it

2 Answers2

Linked