Re: diff.renames not working?

2019-09-13 Thread Jeff King
On Fri, Sep 13, 2019 at 03:24:06PM -0500, Robert Dailey wrote: > Now my goal is to diff `ZPayClient.hpp` and see the changes to the > moved-out portion of code as it relates to the original state of that > code in `JniPaymentManager.hpp`. To do this, I tried this command: > > ``` > $ git diff mas

Re: [RFC PATCH 10/10] pack-objects: improve partial packfile reuse

2019-09-13 Thread Junio C Hamano
Jeff King writes: > On Fri, Sep 13, 2019 at 03:29:00PM -0700, Junio C Hamano wrote: > >> This comment has nothing to do with the change, but the way the >> patch is presented is quite hard to follow, in that the preimage or >> the common context lines do not help understand what the new code is >

Re: [RFC PATCH 10/10] pack-objects: improve partial packfile reuse

2019-09-13 Thread Jeff King
On Fri, Sep 13, 2019 at 03:29:00PM -0700, Junio C Hamano wrote: > This comment has nothing to do with the change, but the way the > patch is presented is quite hard to follow, in that the preimage or > the common context lines do not help understand what the new code is > doing at all ;-) > > I'l

Re: [PATCH v2] gitk: Make web links clickable

2019-09-13 Thread Paul Mackerras
On Fri, Aug 30, 2019 at 12:02:07AM +0530, Pratyush Yadav wrote: > On 29/08/19 11:27AM, Paul Mackerras wrote: > > This makes gitk look for http or https URLs in the commit description > > and make the URLs clickable. Clicking on them will invoke an external > > web browser with the URL. > > > > Th

[RFC PATCH v3 3/3] trace2: write overload message to sentinel files

2019-09-13 Thread Josh Steadmon
Add a new "overload" event type for trace2 event destinations. Write this event into the sentinel file created by the trace2.maxFiles feature. Bump up the event format version since we've added a new event type. Writing this message into the sentinel file is useful for tracking how often the overl

[RFC PATCH v3 0/3] trace2: don't overload target directories

2019-09-13 Thread Josh Steadmon
This is still RFC, as I still haven't done performance testing yet. I'm mainly looking for feedback right now on patch 3/3, which extends the tr2_dst API with an optional function to write a custom message into the overload sentinel file. Changes since V2: * Added a new patch (3/3) that allows the

[RFC PATCH v3 1/3] docs: mention trace2 target-dir mode in git-config

2019-09-13 Thread Josh Steadmon
Move the description of trace2's target-directory behavior into the shared trace2-target-values file so that it is included in both the git-config and api-trace2 docs. Leave the SID discussion only in api-trace2 since it's a technical detail. Signed-off-by: Josh Steadmon --- Documentation/techni

[RFC PATCH v3 2/3] trace2: don't overload target directories

2019-09-13 Thread Josh Steadmon
trace2 can write files into a target directory. With heavy usage, this directory can fill up with files, causing difficulty for trace-processing systems. This patch adds a config option (trace2.maxFiles) to set a maximum number of files that trace2 will write to a target directory. The following b

Re: [PATCH] git-submodule.txt: fix AsciiDoc formatting error

2019-09-13 Thread Junio C Hamano
Denton Liu writes: >> > -set-branch ((-d|--default)|(-b|--branch )) [--] :: >> >> I say "almost", as it gives a wrong impression that you can give >> "-b" without "" X-<. >> >> Now what does the updated text say to us? >> >> > +set-branch (-d|--default)|(-b|--branch ) [--] :: >> >> I think th

Re: diff.renames not working?

2019-09-13 Thread Bryan Turner
On Fri, Sep 13, 2019 at 1:24 PM Robert Dailey wrote: > > 2. `diff -M` doesn't actually work either. It should, though. In fact, > I expected it to work as `--follow` does. But it doesn't. Just a small point of clarification: Is -M really what you mean here? Given you indicated you have "diff.rena

Re: [RFC PATCH 10/10] pack-objects: improve partial packfile reuse

2019-09-13 Thread Junio C Hamano
Christian Couder writes: > +/* > + * Record the offsets needed in our reused packfile chunks due to > + * "gaps" where we omitted some objects. > + */ The meaning of 'start' and 'offset' is unclear from the first reading. Is it "starting offset" and "for how many bytes the region lasts"? If so

Re: git-am fails for emails with UTF8 characters in email header

2019-09-13 Thread brian m. carlson
On 2019-09-13 at 20:07:24, Siddharth Chandrasekaran wrote: > Hi Junio, > > My email server (zoho) puts leading UTF-8 non-breaking spaces ("\xC2\xA0") > when folding long mail headers. Due to this, git-am is failing as it expects > only '\t' or ' ' characters. > > RFC2822 [1] on page 7 states: >

Re: [PATCH v4] git-gui: add hotkey to toggle "Amend Last Commit"

2019-09-13 Thread Pratyush Yadav
+Cc Junio so you know what development model I'm using, and comment with your thoughts (if you want to). On 13/09/19 11:32PM, Birger Skogeng Pedersen wrote: > On Fri, Sep 13, 2019 at 4:37 PM Pratyush Yadav wrote: > > Hi Birger, > > > > I'm afraid you are working on an older version of this pat

Re: [PATCH] git-submodule.txt: fix AsciiDoc formatting error

2019-09-13 Thread Denton Liu
On Fri, Sep 13, 2019 at 11:03:39AM -0700, Junio C Hamano wrote: > Denton Liu writes: > > > Remove surrounding parentheses so that the "index term" syntax is not > > triggered (and because it looks nicer without them anyway ;) ). > > "Correct" always trumps "nicer", though ;-) > > The $USAGE str

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-13 Thread Marc Branchaud
On 2019-09-13 10:32 a.m., Pratyush Yadav wrote: On 13/09/19 12:24PM, Allan Ford wrote: Dear Git Authors, Not a bug, but a suggestion consideration for “Git Gui” Can a double click on the file name in the “unstaged” area move the item to “staged changes” .. (rather than having to click on the s

Re: [PATCH v2 3/3] Makefile: run coccicheck on more source files

2019-09-13 Thread Denton Liu
On Fri, Sep 13, 2019 at 08:00:14PM +0200, SZEDER Gábor wrote: > On Fri, Sep 13, 2019 at 10:14:01AM -0700, Denton Liu wrote: > > On Fri, Sep 13, 2019 at 01:49:52PM +0200, SZEDER Gábor wrote: > > > On Thu, Sep 12, 2019 at 11:40:36AM -0700, Junio C Hamano wrote: > > > > Denton Liu writes: > > > > >

Re: [RFC PATCH 08/10] pack-objects: introduce pack.allowPackReuse

2019-09-13 Thread Junio C Hamano
Christian Couder writes: > From: Jeff King > > Let's make it possible to configure if we want pack reuse or not. > > Signed-off-by: Jeff King > Signed-off-by: Christian Couder > --- > builtin/pack-objects.c | 8 +++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/builti

Re: [PATCH v4] git-gui: add hotkey to toggle "Amend Last Commit"

2019-09-13 Thread Birger Skogeng Pedersen
On Fri, Sep 13, 2019 at 4:37 PM Pratyush Yadav wrote: > Hi Birger, > > I'm afraid you are working on an older version of this patch. You should > be re-rolling [0], which works well with Bert's "amend check button" > change. > > [0] > https://public-inbox.org/git/b82a00441ff1a6a9cea3fd235c1c33729

[PATCH v4] git-gui: add hotkey to toggle "Amend Last Commit"

2019-09-13 Thread Birger Skogeng Pedersen
Selecting whether to "Amend Last Commit" or not does not have a hotkey. With this patch, the user may toggle between the two options with CTRL/CMD+e. Signed-off-by: Birger Skogeng Pedersen Rebased-by: Bert Wesarg --- git-gui.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/git-g

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-13 Thread Pratyush Yadav
On 13/09/19 10:27PM, Bert Wesarg wrote: > On Fri, Sep 13, 2019 at 4:32 PM Pratyush Yadav wrote: > > > > On 13/09/19 12:24PM, Allan Ford wrote: > > > Dear Git Authors, > > > > > > Not a bug, but a suggestion consideration for “Git Gui” > > > > > > Can a double click on the file name in the “unstage

Re: [PATCH] completion: add missing completions for log, diff, show

2019-09-13 Thread Johannes Schindelin
Hi Max, [your reply did not make it to the Git mailing list because it drops anything with an HTML part] On Thu, 12 Sep 2019, Max Rothman wrote: > Great! What’s the path for getting this merged? Usually it will be picked up into the `pu` branch first, then advance to `next`, and then to `master

Re: Git in Outreachy December 2019?

2019-09-13 Thread Jeff King
On Fri, Sep 13, 2019 at 01:03:17PM -0700, Jonathan Tan wrote: > > Do we have interested mentors for the next round of Outreachy? > > > > The deadline for Git to apply to the program is September 5th. The > > deadline for mentors to have submitted project descriptions is September > > 24th. Intern

Re: [PATCH v4] git-gui: add horizontal scrollbar to commit buffer

2019-09-13 Thread Pratyush Yadav
Thanks for the re-roll. Will queue. On 13/09/19 10:16PM, Bert Wesarg wrote: > While the commit message widget has a configurable fixed width, it > nevertheless allowed to write commit messages which exceeded this limit. > Though there is no visual clue, that there is scrolling going on. Now > ther

Re: [PATCH v3 01/12] t7300: add testcases showing failure to clean specified pathspecs

2019-09-13 Thread Junio C Hamano
Elijah Newren writes: >> Also, you talked about tracked paths in the proposed log message; do >> they not participate in reproducing the issue(s)? > > If there is only one directory which has no tracked files, then the > user can clean up the files -- but confusingly, they have to issue the > sam

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-13 Thread Bert Wesarg
On Fri, Sep 13, 2019 at 4:32 PM Pratyush Yadav wrote: > > On 13/09/19 12:24PM, Allan Ford wrote: > > Dear Git Authors, > > > > Not a bug, but a suggestion consideration for “Git Gui” > > > > Can a double click on the file name in the “unstaged” area move the > > item to “staged changes” .. (rather

Re: [PATCH 1/1] multi-pack-index: add --no-progress Add --no-progress option to git multi-pack-index. The progress feature was added in 144d703 ("multi-pack-index: report progress during 'verify'", 20

2019-09-13 Thread Junio C Hamano
William Baker writes: >> I also see in the code that >> handles opts.batch_size that there is a workaround for this inverted >> code structure to make sure subcommands other than repack does not >> allow --batch-size option specified. > >> we probably would want to correct the use >> of parse_opt

diff.renames not working?

2019-09-13 Thread Robert Dailey
I'm using Git version 2.23. I have the `diff.renames` setting set to `copies`. My code base has a file named `JniPaymentManager.hpp` (and `cpp`) that had too much code in it, so I refactored this file by splitting out a significant portion of the code in it to another file, named `ZPayClient.hpp` (

Re: [PATCH] git-gui: convert new/amend commit radiobutton to checketton

2019-09-13 Thread Bert Wesarg
On Fri, Sep 13, 2019 at 9:49 PM Pratyush Yadav wrote: > > You missed fixing the typo in the subject. s/checketton/checkbutton/. > But no need to send a re-roll for that. I can fix it locally. thanks, I also fixed that locally, but again, it slipped thru in the patch mail. Still don't know why thi

[PATCH v4] git-gui: add horizontal scrollbar to commit buffer

2019-09-13 Thread Bert Wesarg
While the commit message widget has a configurable fixed width, it nevertheless allowed to write commit messages which exceeded this limit. Though there is no visual clue, that there is scrolling going on. Now there is a horizontal scrollbar. There seems to be a bug in at least Tcl/Tk up to versio

Re: [PATCH] git-gui: add horizontal scrollbar to commit buffer

2019-09-13 Thread Bert Wesarg
On Fri, Sep 13, 2019 at 8:53 PM Pratyush Yadav wrote: > > Can you please add a version number when you send re-rolls the next time > around. Something like "[PATCH v2] subject...". Makes it easier for me > to keep track of things when there are multiple re-rolls of multiple > patches. > > You can

git-am fails for emails with UTF8 characters in email header

2019-09-13 Thread Siddharth Chandrasekaran
Hi Junio, My email server (zoho) puts leading UTF-8 non-breaking spaces ("\xC2\xA0") when folding long mail headers. Due to this, git-am is failing as it expects only '\t' or ' ' characters. RFC2822 [1] on page 7 states: > The general rule is that wherever this standard allows for folding white

Re: [PATCH v3 07/12] dir: add commentary explaining match_pathspec_item's return value

2019-09-13 Thread Junio C Hamano
Elijah Newren writes: > The way match_pathspec_item() handles names and pathspecs with trailing > slash characters, in conjunction with special options like > DO_MATCH_DIRECTORY and DO_MATCH_LEADING_PATHSPEC were non-obvious, and > broken until this patch series. Add a table in a comment explain

Re: Git in Outreachy December 2019?

2019-09-13 Thread Jonathan Tan
> Do we have interested mentors for the next round of Outreachy? > > The deadline for Git to apply to the program is September 5th. The > deadline for mentors to have submitted project descriptions is September > 24th. Intern applications would start on October 1st. > > If there are mentors who w

Re: [PATCH] git-gui: convert new/amend commit radiobutton to checketton

2019-09-13 Thread Pratyush Yadav
You missed fixing the typo in the subject. s/checketton/checkbutton/. But no need to send a re-roll for that. I can fix it locally. Other than that, LGTM. Thanks, will queue. On 13/09/19 08:02AM, Bert Wesarg wrote: > Its a bi-state anyway and also saves one line in the menu. > > Signed-off-by:

Re: [PATCH v3 06/12] dir: if our pathspec might match files under a dir, recurse into it

2019-09-13 Thread Junio C Hamano
Elijah Newren writes: > For git clean, if a directory is entirely untracked and the user did not > specify -d (corresponding to DIR_SHOW_IGNORED_TOO), then we usually do > not want to remove that directory and thus do not recurse into it. Makes sense. To clean named paths in such a directory, w

Re: [PATCH v3 01/12] t7300: add testcases showing failure to clean specified pathspecs

2019-09-13 Thread Elijah Newren
On Fri, Sep 13, 2019 at 11:54 AM Junio C Hamano wrote: > > Elijah Newren writes: > > > +test_expect_failure 'git clean handles being told what to clean' ' > > + mkdir -p d1 d2 && > > + touch d1/ut d2/ut && > > + git clean -f */ut && > > + test_path_is_missing d1/ut && > > + te

Re: [PATCH v3 03/12] dir: fix off-by-one error in match_pathspec_item

2019-09-13 Thread Junio C Hamano
Elijah Newren writes: > For a pathspec like 'foo/bar' comparing against a path named "foo/", > namelen will be 4, and match[namelen] will be 'b'. The correct location > of the directory separator is namelen-1. And the reason why name[namelen-1] may not be slash, in which case your new code make

Re: [PATCH v3 01/12] t7300: add testcases showing failure to clean specified pathspecs

2019-09-13 Thread Junio C Hamano
Elijah Newren writes: > +test_expect_failure 'git clean handles being told what to clean' ' > + mkdir -p d1 d2 && > + touch d1/ut d2/ut && > + git clean -f */ut && > + test_path_is_missing d1/ut && > + test_path_is_missing d2/ut > +' Looks like d1 and d2 are new directories a

Re: [PATCH] git-gui: add horizontal scrollbar to commit buffer

2019-09-13 Thread Pratyush Yadav
Can you please add a version number when you send re-rolls the next time around. Something like "[PATCH v2] subject...". Makes it easier for me to keep track of things when there are multiple re-rolls of multiple patches. You can do this by passing "-v2" (or "-v3", "-v4", etc) to git-send-emai

Re: [PATCH 1/1] multi-pack-index: add --no-progress Add --no-progress option to git multi-pack-index. The progress feature was added in 144d703 ("multi-pack-index: report progress during 'verify'", 20

2019-09-13 Thread William Baker
Hi Junio, Thanks for the review! On 9/12/19 1:17 PM, Junio C Hamano wrote: >> +'git multi-pack-index' [--object-dir=] [--[no-]progress] > > I am wondering what the reasoning behind having this new one *after* > the subcommand while the existing one *before* is. Isn't the > --[no-]progress opt

Re: [PATCH] list-objects: don't queue root trees unless revs->tree_objects is set

2019-09-13 Thread Junio C Hamano
Jeff King writes: >> Thanks for spotting it. I wonder if it was broken like this forever >> since the beginning X-<. > > Not quite since the beginning; it comes from 8d2dfc49b1 > (process_{tree,blob}: show objects without buffering, 2009-04-10). I > suspect nobody noticed because the cost for th

Re: [PATCH] git-submodule.txt: fix AsciiDoc formatting error

2019-09-13 Thread Junio C Hamano
Denton Liu writes: > Remove surrounding parentheses so that the "index term" syntax is not > triggered (and because it looks nicer without them anyway ;) ). "Correct" always trumps "nicer", though ;-) The $USAGE string in the script describes the available options to this subcommand like so:

Re: [PATCH v2 3/3] Makefile: run coccicheck on more source files

2019-09-13 Thread SZEDER Gábor
On Fri, Sep 13, 2019 at 10:14:01AM -0700, Denton Liu wrote: > On Fri, Sep 13, 2019 at 01:49:52PM +0200, SZEDER Gábor wrote: > > On Thu, Sep 12, 2019 at 11:40:36AM -0700, Junio C Hamano wrote: > > > Denton Liu writes: > > > > > > > +FIND_C_SOURCES = $(filter %.c,$(shell $(FIND_SOURCE_FILES))) > >

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-13 Thread Pratyush Yadav
On 13/09/19 09:50AM, Birger Skogeng Pedersen wrote: > Hi Marc and Philip, > > > On 12/09/2019 22:34, Marc Branchaud wrote: > > I disagree! Who expects anything to work properly when capslock is on? > > Me :-) > > > On Fri, Sep 13, 2019 at 12:23 AM Philip Oakley wrote: > > I'd tend to agree.

Re: [PATCH v2 3/3] Makefile: run coccicheck on more source files

2019-09-13 Thread Junio C Hamano
SZEDER Gábor writes: >> Using a procedure whose output is fed to xargs has an advantage that >> a platform with very short command line limit can still work with >> many source files, but the way you create and use COCCI_SOURCES in >> this patch would defeat that advantage anyway, > > COCCI_SOURC

Re: [PATCH v2 0/2] Date test code clean-up

2019-09-13 Thread Junio C Hamano
Jeff King writes: > On Wed, Sep 11, 2019 at 09:11:00PM -0700, Stephen P. Smith wrote: > >> Range Diff: >> 1: f4170ad553 ! 1: e2b8322d58 Quit passing 'now' to date code >> [...] > > Thanks, this version addresses all of my concerns from v1 (and overall > looks good). Yup, the result of applying

Re: [PATCH v2 3/3] Makefile: run coccicheck on more source files

2019-09-13 Thread Denton Liu
On Fri, Sep 13, 2019 at 01:49:52PM +0200, SZEDER Gábor wrote: > On Thu, Sep 12, 2019 at 11:40:36AM -0700, Junio C Hamano wrote: > > Denton Liu writes: > > > > > +FIND_C_SOURCES = $(filter %.c,$(shell $(FIND_SOURCE_FILES))) > > > +COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FIND_C_SOURCE

Re: [PATCH 1/2] git-gui: convert new/amend commit radiobutton to checketton

2019-09-13 Thread Pratyush Yadav
On 12/09/19 09:35PM, Bert Wesarg wrote: > On Wed, Sep 11, 2019 at 10:15 PM Pratyush Yadav > wrote: > > > > Typo in the subject. s/checketton/checkbutton/ > > > > On 05/09/19 10:09PM, Bert Wesarg wrote: > > > diff --git a/lib/index.tcl b/lib/index.tcl > > > index b588db1..e07b7a3 100644 > > > ---

Re: [PATCH v2] Documentation: fix build with Asciidoctor 2

2019-09-13 Thread Junio C Hamano
Jeff King writes: > On Fri, Sep 13, 2019 at 01:52:40AM +, brian m. carlson wrote: > >> We also need to teach xmlto how to use the namespaced DocBook XSLT >> stylesheets instead of the non-namespaced ones it usually uses. >> Normally these stylesheets are interchangeable, but the non-namespace

Re: [PATCH v3] git-gui: add hotkey to toggle "Amend Last Commit"

2019-09-13 Thread Pratyush Yadav
Hi Birger, I'm afraid you are working on an older version of this patch. You should be re-rolling [0], which works well with Bert's "amend check button" change. [0] https://public-inbox.org/git/b82a00441ff1a6a9cea3fd235c1c33729ec31b71.1567713659.git.bert.wes...@googlemail.com/ On 12/09/19 08:

Re: Git Gui - enhancement suggestion - Can a double click on the file name in the “unstaged” area move the item to “staged changes”

2019-09-13 Thread Pratyush Yadav
On 13/09/19 12:24PM, Allan Ford wrote: > Dear Git Authors, > > Not a bug, but a suggestion consideration for “Git Gui” > > Can a double click on the file name in the “unstaged” area move the > item to “staged changes” .. (rather than having to click on the small > icon to the left of the file nam

Re: RFC - Git Developer Blog

2019-09-13 Thread pedro rijo
Just a minor question: since we have git-scm, pro-git, and git translations in github, why not keep in the same place, under the same organization? I just find it easier to find than having repos scattered across different git hosting services James Ramsay escreveu no dia sexta, 13/09/2019 à(s) 1

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-13 Thread Marc Branchaud
On 2019-09-13 3:50 a.m., Birger Skogeng Pedersen wrote: Hi Marc and Philip, On 12/09/2019 22:34, Marc Branchaud wrote: I disagree! Who expects anything to work properly when capslock is on? Me :-) Fair enough, though I imagine you have a pretty narrow definition of "anything". :) On

Re: Virtual Git Contributor Summit

2019-09-13 Thread James Ramsay
On 3 Jul 2019, at 9:01, Johannes Schindelin wrote: Team, I kept talking about this idea of a purely online Git Contributor Summit, and it is finally time for action. Thank you for organizing! Yesterday, Christian and I took notes in the doc below which might be useful for others. https:

Re: RFC - Git Developer Blog

2019-09-13 Thread James Ramsay
On 6 Aug 2019, at 16:49, Emily Shaffer wrote: On Tue, Aug 06, 2019 at 09:20:52AM -0400, Jeff King wrote: On Mon, Aug 05, 2019 at 06:49:35PM -0700, Emily Shaffer wrote: Are folks interested in writing and reviewing this kind of content? Any ideas for where we may be able to host (maybe git-sc

Re: [PATCH v2 2/2] upload-pack: disable commit graph more gently for shallow traversal

2019-09-13 Thread Derrick Stolee
On 9/12/2019 10:44 AM, Jeff King wrote: > When the client has asked for certain shallow options like > "deepen-since", we do a custom rev-list walk that pretends to be > shallow. Before doing so, we have to disable the commit-graph, since it > is not compatible with the shallow view of the reposito

[RFC PATCH 00/10] Rewrite packfile reuse code

2019-09-13 Thread Christian Couder
This patch series is rewriting the code that tries to reuse existing packfiles. The code in this patch series was written by GitHub and Peff nicely provided it in the following discussion: https://public-inbox.org/git/3e56b0fd-ebe8-4057-a93a-16ebb09fb...@jramsay.com.au/ This is an RFC patch seri

[RFC PATCH 09/10] builtin/pack-objects: introduce obj_is_packed()

2019-09-13 Thread Christian Couder
From: Jeff King Let's refactor the way we check if an object is packed by introducing obj_is_packed(). This function is now a simple wrapper around packlist_find(), but it will evolve in a following commit. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- builtin/pack-objects.c |

[RFC PATCH 04/10] ewah/bitmap: always allocate 2 more words

2019-09-13 Thread Christian Couder
From: Jeff King In a following patch we will allocate a variable number of words in some bitmaps. When iterating over the words we will need a mark to tell us when to stop iterating. Let's always allocate 2 more words, that will always contain 0, as that mark. Signed-off-by: Jeff King Signed-of

[RFC PATCH 06/10] pack-bitmap: introduce bitmap_walk_contains()

2019-09-13 Thread Christian Couder
From: Jeff King We will use this helper function in a following patch to tell us if an object is packed. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- pack-bitmap.c | 12 pack-bitmap.h | 3 +++ 2 files changed, 15 insertions(+) diff --git a/pack-bitmap.c b/pack-b

[RFC PATCH 07/10] csum-file: introduce hashfile_total()

2019-09-13 Thread Christian Couder
From: Jeff King We will need this helper function in a following patch to give us total number of bytes fed to the hashfile so far. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- csum-file.h | 9 + 1 file changed, 9 insertions(+) diff --git a/csum-file.h b/csum-file.h i

[RFC PATCH 02/10] packfile: expose get_delta_base()

2019-09-13 Thread Christian Couder
From: Jeff King In a following commit get_delta_base() will be used outside packfile.c, so let's make it non static and declare it in packfile.h. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- packfile.c | 10 +- packfile.h | 3 +++ 2 files changed, 8 insertions(+), 5 d

[RFC PATCH 05/10] pack-bitmap: don't rely on bitmap_git->reuse_objects

2019-09-13 Thread Christian Couder
From: Jeff King As we now allocate 2 more words than necessary for each bitmap to serve as marks telling us that we can stop iterating over the words, we don't need to rely on bitmap_git->reuse_objects to stop iterating over the words. Signed-off-by: Jeff King Signed-off-by: Christian Couder -

[RFC PATCH 01/10] builtin/pack-objects: report reused packfile objects

2019-09-13 Thread Christian Couder
From: Jeff King To see when packfile reuse kicks in or not, it is useful to show reused packfile objects statistics in the output of upload-pack. Helped-by: James Ramsay Signed-off-by: Jeff King Signed-off-by: Christian Couder --- builtin/pack-objects.c | 6 -- 1 file changed, 4 insertio

[RFC PATCH 08/10] pack-objects: introduce pack.allowPackReuse

2019-09-13 Thread Christian Couder
From: Jeff King Let's make it possible to configure if we want pack reuse or not. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- builtin/pack-objects.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c inde

[RFC PATCH 10/10] pack-objects: improve partial packfile reuse

2019-09-13 Thread Christian Couder
From: Jeff King Let's store the chunks of the packfile that we reuse in a dynamic array of `struct reused_chunk`, and let's use a reuse_packfile_bitmap to speed up reusing parts of packfiles. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- builtin/pack-objects.c | 227 +++

[RFC PATCH 03/10] ewah/bitmap: introduce bitmap_word_alloc()

2019-09-13 Thread Christian Couder
From: Jeff King In a following patch we will need to allocate a variable number of bitmap words, instead of always 32, so let's add bitmap_word_alloc() for this purpose. Signed-off-by: Jeff King Signed-off-by: Christian Couder --- ewah/bitmap.c | 11 --- ewah/ewok.h | 1 + 2 files

Re: [PATCH 0/7] Fix more AsciiDoc/tor differences

2019-09-13 Thread Martin Ågren
On Fri, 13 Sep 2019 at 06:48, Jeff King wrote: > > On Sat, Sep 07, 2019 at 04:12:46PM +0200, Martin Ågren wrote: > > > This series roughly halves the line count of `./doc-diff --from-asciidoc > > --to-asciidoctor --cut-header-footer HEAD HEAD`. Together with my recent > > (independent) mini-series

[PATCH v3] git-svn: trim leading and trailing whitespaces in author name

2019-09-13 Thread Tobias Klauser
In some cases, the svn author names might contain leading or trailing whitespaces, leading to messages such as: Author: user1 not defined in authors.txt (the trailing newline leads to the line break). The user "user1" is defined in authors.txt though, e.g. user1 = User Fix this by trimm

Re: [PATCH v2 2/3] Makefile: strip leading ./ in $(FIND_SOURCE_FILES)

2019-09-13 Thread SZEDER Gábor
On Thu, Sep 12, 2019 at 10:28:32AM -0700, Denton Liu wrote: > Currently, $(FIND_SOURCE_FILES) has two modes: if `git ls-files` is > present, it will use that to enumerate the files in the repository; else > it will use `$(FIND) .` to enumerate the files in the directory. > > There is a subtle diff

Re: [PATCH v2 3/3] Makefile: run coccicheck on more source files

2019-09-13 Thread SZEDER Gábor
On Thu, Sep 12, 2019 at 11:40:36AM -0700, Junio C Hamano wrote: > Denton Liu writes: > > > +FIND_C_SOURCES = $(filter %.c,$(shell $(FIND_SOURCE_FILES))) > > +COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FIND_C_SOURCES)) > > The former is somewhat misnamed. FIND_SOURCE_FILES is *not* a

bug: report `rebase -i + subtree add --prefix = disaster`

2019-09-13 Thread Luciano Joublanc
Hi, I would like to report what I suspect is a bug in `git rebase -i`. The problem in question is that when a `rebase -i` is run on a repo which has had a subtree added with `git subtree add --prefix=xxx` previously; the later command will be executed without the `--prefix` argument, resulting in

Re: [PATCH 2/2] git-gui: add hotkey to toggle "Amend Last Commit" check button/menu

2019-09-13 Thread Birger Skogeng Pedersen
Hi Marc and Philip, On 12/09/2019 22:34, Marc Branchaud wrote: > I disagree! Who expects anything to work properly when capslock is on? Me :-) On Fri, Sep 13, 2019 at 12:23 AM Philip Oakley wrote: > I'd tend to agree. In other areas the use of shift is often used as the > complement of the u

Re: [PATCH v2] git-svn: trim leading and trailing whitespaces in author name

2019-09-13 Thread Tobias Klauser
Thank you for the review Eric! On 2019-09-12 at 20:20:11 +0200, Eric Sunshine wrote: > On Thu, Sep 12, 2019 at 10:56 AM Tobias Klauser wrote: > > v2: > > - move whitespace trimming below defined'ness check as per Eric Sunshine's > >review comment > > diff --git a/perl/Git/SVN.pm b/perl/Git/