From: Jeff King <peff-AdEPDUrAXsQ@public.gmane.org>
To: Eli Barzilay <eli-oSK4jVRJLyZg9hUCZPvPmw@public.gmane.org>
Cc: Yann Hodique
<yann.hodique-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Andreas Schwab <schwab-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>,
Junio C Hamano <gitster-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org>,
git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
magit-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org
Subject: Re: [git] Re: Bug in git-stash(.sh) ?
Date: Fri, 4 May 2012 01:21:07 -0400 [thread overview]
Message-ID: <20120504052106.GA15970@sigill.intra.peff.net> (raw)
In-Reply-To: <20386.53745.200846.115335-a5nvgYPMCZcx/1z6v04GWfZ8FUJU4vz8@public.gmane.org>
On Thu, May 03, 2012 at 02:44:01PM -0400, Eli Barzilay wrote:
> > Once that is fixed, then we can consider whether something more should
> > happen for stash (though I am inclined to say that is enough; it is a
> > feature that you can do "git stash list --date=relative" to see the
> > stash timestamps).
>
> Since the general problem is bigger, how about just the quick patch of
> adding --date=default in the list_stash function as a stopgap? That
> seems to be close enough to how it should work anyway.
It is bigger in scope, but the fix is still pretty small. I was trying
to trick^W gently prod you into making a patch, but that does not seem
to have worked. :) So here is a series that fixes it, and we don't have
to worry about a stopgap.
[1/4]: t1411: add more selector index/date tests
[2/4]: log: respect date_mode_explicit --format:%gd
[3/4]: reflog-walk: clean up "flag" field of commit_reflog struct
[4/4]: reflog-walk: always make HEAD@{0} show indexed selectors
The first two fix and test the bug I mentioned, and as a result solve
the stash problem. The second two fix and test the bug that Junio
mentioned. This doesn't affect stash, but it's the right thing for "git
log" to do.
> > > * Some new %gi uses the index number: stash@{1}, and %gI produces
> > > refs/stash@{1}, unrelated to any date setting
> > > * git-stash.sh uses %gi so the output has the numbers
> > > * Some new option for "stash list" for the format string, so it's
> > > possible to show the dates if you want to with something like
> > > git stash list --format:"%gi: %gs (%gd)"
> >
> > I don't have a huge problem with that. But what issue is it really
> > solving? Are people using "git stash list --date=iso" and then
> > getting confused by the output? Or is it simply a matter of
> > mistakenly applying the config when it should not be? The latter
> > needs fixed in either case.
>
> It's basically an attempt to have a %gi that is disconnected from date
> options (config or flags), which solves the config problem in a
> trivial way (no date options are used)...
I don't have a problem at all with %gi; I think it would be a good
addition. I just think that stash shouldn't use, as the "--date" thing
is a feature that there is no reason to deny to stash users (it just
needs to be less buggy :) ).
-Peff
next prev parent reply other threads:[~2012-05-04 5:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-27 22:57 Bug in git-stash(.sh) ? Eli Barzilay
2012-04-27 23:02 ` Junio C Hamano
2012-04-28 0:16 ` Eli Barzilay
[not found] ` <CALO-gut4csy5wef4iGPGD5jVPc1f0iFBfS3MUWrOwc2yczdviw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
[not found] ` <m2pqasb8mr.fsf-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
[not found] ` <87wr4za9mr.fsf-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-04-28 23:59 ` Eli Barzilay
2012-04-29 22:01 ` Jeff King
[not found] ` <20120429220132.GB4491-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-04-29 22:26 ` Eli Barzilay
2012-05-01 13:42 ` Jeff King
[not found] ` <20120501134254.GA11900-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-05-03 18:44 ` [git] " Eli Barzilay
[not found] ` <20386.53745.200846.115335-a5nvgYPMCZcx/1z6v04GWfZ8FUJU4vz8@public.gmane.org>
2012-05-04 5:21 ` Jeff King [this message]
[not found] ` <20120504052106.GA15970-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-05-04 5:23 ` [PATCH 1/4] t1411: add more selector index/date tests Jeff King
2012-05-04 5:25 ` [PATCH 2/4] log: respect date_mode_explicit with --format:%gd Jeff King
2012-05-04 5:27 ` [PATCH 4/4] reflog-walk: always make HEAD@{0} show indexed selectors Jeff King
[not found] ` <20120504052725.GD16107-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-05-04 17:02 ` Junio C Hamano
[not found] ` <7v7gwrc212.fsf-s2KvWo2KEQL18tm6hw+yZpy9Z0UEorGK@public.gmane.org>
2012-05-07 21:37 ` Jeff King
[not found] ` <20120507213752.GA19911-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-05-10 15:37 ` Jeff King
[not found] ` <20120510153754.GA23941-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-05-10 16:39 ` Junio C Hamano
[not found] ` <7vd36cng6n.fsf-s2KvWo2KEQL18tm6hw+yZpy9Z0UEorGK@public.gmane.org>
2012-05-10 17:19 ` OT: gmane address mangling selectors Jeff King
[not found] ` <20120510171912.GA29972-bBVMEuqLR+SYVEpFpFwlB0AkDMvbqDRI@public.gmane.org>
2012-05-10 17:35 ` Eli Barzilay
2012-05-04 18:57 ` [git] Re: Bug in git-stash(.sh) ? Eli Barzilay
[not found] ` <20388.9885.608325.489624-a5nvgYPMCZcx/1z6v04GWfZ8FUJU4vz8@public.gmane.org>
2012-05-04 22:36 ` Eli Barzilay
2012-05-04 5:26 ` [PATCH 3/4] reflog-walk: clean up "flag" field of commit_reflog struct Jeff King
2012-04-29 22:07 ` Bug in git-stash(.sh) ? Junio C Hamano
[not found] ` <7vlilexkcq.fsf-s2KvWo2KEQL18tm6hw+yZpy9Z0UEorGK@public.gmane.org>
2012-04-29 22:37 ` Eli Barzilay
2012-05-01 15:02 ` Jeff King
2012-04-28 7:47 ` Andreas Schwab
2012-04-28 20:23 ` Yann Hodique
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=20120504052106.GA15970@sigill.intra.peff.net \
--to=peff-adepduraxsq@public.gmane.org \
--cc=eli-oSK4jVRJLyZg9hUCZPvPmw@public.gmane.org \
--cc=git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=gitster-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org \
--cc=magit-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
--cc=schwab-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org \
--cc=yann.hodique-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.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).