Re: [PATCH] format-patch: use raw format for notes

2017-09-10 Thread Sam Bobroff
On Wed, Sep 06, 2017 at 12:34:48PM +0900, Junio C Hamano wrote: > Sam Bobroff writes: > > > If "--notes=..." is used with "git format-patch", the notes are > > prefixed with the ref's local name and indented, which looks odd and > > exposes the path of the ref. > > > >

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-10 Thread Junio C Hamano
Kevin Willford writes: > I agree with this when you are not dealing with a sparse-checkout. > When using a sparse-checkout I expect git not to touch things > outside of what I have specified in my sparse-checkout file. If it > does, it should let me know or put my working

Re: [PATCH v2] sub-process: print the cmd when a capability is unsupported

2017-09-10 Thread Junio C Hamano
Junio C Hamano writes: > I still think we would want to turn warning() to die(), but it > probably is better to do so in a separate follow-up patch. That > will give us a good place to record the reason why the current "just > call a warning() and pretend as if nothing bad

What's cooking in git.git (Sep 2017, #02; Mon, 11)

2017-09-10 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. We are at week #6 of this cycle.

Re: [PATCH v1 1/2] travis-ci: move Travis CI code into dedicated scripts

2017-09-10 Thread Junio C Hamano
larsxschnei...@gmail.com writes: > From: Lars Schneider > > Most of the Travis CI commands are in the '.travis.yml'. The yml format > does not support functions and therefore code duplication is necessary > to run commands across all builds. > > To fix this, add a

Re: [PATCH 06/34] clone: release strbuf after use in remove_junk()

2017-09-10 Thread Jeff King
On Sun, Sep 10, 2017 at 12:37:06PM +0200, René Scharfe wrote: > > And in fact, being called from a signal handler means we should > > generally avoid touching malloc or free (which could be holding locks). > > That would mean preferring a leak to strbuf_release(). Of course that is > > the tip of

Re: Unexpected pass for t6120-describe.sh on cygwin

2017-09-10 Thread Ramsay Jones
On 10/09/17 13:27, Michael J Gruber wrote: > Ramsay Jones venit, vidit, dixit 09.09.2017 15:13: [snip] >> So, it looks like all ULIMIT_STACK_SIZE tests need to be disabled >> on cygwin. I also wonder about the ULIMIT_FILE_DESCRIPTORS tests, >> but haven't looked into it. >> >> Given that

[PATCH v1 1/2] travis-ci: move Travis CI code into dedicated scripts

2017-09-10 Thread larsxschneider
From: Lars Schneider Most of the Travis CI commands are in the '.travis.yml'. The yml format does not support functions and therefore code duplication is necessary to run commands across all builds. To fix this, add a library for common CI functions. Move all Travis CI

[PATCH v1 0/2] travis-ci: dedicated scripts + skip duplicated builds

2017-09-10 Thread larsxschneider
From: Lars Schneider Hi, the patches were previously discussed here: https://public-inbox.org/git/xmqqinifrrzh@gitster.mtv.corp.google.com/#t Over there Junio posted the original patch to skip a build on Travis CI. The patch became 2/2 in this series. Cheers,

[PATCH v1 2/2] travis-ci: skip a branch build if equal tag is present

2017-09-10 Thread larsxschneider
From: Lars Schneider If we push a branch and a tag pointing to the HEAD of this branch, then Travis CI would run the build twice. This wastes resources and slows the testing. Add a function to detect this situation and skip the build the branch if appropriate. Invoke

Re: [PATCH v5 00/40] Add initial experimental external ODB support

2017-09-10 Thread Lars Schneider
> On 03 Aug 2017, at 10:18, Christian Couder wrote: > > ... > > * The "helpers" (registered commands) > > Each helper manages access to one external ODB. > > There are 2 different modes for helper: > > - Helpers configured using "odb..scriptCommand" are >

Re: Unexpected pass for t6120-describe.sh on cygwin

2017-09-10 Thread Michael J Gruber
Ramsay Jones venit, vidit, dixit 09.09.2017 15:13: > Hi Adam, > > I ran the test-suite on the 'pu' branch last night (simply because > that was what I had built at the time!), which resulted in a PASS, > but t6120 was showing a 'TODO passed' for #52. > > This is a test introduced by Michael's

Re: [PATCH v5 12/40] t0400: add 'put_raw_obj' instruction to odb-helper script

2017-09-10 Thread Lars Schneider
> On 03 Aug 2017, at 10:18, Christian Couder wrote: > > To properly test passing objects from Git to an external odb > we need an odb-helper script that supports a 'put' > capability/instruction. > > For now we will support only sending raw blobs, so the > supported

Re: [PATCH v5 11/40] odb-helper: add odb_helper_init() to send 'init' instruction

2017-09-10 Thread Lars Schneider
> On 03 Aug 2017, at 10:18, Christian Couder wrote: > > Let's add an odb_helper_init() function to send an 'init' > instruction to the helpers. This 'init' instruction is > especially useful to get the capabilities that are supported > by the helpers. > > So while

Re: [PATCH 06/34] clone: release strbuf after use in remove_junk()

2017-09-10 Thread René Scharfe
Am 10.09.2017 um 09:30 schrieb Jeff King: > On Sun, Sep 10, 2017 at 08:27:40AM +0200, René Scharfe wrote: > if (junk_work_tree) { strbuf_addstr(, junk_work_tree); remove_dir_recursively(, 0); - strbuf_reset();

Re: [PATCH] shortlog: skip format/parse roundtrip for internal traversal

2017-09-10 Thread Jeff King
On Sun, Sep 10, 2017 at 10:44:46AM +0200, René Scharfe wrote: > Am 08.09.2017 um 11:21 schrieb Jeff King: > > Note that the non-stdin path no longer looks at the "mailmap" entry of > > "struct shortlog" (instead we use the one cached inside pretty.c). But > > we still waste time loading it. I'm

Re: [PATCH] shortlog: skip format/parse roundtrip for internal traversal

2017-09-10 Thread René Scharfe
Am 08.09.2017 um 11:21 schrieb Jeff King: > Note that the non-stdin path no longer looks at the "mailmap" entry of > "struct shortlog" (instead we use the one cached inside pretty.c). But > we still waste time loading it. I'm not sure if it's worth addressing > that. It's only once per program

Re: [PATCH 34/34] wt-status: release strbuf after use in wt_longstatus_print_tracking()

2017-09-10 Thread Junio C Hamano
René Scharfe writes: > Am 06.09.2017 um 21:51 schrieb Junio C Hamano: >> Rene Scharfe writes: >> >>> If format_tracking_info() returns 0 only if it didn't touch its strbuf >>> parameter, so it's OK to exit early in that case. Clean up sb in the >>> other case. >>

Re: [PATCH 00/12] Clean up notes-related code around `load_subtree()`

2017-09-10 Thread Jeff King
On Sun, Sep 10, 2017 at 06:45:08AM +0200, Michael Haggerty wrote: > > So nothing to see here, but since I spent 20 minutes scratching my head > > (and I know others look at Coverity output and may scratch their heads > > too), I thought it was worth writing up. And also if I'm wrong, it would > >

Re: "git shortlog -sn --follow -- " counts all commits to entire repo

2017-09-10 Thread Junio C Hamano
Jeff King writes: > On Sat, Sep 09, 2017 at 02:37:20AM +0900, Junio C Hamano wrote: > >> Using log-tree traversal machinery instead of just get_revision() >> would probably mean we would slow it down quite a bit unless we are >> careful, but at the same time, things like "git

Re: [PATCH 06/34] clone: release strbuf after use in remove_junk()

2017-09-10 Thread Jeff King
On Sun, Sep 10, 2017 at 08:27:40AM +0200, René Scharfe wrote: > >>if (junk_work_tree) { > >>strbuf_addstr(, junk_work_tree); > >>remove_dir_recursively(, 0); > >> - strbuf_reset(); > >>} > >> + strbuf_release(); > >> } > > > > The code definitely needs

Re: [PATCH 06/34] clone: release strbuf after use in remove_junk()

2017-09-10 Thread René Scharfe
Am 06.09.2017 um 21:51 schrieb Junio C Hamano: > Rene Scharfe writes: > >> Signed-off-by: Rene Scharfe >> --- >> builtin/clone.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/builtin/clone.c b/builtin/clone.c >> index

Re: [PATCH 34/34] wt-status: release strbuf after use in wt_longstatus_print_tracking()

2017-09-10 Thread René Scharfe
Am 06.09.2017 um 21:51 schrieb Junio C Hamano: > Rene Scharfe writes: > >> If format_tracking_info() returns 0 only if it didn't touch its strbuf >> parameter, so it's OK to exit early in that case. Clean up sb in the >> other case. > > These two "if"s confuse me; perhaps the