Re: Feature Request: Show status of the stash in git status command

2017-06-13 Thread Junio C Hamano
liam Beguin writes: >> The fact a stash entry is a merge commit of two synthetic commits is an >> implementation detail. It can be very useful at times for power users, >> but regular Git users need not be concerned with this. >> >> Another fact worth reiterating that

Re: Feature Request: Show status of the stash in git status command

2017-06-13 Thread liam Beguin
Hi, On 13/06/17 02:42 AM, Konstantin Khomoutov wrote: > On Mon, Jun 12, 2017 at 11:42:44PM -0400, liam Beguin wrote: > > [...] >>> Conceptually, the contents of the stash are *not* commits, even >>> though the implementation happens to use a commit to represent each >>> stash entry. Perhaps

Re: Feature Request: Show status of the stash in git status command

2017-06-13 Thread Konstantin Khomoutov
On Mon, Jun 12, 2017 at 11:42:44PM -0400, liam Beguin wrote: [...] >> Conceptually, the contents of the stash are *not* commits, even >> though the implementation happens to use a commit to represent each >> stash entry. Perhaps "has %d entry/entries" is an improvement, but >> a quick scanning

Re: Feature Request: Show status of the stash in git status command

2017-06-12 Thread liam Beguin
Hi, Thanks for the feedback. I'll be sending a patch with the updates shortly! On 12/06/17 11:35 AM, Junio C Hamano wrote: > liam Beguin writes: > >> +static int stash_count_refs(struct object_id *ooid, struct object_id *noid, >> +const char

Re: Feature Request: Show status of the stash in git status command

2017-06-12 Thread Junio C Hamano
liam Beguin writes: > +static int stash_count_refs(struct object_id *ooid, struct object_id *noid, > + const char *email, timestamp_t timestamp, int tz, > + const char *message, void *cb_data) > +{ > + int *c = cb_data; >

RE: Feature Request: Show status of the stash in git status command

2017-06-11 Thread Randall S. Becker
On June 11, 2017 2:19 PM Igor Djordjevic wrote: >On 11/06/2017 19:57, Randall S. Becker wrote: >> Random thought: what if a stash id could be used in the same way as >> any other ref, so diff stash[0] stash[1] would be possible - although >> I can see this being problematic for a merge or

Re: Feature Request: Show status of the stash in git status command

2017-06-11 Thread Igor Djordjevic
Hi Randall, On 11/06/2017 19:57, Randall S. Becker wrote: > Random thought: what if a stash id could be used in the same way as > any other ref, so diff stash[0] stash[1] would be possible - > although I can see this being problematic for a merge or rebase. Not sure if I`m misunderstanding

RE: Feature Request: Show status of the stash in git status command

2017-06-11 Thread Randall S. Becker
On June 11, 2017 1:07 PM liam Beguin wrote: >There is one thing I've noticed though. When using 'git stash pop', it shows >the the number of stashes before dropping the commit and I'm not quite ?>sure >how to address this. On 10/06/17 06:22 AM, Jeff King wrote: > On Sat, Jun 10, 2017 at

Re: Feature Request: Show status of the stash in git status command

2017-06-11 Thread liam Beguin
Hi, As it looks like something easy enough for a beginner, I though I could give it a try. Here is what it looks like. If it's good enough, I'll add a few lines to document 'status.showStash' and send a patch. There is one thing I've noticed though. When using 'git stash pop', it shows the the

Re: Feature Request: Show status of the stash in git status command

2017-06-10 Thread Jeff King
On Sat, Jun 10, 2017 at 06:12:28AM -0400, Samuel Lijin wrote: > On Sat, Jun 10, 2017 at 4:25 AM, Jeff King wrote: > > On Wed, Jun 07, 2017 at 06:46:18PM -0400, Houston Fortney wrote: > > > >> I sometimes forget about something that I stashed. It would be nice if > >> the git

Re: Feature Request: Show status of the stash in git status command

2017-06-10 Thread Samuel Lijin
On Sat, Jun 10, 2017 at 4:25 AM, Jeff King wrote: > On Wed, Jun 07, 2017 at 06:46:18PM -0400, Houston Fortney wrote: > >> I sometimes forget about something that I stashed. It would be nice if >> the git status command would just say "There are x entries in the >> stash." It can

Re: Feature Request: Show status of the stash in git status command

2017-06-10 Thread Jeff King
On Wed, Jun 07, 2017 at 06:46:18PM -0400, Houston Fortney wrote: > I sometimes forget about something that I stashed. It would be nice if > the git status command would just say "There are x entries in the > stash." It can say nothing if there is nothing stashed so it is > usually not adding