git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Rast <trast@student.ethz.ch>
To: Daniel Trstenjak <Daniel.Trstenjak@science-computing.de>
Cc: Junio C Hamano <gitster@pobox.com>,
	git@vger.kernel.org, spearce@spearce.org
Subject: Re: [PATCH] Showing stash state in bash prompt
Date: Thu, 14 May 2009 20:24:21 +0200	[thread overview]
Message-ID: <200905142025.02592.trast@student.ethz.ch> (raw)
In-Reply-To: <7v4ovo4xyt.fsf@alter.siamese.dyndns.org>

[-- Attachment #1: Type: text/plain, Size: 1385 bytes --]

Junio C Hamano wrote:
> Daniel Trstenjak <Daniel.Trstenjak@science-computing.de> writes:
> 
> > Showing stash state in bash prompt.
[...]
> 	Subject: [PATCH] completion: show presense of stashed changes
> 
> 	Users often forget that there are stashed changes that want to be
> 	unstashed.  Add a '$' in the prompt string to remind them.

I'd hate to see this go in without any sort of configurability, since
I would have to patch it out again for my own builds.

The way git-stash is currently documented teaches a stash/apply
workflow, in which pop is not used at all.  For example, in
git-stash.txt itself, the description of 'apply' has all the meat
while 'pop' just refers to 'apply'.  In user-manual.txt, there is an
example that teaches stash/apply.

This may historically be because 'git stash pop' was added later on:

  bd56ff5 (git-stash: add new 'pop' subcommand, 2008-02-22)
  f2c66ed (Add git-stash script, 2007-06-30)

But IMHO it would not be a good idea to teach people stash/pop anyway:
'stash drop' is irreversible, because the stash is itself implemented
through the reflog and thus not guarded by one.

And unfortunately, for people who use stash/apply instead of stash/pop
(including me :-), the proposed indicator merely shows if they have
ever used stash in the current repository.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

  reply	other threads:[~2009-05-14 18:26 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-13  9:44 [PATCH] Showing stash state in bash prompt Daniel Trstenjak
2009-05-13 10:53 ` Sverre Rabbelier
2009-05-13 11:25   ` Daniel Trstenjak
2009-05-13 19:14     ` Junio C Hamano
2009-05-14 18:24       ` Thomas Rast [this message]
2009-05-15  0:57         ` Miles Bader
2009-05-15  2:11           ` Jeff King
2009-05-15  6:39             ` John Tapsell
2009-05-15  7:01               ` Brian Gernhardt
2009-05-15  7:12                 ` Miles Bader
2009-05-28  9:40             ` [RFC PATCH] Documentation: teach stash/pop workflow instead of stash/apply Thomas Rast
2009-05-29  0:59               ` Sitaram Chamarty
2009-05-29  5:37               ` Junio C Hamano

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200905142025.02592.trast@student.ethz.ch \
    --to=trast@student.ethz.ch \
    --cc=Daniel.Trstenjak@science-computing.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=spearce@spearce.org \
    /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.
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 NNTP newsgroup(s).