Re: [PATCH v4 0/2] stash show: learn --include-untracked and --only-untracked

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Denton Liu <liu.denton@xxxxxxxxx> writes:

> A blindspot that I've noticed in git is that it's not possible to
> properly view a stash entry that has untracked files via `git stash
> show`. Teach `git stash show --include-untracked` which should do this.
> In addition, this series also teaches `--only-untracked` and the
> `stash.showIncludeUntracked` config option.
>
> This series is based on 'dl/stash-cleanup'.
>
> Changes since v3:
>
> * Incorporate Junio's SQUASH??? commits
>
> * Implement a custom unpack_trees() callback to detect the case where
>   there are duplicate entries in worktree and untracked commits

I actually expected the latter enhancement to be done outside the
scope of this series.  I briefly looked at the callback but I am not
convinced that it is correct (e.g. how do you notice and barf when
the untracked tree records foo/bar.txt and the index or the working
tree records foo as a file?).

Thanks.



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux