From: Johannes Sixt <j6t@kdbg.org>
To: Maksim Odnoletkov <odnoletkov@mail.ru>
Cc: gitster@pobox.com, git@vger.kernel.org, keithbsmiley@gmail.com
Subject: Re: [PATCH] Make stashing nothing exit 1
Date: Thu, 23 May 2019 08:14:03 +0200 [thread overview]
Message-ID: <30d1e067-4184-30e8-bfd2-6ba8da0fc1f5@kdbg.org> (raw)
In-Reply-To: <20190522235705.68452-1-odnoletkov@mail.ru>
Am 23.05.19 um 01:57 schrieb Maksim Odnoletkov:
> The problem with current behaviour is it makes it hard to use stash in
> scripts. A natural stash use case is: wrap some operation requiring a
> clean working tree with a stash push-pop pair. But that doesn't work
> properly when working tree is already clean - push silently does nothing
> and following pop becomes unbalanced. You have to keep that in mind and
> work around with something like:
>
> if ! git diff-index --exit-code --quiet HEAD
> then
> git stash push
> trap 'git stash pop' EXIT
> fi
>
> With this change this can be simplified to:
>
> git stash push && trap 'git stash pop' EXIT
In a script, shouldn't you better use 'create' + 'store' instead of 'push'?
-- Hannes
next prev parent reply other threads:[~2019-05-23 6:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-22 23:12 [PATCH] Make stashing nothing exit 1 Keith Smiley
2019-03-23 7:54 ` Ævar Arnfjörð Bjarmason
2019-03-24 3:37 ` Eric Sunshine
2019-03-25 15:29 ` Johannes Schindelin
2020-04-12 13:08 ` Maxim Mazurok
2019-03-24 12:42 ` Junio C Hamano
2019-05-22 23:57 ` Maksim Odnoletkov
2019-05-23 0:23 ` Ævar Arnfjörð Bjarmason
2019-05-23 6:14 ` Johannes Sixt [this message]
2019-05-23 9:49 ` Maksim Odnoletkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=30d1e067-4184-30e8-bfd2-6ba8da0fc1f5@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=keithbsmiley@gmail.com \
--cc=odnoletkov@mail.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).