Re: git blame [was: Reducing CPU load on git server]

2016-08-30 Thread Jeff King
On Tue, Aug 30, 2016 at 12:46:20PM +0200, Jakub Narębski wrote: > W dniu 29.08.2016 o 23:31, Jeff King pisze: > > > Blame-tree is a GitHub-specific command (it feeds the main repository > > view page), and is a known CPU hog. There's more clever caching for that > > coming down the pipe, but

Re: [PATCH v1] pack-protocol: fix maximum pkt-line size

2016-08-30 Thread Stefan Beller
On Mon, Aug 29, 2016 at 10:55 AM, wrote: > From: Lars Schneider > > According to LARGE_PACKET_MAX in pkt-line.h the maximal length of a > pkt-line packet is 65520 bytes. The pkt-line header takes 4 bytes and > therefore the pkt-line data

Re: What's cooking in git.git (Aug 2016, #08; Wed, 24)

2016-08-30 Thread Stefan Beller
> > * sb/submodule-clone-rr (2016-08-17) 8 commits > - clone: recursive and reference option triggers submodule alternates > - clone: implement optional references > - clone: clarify option_reference as required > - clone: factor out checking for an alternate path > - submodule--helper

[PATCH 3/3] diff-highlight: avoid highlighting combined diffs

2016-08-30 Thread Jeff King
The algorithm in diff-highlight only understands how to look at two sides of a diff; it cannot correctly handle combined diffs with multiple preimages. Often highlighting does not trigger at all for these diffs because the line counts do not match up. E.g., if we see: - ours -theirs

Re: [PATCHv5 8/8] clone: recursive and reference option triggers submodule alternates

2016-08-30 Thread Stefan Beller
On Wed, Aug 24, 2016 at 4:37 PM, Jacob Keller wrote: > Yes that seems reasonable. > > Thanks, > Jake I reviewed all your comments and you seem to be ok with including this series as it is queued currently? Thanks, Stefan

[PATCH 1/3] diff-highlight: ignore test cruft

2016-08-30 Thread Jeff King
These are the same as in the normal t/.gitignore, with the exception of ".prove", as our Makefile does not support it. Signed-off-by: Jeff King --- contrib/diff-highlight/t/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 contrib/diff-highlight/t/.gitignore

[PATCH 2/3] diff-highlight: add multi-byte tests

2016-08-30 Thread Jeff King
Now that we have a test suite for diff highlight, we can show off the improvements from 8d00662 (diff-highlight: do not split multibyte characters, 2015-04-03). While we're at it, we can also add another case that _doesn't_ work: combining code points are treated as their own unit, which means

Re: [PATCH v4 0/3] diff-highlight: add support for --graph option

2016-08-30 Thread Jeff King
On Tue, Aug 30, 2016 at 07:07:11AM -0700, Brian Henderson wrote: > On Mon, Aug 29, 2016 at 02:37:46PM -0700, Junio C Hamano wrote: > > Brian Henderson writes: > > > > > How does this look? > > > > > > Drawing the graph helped me a lot in figuring out what I was > > >

Re: [PATCH v6 12/13] convert: add filter..process option

2016-08-30 Thread Torsten Bögershausen
On Tue, Aug 30, 2016 at 03:23:10PM -0700, Junio C Hamano wrote: > Lars Schneider writes: > > > On 30 Aug 2016, at 20:59, Junio C Hamano wrote: > >> > >>> "abort" could be ambiguous because it could be read as "abort only > >>> this file".

[PATCH 2/2] color_parse_mem: initialize "struct color" temporary

2016-08-30 Thread Jeff King
Compiling color.c with gcc 6.2.0 using -O3 produces some -Wmaybe-uninitialized false positives: color.c: In function ‘color_parse_mem’: color.c:189:10: warning: ‘bg.blue’ may be used uninitialized in this function [-Wmaybe-uninitialized] out += xsnprintf(out, len,

[PATCH 1/2] error_errno: use constant return similar to error()

2016-08-30 Thread Jeff King
Commit e208f9c (make error()'s constant return value more visible, 2012-12-15) introduced some macro trickery to make the constant return from error() more visible to callers, which in turn can help gcc produce better warnings (and possibly even better code). Later, fd1d672 (usage.c: add

[PATCH 0/2] squelch some "gcc -O3 -Wmaybe-uninitialized" warnings

2016-08-30 Thread Jeff King
I happened to be compiling git with -O3 today, and noticed we generate some warnings about uninitialized variables (I actually compile with -Wall, but the only false positives I saw were these). Here are patches to squelch them. [1/2]: error_errno: use constant return similar to error()

Re: git submodules implementation question

2016-08-30 Thread Uma Srinivasan
On Tue, Aug 30, 2016 at 10:53 AM, Junio C Hamano wrote: > Uma Srinivasan writes: > >> I think the following fix is still needed to is_submodule_modified(): >> >> strbuf_addf(, "%s/.git", path); >> git_dir = read_gitfile(buf.buf); >>

Re: [PATCH 14/22] sequencer: prepare for rebase -i's commit functionality

2016-08-30 Thread Junio C Hamano
Junio C Hamano writes: > Two functions with the same name reading from the same format, even > when they expect to produce the same result in different internal > format, without even being aware of each other is a bad enough > "regression" in maintainability of the code. One

Re: [PATCH v6 12/13] convert: add filter..process option

2016-08-30 Thread Junio C Hamano
Lars Schneider writes: > On 30 Aug 2016, at 20:59, Junio C Hamano wrote: >> >>> "abort" could be ambiguous because it could be read as "abort only >>> this file". "abort-all" would work, though. Would you prefer to see >>> "error" replaced by

Re: [PATCH 06/22] sequencer: release memory that was allocated when reading options

2016-08-30 Thread Junio C Hamano
Johannes Sixt writes: > Am 30.08.2016 um 19:52 schrieb Johannes Schindelin: >> Right, but that is exactly what I wanted to avoid, because it is rather >> inelegant to strdup() strings just so that we do not have to record what >> to free() and what not to free(). > > Please,

Re: [PATCH 06/22] sequencer: release memory that was allocated when reading options

2016-08-30 Thread Jakub Narębski
W dniu 30.08.2016 o 19:52, Johannes Schindelin pisze: > Hi Kuba, > > On Tue, 30 Aug 2016, Jakub Narębski wrote: > >> W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze: >> >>> The sequencer reads options from disk and stores them in its struct >>> for use during sequencer's operations. >>> >>>

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

2016-08-30 Thread Ævar Arnfjörð Bjarmason
On Tue, Aug 30, 2016 at 10:51 PM, Jeff King wrote: > On Tue, Aug 30, 2016 at 10:48:19PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> > -failed: $(patsubst trash,,$(patsubst directory.%,%.sh,$(wildcard trash\ >> > directory.t[0-9]*))) >> > +failed: >> > + @failed=$$(cd

Apply Today

2016-08-30 Thread Loan Firm
Dear Sir/Madam, We give out urgent loan for business and personal purpose with 3% intrest rate applicable to all amount. Kindly get back to us via email: loa...@foxmail.com for further details on how to apply.

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

2016-08-30 Thread Jeff King
On Tue, Aug 30, 2016 at 10:48:19PM +0200, Ævar Arnfjörð Bjarmason wrote: > > -failed: $(patsubst trash,,$(patsubst directory.%,%.sh,$(wildcard trash\ > > directory.t[0-9]*))) > > +failed: > > + @failed=$$(cd '$(TEST_RESULTS_DIRECTORY_SQ)' && \ > > + grep -l '^failed [1-9]'

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

2016-08-30 Thread Ævar Arnfjörð Bjarmason
On Mon, Aug 29, 2016 at 3:46 PM, Johannes Schindelin wrote: > While developing patch series, it is a good practice to run the test > suite from time to time, just to make sure that obvious bugs are caught > early. With complex patch series, it is common to run `make

Re: [PATCH 06/22] sequencer: release memory that was allocated when reading options

2016-08-30 Thread Johannes Sixt
Am 30.08.2016 um 19:52 schrieb Johannes Schindelin: Right, but that is exactly what I wanted to avoid, because it is rather inelegant to strdup() strings just so that we do not have to record what to free() and what not to free(). Please, excuse, but when I have to choose what is more

FW: GIT Support Partners

2016-08-30 Thread Scott Sobstad
Hi- I'm wondering if anyone could suggest a GIT support partner(s)?  The community is great, but I'm looking for a more personalized GIT support experience.  Thanks! -Scott Sobstad Scott Sobstad Director-Application Support,TSG JDA Software 20700 Swenson Dr, Waukesha, WI 53186 / United

[PATCH] git-send-email: Add ability to cc: any "trailers" from commit message

2016-08-30 Thread Joe Perches
Many commits have various forms of trailers similar to "Acked-by: Name " and "Reported-by: Name " Add the ability to cc these trailers when using git send-email. This can be suppressed with --suppress-cc=trailers. Signed-off-by: Joe Perches ---

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

2016-08-30 Thread Pranit Bauva
Hey Junio, On Wed, Aug 31, 2016 at 1:03 AM, Junio C Hamano wrote: > Pranit Bauva writes: > >> This is a very tricky one. I have purposely not included this after a >> lot of testing. I have hand tested with the original git and with this >> branch. The

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

2016-08-30 Thread Junio C Hamano
Pranit Bauva writes: > This is a very tricky one. I have purposely not included this after a > lot of testing. I have hand tested with the original git and with this > branch. The reason why anyone wouldn't be able to catch this is > because its not covered in the test

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

2016-08-30 Thread Junio C Hamano
Jeff King writes: > Hmm, interesting. Your approach seems reasonable, but I have to wonder > if writing the pid in the first place is sane. > > I started to write up my reasoning in this email, but realized it was > rapidly becoming the content of a commit message. So here is that

Re: git am and duplicate signatures

2016-08-30 Thread Junio C Hamano
Joe Perches writes: > On Tue, 2016-08-30 at 11:17 -0700, Junio C Hamano wrote: >> Joe Perches writes: >> >> > >> > On Tue, 2016-08-30 at 10:41 -0700, Joe Perches wrote: >> > > >> > > Maybe something like traces or chains. >> > Or "taggers" or "tagged-bys"

Re: [PATCH v6 12/13] convert: add filter..process option

2016-08-30 Thread Junio C Hamano
Lars Schneider writes: >> This part of the document is well-written to help filter-writers. > > Thanks! Don't thank me; thank yourself and reviewers of the previous rounds. > The filter can exit right after the "error-all". If the filter does > not exit then Git will

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

2016-08-30 Thread Pranit Bauva
Hey Junio, On Tue, Aug 30, 2016 at 11:55 PM, Pranit Bauva wrote: > >>> @@ -729,7 +735,7 @@ static struct commit **get_bad_and_good_commits(int >>> *rev_nr) >>> return rev; >>> } >>> >>> -static void handle_bad_merge_base(void) >>> +static int

Re: [PATCH 06/22] sequencer: release memory that was allocated when reading options

2016-08-30 Thread Junio C Hamano
Johannes Schindelin writes: > @@ -811,13 +813,18 @@ static int populate_opts_cb(const char *key, const char > *value, void *data) > opts->allow_ff = git_config_bool_or_int(key, value, > _flag); > else if (!strcmp(key, "options.mainline")) >

Re: [PATCH 05/22] sequencer: allow the sequencer to take custody of malloc()ed data

2016-08-30 Thread Junio C Hamano
Jakub Narębski writes: > In my personal opinion 'set_me_free_after_use' is not the best name, > but I unfortunately do not have a better proposal. Maybe 'entrust_ptr', > or 'entrusted_data' / 'entrusted_ptr' / 'entrusted'? Is this to accumulate to-be-freed pointers? I think

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

2016-08-30 Thread Pranit Bauva
Hey Junio, Sorry for a late replay. On Fri, Aug 26, 2016 at 2:00 AM, Junio C Hamano wrote: > Pranit Bauva writes: > >> A lot of parts of bisect.c uses exit() and these signals are then >> trapped in the `bisect_start` function. Since the shell script

Re: git am and duplicate signatures

2016-08-30 Thread Joe Perches
On Tue, 2016-08-30 at 11:17 -0700, Junio C Hamano wrote: > Joe Perches writes: > > > > > On Tue, 2016-08-30 at 10:41 -0700, Joe Perches wrote: > > > > > > Maybe something like traces or chains. > > Or "taggers" or "tagged-bys" > I am afraid that you are way too late; the ship

Re: Notation for current branch?

2016-08-30 Thread Junio C Hamano
ryenus writes: > For now the best use case I can think of is with git-reflog, e.g., > the meaning of `git reflog HEAD` and `git reflog feature-branch` > are quite different, even if I'm currently on the feature-branch, > especially when I want to track the rebase histories (if

Re: [PATCH 14/22] sequencer: prepare for rebase -i's commit functionality

2016-08-30 Thread Johannes Schindelin
Hi Junio, On Tue, 30 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> > +static char **read_author_script(void) > >> > +{ > >> > +struct strbuf script = STRBUF_INIT; > >> > +int i, count = 0; > >> > +char *p, *p2, **env; >

Re: git am and duplicate signatures

2016-08-30 Thread Junio C Hamano
Joe Perches writes: > On Tue, 2016-08-30 at 10:41 -0700, Joe Perches wrote: >> Maybe something like traces or chains. > > Or "taggers" or "tagged-bys" I am afraid that you are way too late; the ship has already sailed a few years ago, if not earlier, I think.

Re: Notation for current branch?

2016-08-30 Thread ryenus
On 30 August 2016 at 03:49, Junio C Hamano wrote: > Jacob Keller writes: > >>> What's wrong with simply using 'HEAD' for scripting? >> >> When you want to display the current branch to the user, e.g. when >> scripting a shell prompt or similar use > >

Re: [PATCH 2/6] pull: make code more similar to the shell script again

2016-08-30 Thread Johannes Schindelin
Hi Junio, On Mon, 29 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > +static int require_clean_work_tree(const char *action, const char *hint, > > + int gently) > > { > > struct lock_file *lock_file = xcalloc(1,

Re: git submodules implementation question

2016-08-30 Thread Junio C Hamano
Uma Srinivasan writes: > I think the following fix is still needed to is_submodule_modified(): > > strbuf_addf(, "%s/.git", path); > git_dir = read_gitfile(buf.buf); > if (!git_dir) { > git_dir = buf.buf; > ==> if

Re: [PATCH 06/22] sequencer: release memory that was allocated when reading options

2016-08-30 Thread Johannes Schindelin
Hi Kuba, On Tue, 30 Aug 2016, Jakub Narębski wrote: > W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze: > > > The sequencer reads options from disk and stores them in its struct > > for use during sequencer's operations. > > > > With this patch, the memory is released afterwards, plugging

Re: [PATCH 07/22] sequencer: future-proof read_populate_todo()

2016-08-30 Thread Johannes Schindelin
Hi Kuba, On Tue, 30 Aug 2016, Jakub Narębski wrote: > W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze: > > > Over the next commits, we will work on improving the sequencer to the > > point where it can process the edit script of an interactive rebase. To > > that end, we will need to teach

Re: [PATCH 14/22] sequencer: prepare for rebase -i's commit functionality

2016-08-30 Thread Junio C Hamano
Johannes Schindelin writes: >> > +static char **read_author_script(void) >> > +{ >> > + struct strbuf script = STRBUF_INIT; >> > + int i, count = 0; >> > + char *p, *p2, **env; >> > + size_t env_size; >> > + >> > + if (strbuf_read_file(,

Re: git am and duplicate signatures

2016-08-30 Thread Joe Perches
(adding lkml) On Tue, 2016-08-30 at 09:54 -0700, Junio C Hamano wrote: > Joe Perches writes: > > git-am -s will avoid duplicating the last signature > > in a patch. > > > > But given a developer creates a patch, send it around for > > acks/other signoffs, collects signatures

Re: git am and duplicate signatures

2016-08-30 Thread Junio C Hamano
Joe Perches writes: > git-am -s will avoid duplicating the last signature > in a patch. > > But given a developer creates a patch, send it around for > acks/other signoffs, collects signatures and then does > a git am -s on a different branch, this sort of sign-off > chain is

Re: [PATCH 4/6] require_clean_work_tree: ensure that the index was read

2016-08-30 Thread Junio C Hamano
Johannes Schindelin writes: >> > Scatch that. That would not work in a freshly created repository >> > before doing any "git add". An empty index is a normal state,... > > Alas, that does not work, either. If no .git/index exists, read_index() > will not set the

Re: [PATCH v6 13/13] read-cache: make sure file handles are not inherited by child processes

2016-08-30 Thread Torsten Bögershausen
> > diff --git a/sha1_file.c b/sha1_file.c > index d5e1121..759991e 100644 > --- a/sha1_file.c > +++ b/sha1_file.c > @@ -1485,7 +1485,7 @@ int check_sha1_signature(const unsigned char *sha1, > void *map, > > int git_open_noatime(const char *name) Hm, should the function then be renamed into

Re: [PATCH 4/6] require_clean_work_tree: ensure that the index was read

2016-08-30 Thread Johannes Schindelin
Hi Junio, On Tue, 30 Aug 2016, Johannes Schindelin wrote: > On Mon, 29 Aug 2016, Junio C Hamano wrote: > > > Junio C Hamano writes: > > > > > I am not sure if it should be left as the responsibility of the > > > caller (i.e. check the_index.initialized to bark at a caller

Re: how to showing a merge graph?

2016-08-30 Thread Michael J Gruber
Duy Nguyen venit, vidit, dixit 30.08.2016 15:10: > I want to see a "git log --oneline --graph" with all non-merge commits > removed, but history is rewritten so that the merge commits represent > the entire topics and are shown to have all the parents of the base > commits. e.g. if the full graph

[PATCH v4 3/3] diff-highlight: add support for --graph output

2016-08-30 Thread Brian Henderson
Signed-off-by: Brian Henderson --- contrib/diff-highlight/diff-highlight| 19 +-- contrib/diff-highlight/t/t9400-diff-highlight.sh | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/contrib/diff-highlight/diff-highlight

[PATCH v4 0/3] diff-highlight: add support for --graph option

2016-08-30 Thread Brian Henderson
On Mon, Aug 29, 2016 at 02:37:46PM -0700, Junio C Hamano wrote: > Brian Henderson writes: > > > How does this look? > > > > Drawing the graph helped me a lot in figuring out what I was > > actually testing. thanks! > > Yeah, I also am pleased to see the picture of what is

[PATCH v4 2/3] diff-highlight: add failing test for handling --graph output

2016-08-30 Thread Brian Henderson
Signed-off-by: Brian Henderson --- contrib/diff-highlight/t/t9400-diff-highlight.sh | 60 1 file changed, 60 insertions(+) diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh b/contrib/diff-highlight/t/t9400-diff-highlight.sh index

[PATCH v4 1/3] diff-highlight: add some tests

2016-08-30 Thread Brian Henderson
Signed-off-by: Brian Henderson --- contrib/diff-highlight/Makefile | 5 + contrib/diff-highlight/t/Makefile| 22 +++ contrib/diff-highlight/t/t9400-diff-highlight.sh | 163 +++ 3 files changed, 190 insertions(+)

how to showing a merge graph?

2016-08-30 Thread Duy Nguyen
I want to see a "git log --oneline --graph" with all non-merge commits removed, but history is rewritten so that the merge commits represent the entire topics and are shown to have all the parents of the base commits. e.g. if the full graph is * 8118403 Merge commit 'bbb2437' |\ | * bbb2437 3p

Re: [PATCH v6 13/13] read-cache: make sure file handles are not inherited by child processes

2016-08-30 Thread Lars Schneider
> On 29 Aug 2016, at 21:45, Junio C Hamano wrote: > > Lars Schneider writes: > >> I see. Thanks for the explanation. > > I expect the updated log message to explain the issue correctly > then. Sure! >>> The parent is >>> very likely to have

Re: [PATCH v6 10/13] convert: generate large test files only once

2016-08-30 Thread Lars Schneider
> On 29 Aug 2016, at 19:52, Junio C Hamano wrote: > > Lars Schneider writes: > >>> On 25 Aug 2016, at 21:17, Stefan Beller wrote: >>> On Thu, Aug 25, 2016 at 4:07 AM, wrote: From: Lars

Bug Report: "git submodule deinit" fails right after a clone

2016-08-30 Thread Thomas Bétous
Hello, I found a curious bug in git version 2.9.0.windows.1 (run on Windows 7 via git bash). If I clone a repository containing submodules and run a "git submodule deinit" on any of the submodules of this repository without executing another git command, this command fails. For instance:

Re: [PATCH v6 10/13] convert: generate large test files only once

2016-08-30 Thread Lars Schneider
> On 29 Aug 2016, at 19:46, Junio C Hamano wrote: > > larsxschnei...@gmail.com writes: > >> diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh >> index 7b45136..34c8eb9 100755 >> --- a/t/t0021-conversion.sh >> +++ b/t/t0021-conversion.sh >> @@ -4,6 +4,15 @@

Re: [PATCH 05/22] sequencer: allow the sequencer to take custody of malloc()ed data

2016-08-30 Thread Jakub Narębski
Hello Johannes, W dniu 30.08.2016 o 09:29, Johannes Schindelin pisze: > On Mon, 29 Aug 2016, Jakub Narębski wrote: >> W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze: >>> +void *sequencer_entrust(struct replay_opts *opts, void >>> *set_me_free_after_use) >>> +{ >>> +

Re: [PATCH 4/6] require_clean_work_tree: ensure that the index was read

2016-08-30 Thread Johannes Schindelin
Hi Junio, On Mon, 29 Aug 2016, Junio C Hamano wrote: > Junio C Hamano writes: > > > I am not sure if it should be left as the responsibility of the > > caller (i.e. check the_index.initialized to bark at a caller that > > forgets to read from an index) ... > > Scatch that.

Re: [PATCH 4/6] require_clean_work_tree: ensure that the index was read

2016-08-30 Thread Johannes Schindelin
Hi Junio, On Mon, 29 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > The function would otherwise pretend to work fine, but totally ignore > > the working directory. > > s/^T/Unless the caller has already read the index, t/; Changed. (I also

git blame [was: Reducing CPU load on git server]

2016-08-30 Thread Jakub Narębski
W dniu 29.08.2016 o 23:31, Jeff King pisze: > Blame-tree is a GitHub-specific command (it feeds the main repository > view page), and is a known CPU hog. There's more clever caching for that > coming down the pipe, but it's not shipped yet. I wonder if having support for 'git blame ' in Git core

Re: [PATCH v2 12/14] sequencer: lib'ify save_head()

2016-08-30 Thread Johannes Schindelin
Hi Junio, On Mon, 29 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > strbuf_addf(, "%s\n", head); > > if (write_in_full(fd, buf.buf, buf.len) < 0) > > - die_errno(_("Could not write to %s"), git_path_head_file()); > > +

Re: [PATCH v2 10/14] sequencer: lib'ify read_populate_opts()

2016-08-30 Thread Johannes Schindelin
Hi Junio, On Mon, 29 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Instead of dying there, let the caller high up in the callchain notice > > the error and handle it (by dying, still). > > > > The only caller of read_populate_opts(),

Re: [PATCH v2 08/14] sequencer: lib'ify read_and_refresh_cache()

2016-08-30 Thread Johannes Schindelin
Hi Junio, On Mon, 29 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Instead of dying there, let the caller high up in the callchain > > notice the error and handle it (by dying, still). > > > > There are two call sites of

Re: [PATCH v13 00/14] libify apply and use lib in am, part 3

2016-08-30 Thread Christian Couder
On Mon, Aug 29, 2016 at 9:04 PM, Junio C Hamano wrote: > Christian Couder writes: > >> Highlevel view of the patches in the series >> ~~~ >> >> This is "part 3" of the full patch series. I am resending only

[PATCH RFC] subtree: support subtree -P /path/to/file split

2016-08-30 Thread Ivan Shapovalov
Hello, I'm missing `git subtree split` functionality for the case when prefix is a single file. Looking at git-subtree, pretty few changes are needed to handle this. The attached patch works for me in the common case (no rejoins). As such, I'm looking for comments :) Signed-off-by: Ivan

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

2016-08-30 Thread Jeff King
On Mon, Aug 29, 2016 at 03:46:05PM +0200, Johannes Schindelin wrote: > Note that we need to be careful to inspect only the *newest* entries in > test-results/: this directory contains files of the form > t--.counts and is only removed wholesale when running the > *entire* test suite, not when

Re: [PATCH v4 0/3] diff-highlight: add support for --graph option

2016-08-30 Thread Jeff King
On Mon, Aug 29, 2016 at 10:33:44AM -0700, Brian Henderson wrote: > How does this look? > > Drawing the graph helped me a lot in figuring out what I was actually > testing. thanks! > > Brian Henderson (3): > diff-highlight: add some tests. > diff-highlight: add failing test for handling

Re: [PATCH v2 03/14] sequencer: lib'ify write_message()

2016-08-30 Thread Johannes Schindelin
Hi Junio, On Mon, 29 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Instead of dying there, let the caller high up in the callchain > > notice the error and handle it (by dying, still). > > > > The only caller of write_message(),

Re: [PATCH 05/22] sequencer: allow the sequencer to take custody of malloc()ed data

2016-08-30 Thread Johannes Schindelin
Hi Hannes, On Tue, 30 Aug 2016, Johannes Sixt wrote: > Am 29.08.2016 um 23:59 schrieb Jakub Narębski: > > W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze: > > > -#define REPLAY_OPTS_INIT { -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, > > > NULL, NULL, 0, 0, NULL } > > > +#define

Re: [PATCH v14 09/27] bisect--helper: `bisect_write` shell function in C

2016-08-30 Thread Pranit Bauva
Hey Junio, On Sun, Aug 28, 2016 at 2:52 AM, Junio C Hamano wrote: > > Pranit Bauva writes: > > >>> +struct bisect_terms { > >>> + struct strbuf term_good; > >>> + struct strbuf term_bad; > >>> +}; > >> > >> I think "struct strbuf" is overrated.

Re: [PATCH 02/22] sequencer: use memoized sequencer directory path

2016-08-30 Thread Johannes Schindelin
Hi Kuba, On Mon, 29 Aug 2016, Jakub Narębski wrote: > W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze: > > Signed-off-by: Johannes Schindelin > > --- > > builtin/commit.c | 2 +- > > sequencer.c | 11 ++- > > sequencer.h | 5 + > > 3

Re: git submodules implementation question

2016-08-30 Thread Jacob Keller
On Mon, Aug 29, 2016 at 11:09 PM, Jacob Keller wrote: > On Mon, Aug 29, 2016 at 5:12 PM, Uma Srinivasan > wrote: >> This is great! Thanks Jake. If you happen to have the patch ID it >> would be helpful. >> >> Uma >> > >

Re: git submodules implementation question

2016-08-30 Thread Jacob Keller
On Mon, Aug 29, 2016 at 5:12 PM, Uma Srinivasan wrote: > This is great! Thanks Jake. If you happen to have the patch ID it > would be helpful. > > Uma > http://public-inbox.org/git/1472236108.28343.5.ca...@intel.com/