Re: [PATCH v3 21/23] try_remove_empty_parents(): don't accommodate consecutive slashes

2016-12-31 Thread Jeff King
On Sat, Dec 31, 2016 at 06:30:01PM -0800, Junio C Hamano wrote: > Michael Haggerty writes: > > > "refname" has already been checked by check_refname_format(), so it > > cannot have consecutive slashes. > > In the endgame state, this has two callers. Both use what came in > the transaction->upd

Test failures when Git is built with libpcre and grep is built without it

2016-12-31 Thread A. Wilcox
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Hello! I'm attempting to package Git for our new Linux distribution and I have run in to a failure on our PowerPC builder while running the test suite. The PowerPC builder runs a tiny version of grep(1) that was not built with PCRE. As such, grep

Re: [PATCH v3 11/23] log_ref_setup(): separate code for create vs non-create

2016-12-31 Thread Junio C Hamano
Michael Haggerty writes: > + if (errno == ENOENT || errno == EISDIR) { > + /* > + * The logfile doesn't already exist, > + * but that is not an error; it only > +

Re: Rebasing multiple branches at once

2016-12-31 Thread Junio C Hamano
Mike Hommey writes: > So I now have: > > A---G > \---B---C---D---E > \---F > > If I do the dumb thing, which is to do `git rebase master E` and `git > rebase master F`, I end up with: > > A---G---B'---C'---D'---E' > \---B"---C"---D"---F' > What people seem to do is to teach the b

Re: [PATCH v3 00/23] Delete directories left empty after ref deletion

2016-12-31 Thread Junio C Hamano
Jeff King writes: > On Sat, Dec 31, 2016 at 04:12:40AM +0100, Michael Haggerty wrote: > >> This is a re-roll of an old patch series. v1 [1] got some feedback, >> which I think was all addressed in v2 [2]. But it seems that v2 fell >> on the floor, and I didn't bother following up because it was i

Re: [PATCH v3 21/23] try_remove_empty_parents(): don't accommodate consecutive slashes

2016-12-31 Thread Junio C Hamano
Michael Haggerty writes: > "refname" has already been checked by check_refname_format(), so it > cannot have consecutive slashes. In the endgame state, this has two callers. Both use what came in the transaction->updates[] array. Presumably "has already been checked by check_refname_format()"

Re: [PATCH v3 10/23] log_ref_write(): inline function

2016-12-31 Thread Junio C Hamano
Michael Haggerty writes: > This function doesn't do anything beyond call files_log_ref_write(), so s/call/&ing/; I think. > replace it with the latter at its call sites. > > Signed-off-by: Michael Haggerty > --- > refs/files-backend.c | 24 ++-- > 1 file changed, 10 insert

Re: [PATCH v3 05/23] raceproof_create_file(): new function

2016-12-31 Thread Junio C Hamano
Michael Haggerty writes: >> But presumably you mean that we delete "foo/bar/baz/xyzzy", etc, up to >> "foo/bar/baz", provided they are all empty directories. I think your >> comment is probably OK and I was just being thick, but maybe stating it >> like: >> >> ...removes the directory if it is

Re: [PATCHv2] unpack-trees: move checkout state into check_updates

2016-12-31 Thread Junio C Hamano
Stefan Beller writes: > The checkout state was introduced via 16da134b1f9 > (read-trees: refactor the unpack_trees() part, 2006-07-30). An attempt to > refactor the checkout state was done in b56aa5b268e (unpack-trees: pass > checkout state explicitly to check_updates(), 2016-09-13), but we can >

Re: Counter-intuitive result from diff -C --stat

2016-12-31 Thread Junio C Hamano
Mike Hommey writes: > Hi, > > So I was checking out differences between two branches, accounting for > file moves with -C, and was surprised by the number of insertions and > deletions that it indicated, because it was telling me I had removed > more than I added, which I really don't think is tr

Re: [PATCH] pathspec: give better message for submodule related pathspec error

2016-12-31 Thread Junio C Hamano
Stefan Beller writes: > Every once in a while someone complains to the mailing list to have > run into this weird assertion[1]. > > The usual response from the mailing list is link to old discussions[2], > and acknowledging the problem stating it is known. > > For now just improve the user visibl

Re: [PATCH] contrib: remove gitview

2016-12-31 Thread Junio C Hamano
Jeff King writes: > On Wed, Dec 28, 2016 at 09:28:37AM -0800, Stefan Beller wrote: > ... >> 2 files changed, 1362 deletions(-) >> delete mode 100755 contrib/gitview/gitview >> delete mode 100644 contrib/gitview/gitview.txt > > Thanks for assembling the patch. This seems reasonable to me, thoug

Rebasing multiple branches at once

2016-12-31 Thread Mike Hommey
Hi, I've had this kind of things to do more than once, and had to do it a lot today, so I figured it would be worth discussing whether git-rebase should be enhanced to support this, or if this should go in a separate tool or whatever. So here is what I'm trying to do in a not-too painful way: I'

Counter-intuitive result from diff -C --stat

2016-12-31 Thread Mike Hommey
Hi, So I was checking out differences between two branches, accounting for file moves with -C, and was surprised by the number of insertions and deletions that it indicated, because it was telling me I had removed more than I added, which I really don't think is true. I took a closer look, and wh

Re: [PATCH v3 13/23] log_ref_setup(): pass the open file descriptor back to the caller

2016-12-31 Thread Jeff King
On Sat, Dec 31, 2016 at 08:58:43AM +0100, Michael Haggerty wrote: > > The return value is always "0" or "-1". It seems like it would be > > simpler to just return the descriptor instead of 0. > > > > I guess that makes it hard to identify the case when we chose not to > > create a descriptor. I w

[PATCH] don't use test_must_fail with grep

2016-12-31 Thread Pranit Bauva
test_must_fail should only be used for testing git commands. To test the failure of other commands use `!`. Reported-by: Stefan Beller Signed-off-by: Pranit Bauva --- t/t3510-cherry-pick-sequence.sh | 6 +++--- t/t5504-fetch-receive-strict.sh | 2 +- t/t5516-fetch-push.sh| 2 +-

Re: [PATCH 2/6] Add ability to follow a remote branch with a dialog

2016-12-31 Thread Paul Mackerras
On Thu, Dec 15, 2016 at 09:58:43PM +1030, Pierre Dumuid wrote: > A suggested name is provided when creating a new "following" branch. > > Signed-off-by: Pierre Dumuid > --- > gitk | 86 > > 1 file changed, 82 insertions(+), 4

Re: [PATCH 1/6] Enable ability to visualise the results of git cherry C1 C2

2016-12-31 Thread Paul Mackerras
On Thu, Dec 15, 2016 at 09:58:42PM +1030, Pierre Dumuid wrote: > It's a bit clunky but it works!! > > Usage: > - mark commit one (e.g. v45) > - Select commit two. > - Switch the gdttype to the option, "git-cherry between marked commit and:" This needs a better description. "Git-cherry between

Re: [PATCH 3/6] Add a tree view to the local branches, remote branches and tags, where / is treated as a directory seperator.

2016-12-31 Thread Paul Mackerras
On Thu, Dec 15, 2016 at 09:58:44PM +1030, Pierre Dumuid wrote: > Signed-off-by: Pierre Dumuid > --- > gitk | 117 > +++ > 1 file changed, 117 insertions(+) Nice idea in general... a few comments below. Also, please don't put the e

Re: [PATCH v15 15/27] bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C

2016-12-31 Thread Pranit Bauva
Hey Stephan, On Tue, Nov 22, 2016 at 3:05 AM, Stephan Beyer wrote: > Hi Pranit, > > in this mail I review the "second part" of your patch: the transition of > bisect_next and bisect_auto_next to C. > > On 10/14/2016 04:14 PM, Pranit Bauva wrote: >> diff --git a/builtin/bisect--helper.c b/builtin/

Re: [PATCH v15 15/27] bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C

2016-12-31 Thread Pranit Bauva
Hey Stephan, Extremely sorry I just forgot to reply to this email before. I was preparing from the next iteration when I saw this. On Mon, Nov 21, 2016 at 1:31 AM, Stephan Beyer wrote: > Hi Pranit, > > this one is hard to review because you do two or three commits in one here. > I think the firs

Re: [PATCH v3 14/23] log_ref_write_1(): don't depend on logfile argument

2016-12-31 Thread Michael Haggerty
On 12/31/2016 07:35 AM, Jeff King wrote: > On Sat, Dec 31, 2016 at 04:12:54AM +0100, Michael Haggerty wrote: > >> It's unnecessary to pass a strbuf holding the reflog path up and down >> the call stack now that it is hardly needed by the callers. Remove the >> places where log_ref_write_1() uses i