Re: [PATCH v1] dir: create function count_slashes

2017-06-11 Thread Stefan Beller
On Thu, Jun 8, 2017 at 11:08 AM, Prathamesh Chavan wrote: > Similar functions exist in apply.c and builtin/show-branch.c for > counting the number of slashes in a string. Also in the later > patches, we introduce a third caller for the same. Hence, we unify > it now by cleaning

Re: [BUG?] gitlink without .gitmodules no longer fails recursive clone

2017-06-11 Thread Stefan Beller
On Fri, Jun 9, 2017 at 7:10 PM, Junio C Hamano wrote: > Jeff King writes: > >> In an ideal world the user do: >> >> git submodule add git://host/repo.git path >> >> which adds the gitlink and the .gitmodules entry. But it doesn't seem >> unreasonable for

Re: [PATCH v2 00/32] repository object

2017-06-11 Thread Stefan Beller
On Fri, Jun 9, 2017 at 11:07 PM, Jeff King wrote: > On Fri, Jun 09, 2017 at 05:40:34PM -0700, Jonathan Tan wrote: > >> Before I get into the details, I have some questions: >> >> 1. I am concerned that "struct repository" will end up growing without >> bounds as we store more and

Re: [PATCH] send-email: Add tocmd option to suppress-cc

2017-06-11 Thread Viresh Kumar
On 18-05-17, 17:05, Viresh Kumar wrote: > This adds tocmd option to suppress-cc command which already supports > cccmd and others. > > Signed-off-by: Viresh Kumar > --- > Documentation/git-send-email.txt | 1 + > git-send-email.perl | 8 > 2 files

[BUG] add_again() off-by-one error in custom format

2017-06-11 Thread Michael Giuffrida
In a custom pretty format, using the '+' or ' ' combinators to prefix a non-empty expansion with whitespace will erroneously truncate subsequent expansions of the same type. Normally '%+X' inserts a newline before , IFF the expansion of X is non-empty: $ git log -n 1

Re: [PATCH v4 5/5] stash: implement builtin stash

2017-06-11 Thread Thomas Gummerer
On 06/07, Joel Teichroeb wrote: > Implement all git stash functionality as a builtin command > > Signed-off-by: Joel Teichroeb > --- Thanks for working on this. A few comments from me below. Mainly on stash push, as that's what I'm most familiar with, and all I had time

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: [PATCH v4 0/5] Implement git stash as a builtin command

2017-06-11 Thread Joel Teichroeb
I haven't seen any response. Would it be possible for anyone to review? Thanks, Joel On 6/7/2017 5:55 PM, Joel Teichroeb wrote: I've rewritten git stash as a builtin c command. All tests pass, and I've added two new tests. Test coverage is around 95% with the only things missing coverage being

Re: [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself

2017-06-11 Thread René Scharfe
Am 07.06.2017 um 10:17 schrieb Jeff King: On Sat, Jun 03, 2017 at 12:40:34PM +0200, René Scharfe wrote: Duplicates strbuf_expand to a certain extent, but not too badly, I think. Leaves the door open for letting strftime handle the local case. I guess you'd plan to do that like this in the

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

[PATCH v2] t3200: add test for single parameter passed to -m option

2017-06-11 Thread Sahil Dua
Add a test for the case when only one parameter is passed to '-m' (move/rename) option. For example - if 'git branch -m bbb' is run, it should rename the currently checked out branch to bbb. There was no test for this particular case with only one parameter for -m option. However, there's one