threads / discuss / 46126

Feature request: Please add support to stash specific files

Subject: Feature request: Please add support to stash specific files

## tl;dr

6 messages between Jun 6, 2017 and Jun 6, 2017.

replies: 5people: 4as markdown or json

rajdeep mondal· Jun 6, 2017, 13:23 UTC · lore
git version 2.6.3
OS: RHEL 6

Work around found in: https://stackoverflow.com/questions/3040833/stash-only-one-file-out-of-multiple-files-that-have-changed-with-git

Workaround is not very optimal. Please add this support to git.
-- 
==============================
Rajdeep
==============================
Randall S. Becker· Jun 6, 2017, 13:31 UTC · re: rajdeep mondal · lore

RE: Feature request: Please add support to stash specific files

-----Original Message----- On June 6, 2017 9:23 AM, rajdeep mondal wrote:

>Work around found in:
>https://stackoverflow.com/questions/3040833/stash-only-one-file-out-of-multiple-files-that-have-changed-with-git
>Workaround is not very optimal. Please add this support to git.
Instead of using stash as part of your normal process, consider using topic branches instead. Before working, switch to a new topic branch. If you forget, stash, switch, apply, then go forth. While on the topic branch, you can use add and commit on a hunk or file basis to satisfy what appears to be the requirement here. You can then merge the desired commits from your topic branch into wherever you want to merge them either preserving the commit or by squashing commits together.
In my shop, stash is only used for the "I forgot to switch to a topic branch, oops" process. I try to encourage people not to use it. I also discourage squashed commits, but that's because I like knowing what's in my sausages 😊

Cheers, Randall

rajdeep mondal· Jun 6, 2017, 18:38 UTC · re: Randall S. Becker · lore

Re: Feature request: Please add support to stash specific files

Hi Randall,

I completely agree to what you are saying, but sometimes it just so happens that in the middle of a change, i feel like if some portion of the changes are fine I can commit them. Stashing some of the files and being able to check the compile/tests at this point would be a really awesome change.

Stash supports a -p option to deal with this, it becomes cumbersome when the number of files are many. Maybe it is something which would be a good to have feature. People need not use it if they dont want to.

Thanks Rajdeep

On Tue, Jun 6, 2017 at 9:31 AM, Randall S. Becker <rsbecker@nexbridge.com> wrote:

Show 14 quoted lines
> -----Original Message-----
> On June 6, 2017 9:23 AM, rajdeep mondal wrote:
>>Work around found in:
>>https://stackoverflow.com/questions/3040833/stash-only-one-file-out-of-multiple-files-that-have-changed-with-git
>>Workaround is not very optimal. Please add this support to git.
>
> Instead of using stash as part of your normal process, consider using topic branches instead. Before working, switch to a new topic branch. If you forget, stash, switch, apply, then go forth. While on the topic branch, you can use add and commit on a hunk or file basis to satisfy what appears to be the requirement here. You can then merge the desired commits from your topic branch into wherever you want to merge them either preserving the commit or by squashing commits together.
>
> In my shop, stash is only used for the "I forgot to switch to a topic branch, oops" process. I try to encourage people not to use it. I also discourage squashed commits, but that's because I like knowing what's in my sausages 😊
>
> Cheers,
> Randall
>
>
-- 
==============================
Rajdeep
==============================
Mike Hommey· Jun 6, 2017, 21:03 UTC · re: rajdeep mondal · lore

Re: Feature request: Please add support to stash specific files

On Tue, Jun 06, 2017 at 02:38:08PM -0400, rajdeep mondal wrote:
Show 12 quoted lines
> Hi Randall,
> 
> I completely agree to what you are saying, but sometimes it just so
> happens that in the middle of a change, i feel like if some portion of
> the changes are fine I can commit them.  Stashing some of the files
> and being able to check the compile/tests at this point would be a
> really awesome change.
> 
> Stash supports a -p option to deal with this, it becomes cumbersome
> when the number of files are many.  Maybe it is something which would
> be a good to have feature. People need not use it if they dont want
> to.
Git 2.13.0 has that already.
git stash -- file1 file2
Mike
rajdeep mondal· Jun 6, 2017, 22:00 UTC · re: Mike Hommey · lore

Re: Feature request: Please add support to stash specific files

Thanks Mike.
On Tue, Jun 6, 2017 at 5:03 PM, Mike Hommey <mh@glandium.org> wrote:
Show 19 quoted lines
> On Tue, Jun 06, 2017 at 02:38:08PM -0400, rajdeep mondal wrote:
>> Hi Randall,
>>
>> I completely agree to what you are saying, but sometimes it just so
>> happens that in the middle of a change, i feel like if some portion of
>> the changes are fine I can commit them.  Stashing some of the files
>> and being able to check the compile/tests at this point would be a
>> really awesome change.
>>
>> Stash supports a -p option to deal with this, it becomes cumbersome
>> when the number of files are many.  Maybe it is something which would
>> be a good to have feature. People need not use it if they dont want
>> to.
>
> Git 2.13.0 has that already.
>
> git stash -- file1 file2
>
> Mike
-- 
==============================
Rajdeep
==============================
Christian Neukirchen· Jun 6, 2017, 13:42 UTC · re: rajdeep mondal · lore

Re: Feature request: Please add support to stash specific files

rajdeep mondal <justrajdeep@gmail.com> writes:
Show 7 quoted lines
> git version 2.6.3
> OS: RHEL 6
>
> Work around found in:
> https://stackoverflow.com/questions/3040833/stash-only-one-file-out-of-multiple-files-that-have-changed-with-git
>
> Workaround is not very optimal. Please add this support to git.
This has been implemented in Git 2.13:
> * "git stash push" takes a pathspec so that the local changes can be
>   stashed away only partially.
-- 
Christian Neukirchen  <chneukirchen@gmail.com>  http://chneukirchen.org

← back to recent threads