From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Keith Smiley" <keithbsmiley@gmail.com>,
"Git List" <git@vger.kernel.org>
Subject: Re: [PATCH] Make stashing nothing exit 1
Date: Mon, 25 Mar 2019 16:29:42 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1903251625250.41@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <CAPig+cT99t1y8kMdGLF_GU0cvaVm=GKMRJ+xRcgS80rRgdQZDQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2465 bytes --]
Hi Eric,
On Sat, 23 Mar 2019, Eric Sunshine wrote:
> On Sat, Mar 23, 2019 at 3:54 AM Ævar Arnfjörð Bjarmason
> <avarab@gmail.com> wrote:
> > On Sat, Mar 23 2019, Keith Smiley wrote:
> > > In the case there are no files to stash, but the user asked to stash, we
> > > should exit 1 since the stashing failed.
> > > ---
> > > diff --git a/git-stash.sh b/git-stash.sh
> > > @@ -318,7 +318,7 @@ push_stash () {
> > > if no_changes "$@"
> > > then
> > > say "$(gettext "No local changes to save")"
> > > - exit 0
> > > + exit 1
> > > fi
> >
> > * Shouldn't we do this consistently across all the other sub-commands?
> > Trying some of them seems 'push' may be the odd one out, but maybe
> > I've missed some (and this would/should be covered by
> > tests). I.e. some single test that does a bunch of ops with no
> > entries / nothing to stash and asserts exit codes.
>
> A bigger question is why is this change desirable?
Indeed. When I run `git stash`, my intention is to make sure that I can
get back whatever edits I had made, but right now, I want a clean
worktree.
So for me, `git stash` does *the exact right thing*.
I could see, however, that other users might think that it is more like a
"uh oh, I have modifications that I do not want to commit right now!
Please, Git, put all my local changes into a stash", and when there are
not even any changes to stash, they want the command to fail.
However, I think that this is not only a change in behavior, but probably
a minor use case compared to what I feel *my* use case is ;-)
As such, the new behavior should be hidden behind an option (say,
`--fail-if-clean`).
> What is the justification for turning this into an error and possibly
> breaking existing automation scripts? Arguing that this case should be
> an "error" is difficult considering that there are many other commands
> (inside and outside of Git) which exit with 0 when they have nothing to
> do. I can't find the message in the archive right now, but I recall a
> few months ago Junio shooting down an analogous change to some other
> command, so the justification needs to be a strong one.
Indeed, the commit message should make a case for the change. Otherwise,
it will be less convincing...
Ciao,
Johannes
>
> Also, your Signed-off-by: is missing. See
> Documentation/SubmittingPatches. Thanks.
>
next prev parent reply other threads:[~2019-03-25 15:30 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 [this message]
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
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=nycvar.QRO.7.76.6.1903251625250.41@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=keithbsmiley@gmail.com \
--cc=sunshine@sunshineco.com \
/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).