Re: [PATCH] Ignore dirty submodule states during stash
- From
Stefan Beller <sbeller@google.com>
- Date
- May 16, 2016, 06:37 UTC
- Message-ID
- <CAGZ79kaTss6ctZDCiRP2wjuxH+rJ79RKFLM79_FJN+37Bed+HQ@mail.gmail.com>
- In-Reply-To
- <20160516020735.GA7884@gmail.com>
On Sun, May 15, 2016 at 7:07 PM, Vasily Titskiy <qehgt0@gmail.com> wrote:
> Do not save states of submodules as stash should ignore it.
Can you explain why this is a good idea? (It is not obvious to me either way.)
Do we need a test/documentation updates for this?
Show 26 quoted lines
>
> Signed-off-by: Vasily Titskiy <qehgt0@gmail.com>
> ---
> git-stash.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-stash.sh b/git-stash.sh
> index c7c65e2..b500c44 100755
> --- a/git-stash.sh
> +++ b/git-stash.sh
> @@ -116,7 +116,7 @@ create_stash () {
> git read-tree --index-output="$TMPindex" -m $i_tree &&
> GIT_INDEX_FILE="$TMPindex" &&
> export GIT_INDEX_FILE &&
> - git diff --name-only -z HEAD -- >"$TMP-stagenames" &&
> + git diff --name-only --ignore-submodules -z HEAD -- >"$TMP-stagenames" &&
> git update-index -z --add --remove --stdin <"$TMP-stagenames" &&
> git write-tree &&
> rm -f "$TMPindex"
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html