[PATCH 0/2] rebase --root: fix `reword` on a root commit

for inclusion into v2.18.0, still. Johannes Schindelin (1): rebase --root: fix amending root commit messages Todd Zullinger (1): rebase --root: demonstrate a bug while amending root commit messages sequencer.c | 2 +- t/t3404-rebase-interactive.sh | 9 + 2 files

Re: [RFC PATCH 3/3] git-rebase.sh: make git-rebase--interactive the default

Hi Elijah, On Thu, 7 Jun 2018, Elijah Newren wrote: > am-based rebases suffer from an reduced ability to detect directory > renames upstream, which is fundamental to the fact that it throws away > information about the history: in particular, it dispenses with the > original commits involved by

Re: [RFC PATCH 2/3] rebase: Implement --merge via git-rebase--interactive

Hi Elijah, On Thu, 7 Jun 2018, Elijah Newren wrote: > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > index 451252c173..28d1658d7a 100644 > --- a/Documentation/git-rebase.txt > +++ b/Documentation/git-rebase.txt > @@ -275,6 +275,10 @@ branch on top of the branch.

Re: [RFC PATCH 1/3] git-rebase, sequencer: add a --quiet option for the interactive machinery

Hi Elijah, On Thu, 7 Jun 2018, Elijah Newren wrote: > While 'quiet' and 'interactive' may sound like antonyms, the interactive > machinery actually has logic that implements several > interactive_rebase=implied cases (--exec, --keep-empty, --rebase-merges) > which won't pop up an editor.

Re: [RFC PATCH v1] telemetry design overview (part 1)

Hi Hannes, On Sat, 9 Jun 2018, Johannes Sixt wrote: > Am 09.06.2018 um 00:20 schrieb Ævar Arnfjörð Bjarmason: > > > > On Fri, Jun 08 2018, Johannes Sixt wrote: > > > > > Am 08.06.2018 um 18:00 schrieb Thomas Braun: > > > > I for my part would much rather prefer that to be a compile time > > >

Re: [RFC PATCH v1] telemetry design overview (part 1)

Hi Peff, On Sat, 9 Jun 2018, Jeff King wrote: > On Sat, Jun 09, 2018 at 08:31:58AM +0200, Ævar Arnfjörð Bjarmason wrote: > > > 1) I really don't see the basis for this argument that they'd need to > >patch it out, they're not patching out e.g. GIT_TRACE now, which has > >all the same

Re: [PATCH v2] sequencer: ensure labels that are object IDs are rewritten

Hi Brian, On Fri, 1 Jun 2018, brian m. carlson wrote: > When writing the todo script for --rebase-merges, we try to find a label > for certain commits. If the label ends up being a valid object ID, such > as when we merge a detached commit, we want to rewrite it so it is no > longer a valid

Re: [PATCH] t9104: kosherly remove remote refs

Hi Chris, On Fri, 1 Jun 2018, Christian Couder wrote: > As there are plans to implement other ref storage systems, > let's use a way to remove remote refs that does not depend > on refs being files. > > This makes it clear to readers that this test does not > depend on which ref backend is

Re: [PATCH 3/3] submodule--helper: plug mem leak in print_default_remote

Hi Stefan, On Thu, 31 May 2018, Stefan Beller wrote: > On Thu, May 31, 2018 at 5:07 AM, Johannes Schindelin > wrote: > > Hi Stefan, > > > > On Wed, 30 May 2018, Stefan Beller wrote: > > > >> Signed-off-by: Stefan Beller > >> --- > >>

Re: [PATCH 00/18] Add `branch-diff`, a `tbdiff` lookalike

Hi Junio, On Tue, 22 May 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> In the picture, the three pre-context lines that are all indented by > >> a HT are prefixed by a SP, and that is prefixed by a '+' sign of the > >> outer

Re: [PATCH 02/18] Add a new builtin: branch-diff

Hi Ramsay, On Wed, 9 May 2018, Ramsay Jones wrote: > On 05/05/18 20:41, Johannes Schindelin wrote: > [snip] > > [Sorry for the late reply - still catching up after (long weekend) > UK public holiday] > > > Well, what I would want to do is let the cloud work for me. By

Re: [PATCH v2 12/18] branch-diff: use color for the commit pairs

Hi Todd, On Mon, 7 May 2018, Todd Zullinger wrote: > Johannes Schindelin wrote: > > > > On Sat, 5 May 2018, Todd Zullinger wrote: > > > >>> @@ -430,6 +451,8 @@ int cmd_branch_diff(int argc, const char **argv, > >>> const char *prefix) > >>

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi team, especially Stefan: your thorough investigation about a better name than range-diff gives me confidence that my decision to retract my objection against has merit: it seems to be by far the one name that everybody but me agrees on. And I can adapt easily. On Sat, 26 May 2018, Øyvind

Re: [PATCH v2 01/18] Add a function to solve least-cost assignment problems

Hi Brian, On Wed, 30 May 2018, brian m. carlson wrote: > On Wed, May 30, 2018 at 09:14:06AM -0700, Stefan Beller wrote: > > Good point. I remember my initial reaction to the file names was > > expecting some hungarian notation, which totally didn't make sense, so > > I refrained from commenting.

Re: Git installer bugs

Hi Stefan, just to close the loop: On Wed, 30 May 2018, Stefan Beller wrote: > On Wed, May 30, 2018 at 12:48 PM, John Meyer wrote: > > Ran the installer, selected the option to not modify the path & the path > > was modified anyway... it removed git from the path (it was there from a > >

Re: [PATCH 3/3] submodule--helper: plug mem leak in print_default_remote

Hi Stefan, On Wed, 30 May 2018, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > builtin/submodule--helper.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c > index 7c3cd9dbeba..96024fee1b1 100644 > ---

Re: [PATCH 1/3] refs/packed-backend.c: close fd of empty file

Hi Stefan, I am Cc:ing Michael, the original author of the fixed commit. On Wed, 30 May 2018, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > > This was an oversight in 01caf20d57a (load_contents(): don't try to mmap an > empty file, 2018-01-24). > > This and the following 2

Re: [PATCH 2/3] sequencer.c: free author variable when merging fails

Hi Stefan, On Wed, 30 May 2018, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > > This was a deliberate oversight in f241ff0d0a9 (prepare the builtins for a > libified merge_recursive(), 2016-07-26) No, it was not deliberate. It was inadvertent, most likely ;-) > sequencer.c | 4

Re: [PATCH] sequencer: ensure labels that are object IDs are rewritten

Hi Brian, On Wed, 30 May 2018, brian m. carlson wrote: > On Wed, May 30, 2018 at 11:54:27AM +0200, Johannes Schindelin wrote: > > > > + third=$(git rev-parse HEAD) && > > > + git checkout -b labels master && > > > + git merge --no-commit th

Re: [PATCH] sequencer: ensure labels that are object IDs are rewritten

Hi Brian, On Tue, 29 May 2018, brian m. carlson wrote: > When writing the todo script for --rebase-merges, we try to find a label > for certain commits. If the label ends up being a valid object ID, such > as when we merge a detached commit, we want to rewrite it so it is no > longer a valid

[ANNOUNCE] Git for Windows 2.17.1(2)

Dear Git users, It is my pleasure to announce that Git for Windows 2.17.1(2) is available from: https://gitforwindows.org/ Changes since Git for Windows v2.17.0 (April 3rd 2018) New Features * Comes with Git v2.17.1. * Comes with Perl v5.26.2. * The installer now offers VS Code

Re: [PATCH] git-rebase--interactive: fix copy-paste mistake

Hi Orgad, On Sun, 27 May 2018, Orgad Shaneh wrote: > exec argument is a command, not a commit. > > Signed-off-by: Orgad Shaneh > --- > git-rebase--interactive.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/git-rebase--interactive.sh

Re: js/empty-config-section-fix, was Re: What's cooking in git.git (May 2018, #03; Wed, 23)

Hi Junio, On Mon, 28 May 2018, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > > > On Thu, 24 May 2018, Junio C Hamano wrote: > > > >> * js/empty-config-section-fix (2018-05-18) 1 commit > >> - config: a

js/empty-config-section-fix, was Re: What's cooking in git.git (May 2018, #03; Wed, 23)

Hi Junio, On Thu, 24 May 2018, Junio C Hamano wrote: > * js/empty-config-section-fix (2018-05-18) 1 commit > - config: a user-provided invalid section is not a BUG > > Error codepath fix. > > Will merge to 'next'. As a hotfix, maybe we can fast-track it to master? Thanks, Dscho

Re: [GSoC][PATCH v3 0/4] rebase: split rebase -p from rebase -i

Hi Alban, On Thu, 24 May 2018, Alban Gruin wrote: > This splits the `rebase --preserve-merges` functionnality from > git-rebase--interactive.sh. All the dead code left by the duplication of > git-rebase--interactive.sh is also removed. This will make it easier to > rewrite > this script in C. >

Re: [PATCH 4/5] merge-recursive: rename conflict_rename_*() family of functions

Hi Elijah, On Fri, 18 May 2018, Elijah Newren wrote: > These functions were added because processing of these conflicts needed > to be deferred until process_entry() in order to get D/F conflicts and > such right. The number of these has grown over time, and now include > some whose name is

Re: [PATCH 3/5] merge-recursive: clarify the rename_dir/RENAME_DIR meaning

Hi Elijah, On Fri, 18 May 2018, Elijah Newren wrote: > We had an enum of rename types which included RENAME_DIR; this name felt > misleading since it was not about an entire directory but was a status for > each individual file add that occurred within a renamed directory. Since > this type is

Re: [PATCH 2/5] merge-recursive: fix numerous argument alignment issues

Hi Elijah, On Fri, 18 May 2018, Elijah Newren wrote: > Various refactorings throughout the code have left lots of alignment > issues that were driving me crazy; fix them. I hope you did not do that manually. What is your code formatting tool of choice? The patch looks obviously good to me.

Re: [PATCH 5/5] merge-recursive: simplify handle_change_delete

Hi Elijah, On Sat, 19 May 2018, Elijah Newren wrote: > On Sat, May 19, 2018 at 12:32 AM, Johannes Sixt wrote: > > Am 19.05.2018 um 04:07 schrieb Elijah Newren: > >> > >> There is really no need for four branches of nearly identical messages > >> when we can store the differences

Re: [PATCH] t: make many tests depend less on the refs being files

Hi, of course I messed up and did not fix the Cc: list... now fixed ;-) On Mon, 21 May 2018, Johannes Schindelin wrote: > Hi Chris, > > On Mon, 21 May 2018, Christian Couder wrote: > > > From: David Turner <dtur...@twopensource.com> > > I vaguely reme

Re: [PATCH 0/2] Test improvements for 'sg/complete-paths'

Hi Junio, On Mon, 21 May 2018, Johannes Schindelin wrote: > On Fri, 18 May 2018, SZEDER Gábor wrote: > > > > > So, I think for v2 I will rewrite these tests to call > > > > __git_complete_index_file() directly instead of using > > > > 'test_comple

Re: [PATCH 2/2] t9902-completion: exercise __git_complete_index_file() directly

Hi Gábor, On Fri, 18 May 2018, SZEDER Gábor wrote: > The tests added in 2f271cd9cf (t9902-completion: add tests > demonstrating issues with quoted pathnames, 2018-05-08) and in > 2ab6eab4fe (completion: improve handling quoted paths in 'git > ls-files's output, 2018-03-28) have a few

Re: [PATCH 0/2] Test improvements for 'sg/complete-paths'

Hi Gábor, On Fri, 18 May 2018, SZEDER Gábor wrote: > > > So, I think for v2 I will rewrite these tests to call > > > __git_complete_index_file() directly instead of using > > > 'test_completion', and will include a test with spaces in path > > > names. > > > > Quite well thought-out reasoning.

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Junio, On Tue, 8 May 2018, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > > > It would be easy to introduce, but I am wary about its usefulness. > > Unless you re-generate the branch from patches (which I guess you do a &g

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Buga, On Mon, 7 May 2018, Igor Djordjevic wrote: > On 07/05/2018 09:48, Jeff King wrote: > > > > > > Let's, please, not fall into the trap of polluting git-branch with > > > > utterly unrelated functionality, as has happened a few times with > > > > other Git commands. Let's especially not

Re: [PATCH 01/18] Add a function to solve least-cost assignment problems

Hi Duy, On Sun, 13 May 2018, Duy Nguyen wrote: > On Thu, May 3, 2018 at 5:30 PM, Johannes Schindelin > <johannes.schinde...@gmx.de> wrote: > > + /* reduction transfer */ > > + free_row = xmalloc(sizeof(int) * row_count); > > + for (int i = 0; i &

Re: [PATCH 00/18] Add `branch-diff`, a `tbdiff` lookalike

Hi Junio, On Mon, 21 May 2018, Junio C Hamano wrote: > I've been using both branch-diff and tbdiff while comparing rerolled > topics before accepting them. One obvious difference between the two is > that the speed to compute pairing is quite different but that is > expected ;-) Yep. It is

Re: [PATCH] t: make many tests depend less on the refs being files

Hi Chris, On Mon, 21 May 2018, Christian Couder wrote: > From: David Turner I vaguely remember that Dave suggested using a different email address these days... *clicketyclick* ah, yes:

Re: [PATCH 0/2] fix a segfault in get_main_ref_store()

Hi Peff, On Fri, 18 May 2018, Jeff King wrote: > I stumbled across a BUG() today. But interestingly, in the current tip > of master it actually segfaults instead! This fixes the segfault (back > into a BUG(), and then fixes the caller to avoid the BUG() in the first > place). > > [1/2]:

Re: Troubles with picking an editor during Git update

Hi Bartosz, On Thu, 17 May 2018, Bartosz Konikiewicz wrote: > I had an issue with Git installer for Windows while trying to update > my instance of the software. My previous version was "git version > 2.15.1.windows.2", while my operating system prompted me to upgrade to > "2.17.0". The

[PATCH 0/1] Hot fix for js/empty-config-section-fix

, let's just error out. Johannes Schindelin (1): config: a user-provided invalid section is not a BUG config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: ccdcbd54c4475c2238b310f7113ab3075b5abc9c Published-As: https://github.com/dscho/git/releases/tag/empty-config

[PATCH 1/1] config: a user-provided invalid section is not a BUG

This was pointed out by Jeff King while the empty-config-section-fix patch series was cooking, and was not addressed in time for that patch series to advance to `master`. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- config.c | 2 +- 1 file changed, 1 insertion

Re: [GSoC] A blog about 'git stash' project

Hi Kaartic, > On Thursday 17 May 2018 12:28 PM, Kaartic Sivaraam wrote: > > > I thought of pointing you to one of the issues with the current > > implementation of 'git stash' which you could probably fix while > > porting it to C. > > > > ... > > > > Forgot to mention about another issue,

Re: [PATCH] refspec.h: reinstate 'extern' to fix sparse warning

On Wed, 16 May 2018, Stefan Beller wrote: > On Wed, May 16, 2018 at 2:42 PM, Brandon Williams wrote: > > > Though now I'm confused, I thought we were going towards eliminating > > using the extern keyword? ...of course I guess it means something > > _slightly_ different when

Re: What would travis do?

Hi Stefan, On Tue, 15 May 2018, Stefan Beller wrote: > in a context unrelated to Git, I found https://github.com/grosser/wwtd > ("What would travis do?"), which may be interesting for those who > tweak the travis file. While that is a nice project, I have to admit that it would not help in most

Re: [PATCH] grep: handle corrupt index files early

Hi Stefan, On Mon, 14 May 2018, Stefan Beller wrote: > Any other caller of 'repo_read_index' dies upon a negative return of > it, so grep should, too. > > Signed-off-by: Stefan Beller > --- > > Found while reviewing the series >

Re: [RFC] Other chunks for commit-graph, part 1 - Bloom filters, topo order, etc.

Hi Kuba, On Mon, 14 May 2018, Jakub Narebski wrote: > [... lots and lots of discussions...] > > All right. > > Here is my [allegedly] improved version, which assumes that we always > want to start from commit with maximum generation number (there may be > more than one such commit). > > Let's

Re: [PATCH] fast-export: avoid NULL pointer arithmetic

Hi René, On Wed, 9 May 2018, René Scharfe wrote: > Clang 6 reports the following warning, which is turned into an error in a > DEVELOPER build: > > builtin/fast-export.c:162:28: error: performing pointer arithmetic on a > null pointer has undefined behavior

Re: [PATCH] t6050-replace: don't disable stdin for the whole test script

Hi Gábor, On Mon, 7 May 2018, SZEDER Gábor wrote: > The test script 't6050-replace.sh' starts off with redirecting the whole > test script's stdin from /dev/null. This redirection has been there > since the test script was introduced in a3e8267225 (replace_object: add > a test case,

Re: main url for linking to git source?

Hi Peff, On Mon, 7 May 2018, Jeff King wrote: > The git-scm.com site currently links to https://github.com/git/git for > the (non-tarball) source code. Somebody raised the question[1] of > whether it should point to kernel.org instead. > > Do people find one interface more or less pleasing than

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Junio, On Mon, 7 May 2018, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > > >> If tbdiff were "Thomas's branch diff", I would call this jbdiff ;-) > >> but I think the 't' in there stands for "topic", no

Re: [PATCH v2 13/18] color: provide inverted colors, too

Hi Junio, On Mon, 7 May 2018, Junio C Hamano wrote: > Jeff King writes: > > > So really, I guess all I am arguing for is having GIT_COLOR_INV (or > > REVERSE) as a constant, and then teaching the code to combine it with > > the existing "new" color. It's perfectly OK to have: >

Re: [PATCH v2 00/18] Add `branch-diff`, a `tbdiff` lookalike

Hi Brian, On Sun, 6 May 2018, brian m. carlson wrote: > On Fri, May 04, 2018 at 05:34:27PM +0200, Johannes Schindelin wrote: > > The incredibly useful `git-tbdiff` tool to compare patch series (say, > > to see what changed between two iterations sent to the Git mailing > > l

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Eric, On Sun, 6 May 2018, Eric Sunshine wrote: > On Sun, May 6, 2018 at 8:21 AM, Johannes Schindelin > <johannes.schinde...@gmx.de> wrote: > > On Sun, 6 May 2018, Junio C Hamano wrote: > >> Johannes Schindelin <johannes.schinde...@gmx.de> writes: > >

Re: [PATCH v2 07/18] branch-diff: indent the diffs just like tbdiff

Hi Martin, On Sun, 6 May 2018, Martin Ågren wrote: > On 4 May 2018 at 17:34, Johannes Schindelin <johannes.schinde...@gmx.de> > wrote: > > @@ -353,6 +358,7 @@ static void output(struct string_list *a, struct > > string_list *b, > > int cmd_branch_diff(int argc,

Re: [PATCH v2 12/18] branch-diff: use color for the commit pairs

Hi Todd, On Sat, 5 May 2018, Todd Zullinger wrote: > > @@ -430,6 +451,8 @@ int cmd_branch_diff(int argc, const char **argv, const > > char *prefix) > > struct string_list branch1 = STRING_LIST_INIT_DUP; > > struct string_list branch2 = STRING_LIST_INIT_DUP; > > > > +

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Buga, On Sun, 6 May 2018, Igor Djordjevic wrote: > On 06/05/2018 14:10, Johannes Schindelin wrote: > > > I think Todd's idea to shift it from a full-blown builtin to a cmdmode > > of `branch` makes tons of sense. > > I don`t know, I still find it a bit strang

Re: [PATCH v2 18/18] completion: support branch-diff

Hi Duy, On Sun, 6 May 2018, Duy Nguyen wrote: > On Fri, May 04, 2018 at 05:35:11PM +0200, Johannes Schindelin wrote: > > Tab completion of `branch-diff` is very convenient, especially given > > that the revision arguments that need to be passed to `git branch-diff` > > are t

Re: [PATCH v2 13/18] color: provide inverted colors, too

Hi Peff, On Sun, 6 May 2018, Jeff King wrote: > On Sun, May 06, 2018 at 02:35:44AM -0400, Jeff King wrote: > > > You'd have to introduce GIT_COLOR_REVERSE. I don't think we have a > > constant for it yet, but it's \x[7m. > > Heh, of course you knew that already, as I just noticed your patch is

Re: [PATCH v2 00/18] Add `branch-diff`, a `tbdiff` lookalike

Hi Junio, On Sun, 6 May 2018, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > > > Johannes Schindelin (17): > > Add a function to solve least-cost assignment problems > > Add a new builtin: branch-diff > > Perhaps r

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Junio, On Sun, 6 May 2018, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > > > On Sat, 5 May 2018, Jeff King wrote: > > > >> On Fri, May 04, 2018 at 05:34:32PM +0200, Johannes Schindelin wrote: > >> > >> &

Re: [PATCH v2 05/18] branch-diff: also show the diff between patches

Hi Buga, On Sun, 6 May 2018, Igor Djordjevic wrote: > On 04/05/2018 17:34, Johannes Schindelin wrote: > > Just like tbdiff, we now show the diff between matching patches. This is > > a "diff of two diffs", so it can be a bit daunting to read for the > > beginner

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Buga, On Sun, 6 May 2018, Igor Djordjevic wrote: > On 05/05/2018 23:57, Johannes Schindelin wrote: > > > > > > This builtin does not do a whole lot so far, apart from showing a > > > > usage that is oddly similar to that of `git tbdiff`. And for a >

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Duy, On Sun, 6 May 2018, Duy Nguyen wrote: > On Sun, May 6, 2018 at 6:53 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: > > On Sat, May 5, 2018 at 6:05 PM, Igor Djordjevic > > <igor.d.djordje...@gmail.com> wrote: > >> > >> O

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Todd, On Sat, 5 May 2018, Todd Zullinger wrote: > I wrote: > > Would it be possible and reasonable to teach 'git branch' to > > call this as a subcommand, i.e. as 'git branch diff'? Then > > the completion wouldn't offer git branch-diff. > > Of course right after I sent this, it occurred to

Re: [PATCH v2 13/18] color: provide inverted colors, too

Hi Peff, On Sat, 5 May 2018, Jeff King wrote: > On Fri, May 04, 2018 at 05:34:58PM +0200, Johannes Schindelin wrote: > > > For every regular color, there exists the inverted equivalent where > > background and foreground colors are exchanged. > > > > We wi

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Peff, On Sat, 5 May 2018, Jeff King wrote: > On Fri, May 04, 2018 at 05:34:32PM +0200, Johannes Schindelin wrote: > > > This builtin does not do a whole lot so far, apart from showing a usage > > that is oddly similar to that of `git tbdiff`. And for a good reason: &g

Re: [PATCH v2 01/18] Add a function to solve least-cost assignment problems

Hi Peff, On Sat, 5 May 2018, Jeff King wrote: > On Fri, May 04, 2018 at 05:34:29PM +0200, Johannes Schindelin wrote: > > > The Jonker-Volgenant algorithm was implemented to answer questions such > > as: given two different versions of a topic branch (or iterations of a >

Re: [PATCH 02/18] Add a new builtin: branch-diff

Hi Elijah, On Fri, 4 May 2018, Elijah Newren wrote: > On Thu, May 3, 2018 at 11:40 PM, Johannes Schindelin > <johannes.schinde...@gmx.de> wrote: > > I actually have a hacky script to fixup commits in a patch series. It lets > > me stage part of the current changes

Re: [PATCH v2 00/18] Add `branch-diff`, a `tbdiff` lookalike

Hi Elijah, On Fri, 4 May 2018, Elijah Newren wrote: > On Fri, May 4, 2018 at 8:34 AM, Johannes Schindelin > <johannes.schinde...@gmx.de> wrote: > > The incredibly useful `git-tbdiff` tool to compare patch series (say, to see > > what changed between two iterations sent

Re: [PATCH 02/18] Add a new builtin: branch-diff

Hi Ramsay, On Fri, 4 May 2018, Ramsay Jones wrote: > On 04/05/18 07:40, Johannes Schindelin wrote: > [snip] > > BTW I ran `make sparse` for the first time, and it spits out tons of > > stuff. And I notice that they are all non-fatal warnings, but so were the > > on

Re: [PATCH v2 1/4] test-tool: help verifying BUG() code paths

Hi Duy, On Wed, 2 May 2018, Duy Nguyen wrote: > On Wed, May 2, 2018 at 11:38 AM, Johannes Schindelin > <johannes.schinde...@gmx.de> wrote: > > When we call BUG(), we signal via SIGABRT that something bad happened, > > dumping cores if so configured. In som

Re: [PATCH v2 0/6] Let the sequencer handle `git rebase -i --root`

Hi Stefan, On Fri, 4 May 2018, Stefan Beller wrote: > > Branch-diff vs v1: > > 1: 42db734a980 ! 1: 73398da7119 sequencer: learn about the special "fake > > root commit" handling > > @@ -54,40 +54,50 @@ > > return NULL; > >} > > > > ++/* Read author-script and return

[PATCH v2 16/18] branch-diff --dual-color: work around bogus white-space warning

-diff` command, which only uses a hard-coded output_prefix of four spaces (which misses the problem by one column ;-)). Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- diff.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/diff.c b/diff.c index 98a41e88620..b98a1

[PATCH v2 04/18] branch-diff: improve the order of the shown commits

come from?" rather than "where did that one go?". To that end, we list the commits in the order of the second commit range ("the newer version"), inserting the unmatched commits of the first commit range as soon as all their predecessors have been shown. Sign

[PATCH v2 14/18] diff: add an internal option to dual-color diffs of diffs

the diff it is. Of course, this really only makes sense when the preimage and postimage *are* diffs. So let's not expose this flag via a command-line option for now. This is a feature that was invented by git-tbdiff, and it will be used in `branch-diff` in the next commit. Signed-off-by: Johannes

[PATCH v2 12/18] branch-diff: use color for the commit pairs

output) vs modified patches (old commit is red, new commit is green). Let's imitate that color scheme. While at it, also copy tbdiff's change of the fragment color to magenta. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- builtin/branch-diff.

[PATCH v2 03/18] branch-diff: first rudimentary implementation

by `branch-diff` is different (but very similar) to the one calculated by `tbdiff`. Therefore, it is possible that they find different matching commits in corner cases (e.g. when a patch was split into two patches of roughly equal length). Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx

[PATCH v2 18/18] completion: support branch-diff

-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- contrib/completion/git-completion.bash | 18 ++ 1 file changed, 18 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 01dd9ff07a2..45addd525ac 100644 --- a/c

[PATCH v2 15/18] branch-diff: offer to dual-color the diffs

like the diffs they are, and the *outer* +/- sign is inverted for clarity. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- builtin/branch-diff.c | 8 1 file changed, 8 insertions(+) diff --git a/builtin/branch-diff.c b/builtin/branch-diff.c index 04efd30f0f6..8a163

[PATCH v2 13/18] color: provide inverted colors, too

For every regular color, there exists the inverted equivalent where background and foreground colors are exchanged. We will use this in the next commit to allow inverting *just* the +/- signs in a diff. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- color.h | 6 +++

[PATCH v2 06/18] branch-diff: right-trim commit messages

it message, it's not like trailing white-space in the commit messages are important enough to care about in branch-diff. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- builtin/branch-diff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/branch-diff.c b/built

[PATCH v2 07/18] branch-diff: indent the diffs just like tbdiff

The main information in the branch-diff view comes from the list of matching and non-matching commits, the diffs are additional information. Indenting them helps with the reading flow. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- builtin/branch-diff.c | 9 +

[PATCH v2 08/18] branch-diff: suppress the diff headers

When showing the diff between corresponding patches of the two branch versions, we have to make up a fake filename to run the diff machinery. That filename does not carry any meaningful information, hence tbdiff suppresses it. So we should, too. Signed-off-by: Johannes Schindelin

[PATCH v2 09/18] branch-diff: adjust the output of the commit pairs

This change brings branch-diff yet another step closer to feature parity with tbdiff: it now shows the oneline, too, and indicates with `=` when the commits have identical diffs. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- builtin/branch-diff.

[PATCH v2 11/18] branch-diff: add tests

y line. And apparently xdiff picks a different option here than Python's difflib. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- t/.gitattributes | 1 + t/t7910-branch-diff.sh | 144 ++ t/t7910/history.export | 604 ++

[PATCH v2 17/18] branch-diff: add a man page

This is a heavily butchered version of the README written by Thomas Rast and Thomas Gummerer, lifted from https://github.com/trast/tbdiff. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- Documentation/git-branch-diff.txt | 239 ++ 1 file c

[PATCH v2 10/18] branch-diff: do not show "function names" in hunk headers

We are comparing complete, formatted commit messages with patches. There are no function names here, so stop looking for them. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- builtin/branch-diff.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/builtin/branch-

[PATCH v2 01/18] Add a function to solve least-cost assignment problems

The Jonker-Volgenant algorithm was implemented to answer questions such as: given two different versions of a topic branch (or iterations of a patch series), what is the best pairing of commits/patches between the different versions? Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx

[PATCH v2 05/18] branch-diff: also show the diff between patches

Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- builtin/branch-diff.c | 53 +++ 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/builtin/branch-diff.c b/builtin/branch-diff.c index 92302b1c339..b23d66a3b1c 100644 --- a/built

[PATCH v2 02/18] Add a new builtin: branch-diff

as the --no-patches option, as they will all be implemented later using diff_options. Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de> --- .gitignore| 1 + Makefile | 1 + builtin.h | 1 + builtin/branch-diff.

[PATCH v2 00/18] Add `branch-diff`, a `tbdiff` lookalike

se--helper [] ( A..B C..D | A...B | base A B )"), + N_("git branch-diff [] .. .."), @@ return data; } Johannes Schindelin (17): Add a function to solve least-cost assignment problems Add a new builtin: branch-diff branch-diff: first rudimentary imp

Re: [PATCH 02/18] Add a new builtin: branch-diff

Hi Duy, On Fri, 4 May 2018, Duy Nguyen wrote: > On Fri, May 4, 2018 at 9:23 AM, Johannes Schindelin > <johannes.schinde...@gmx.de> wrote: > > Oh, okay. It was not at all clear to me what the exact format and role of > > these lines are... > > Noted. I'm ma

Re: [PATCH 00/18] Add `branch-diff`, a `tbdiff` lookalike

Hi Junio, On Fri, 4 May 2018, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > > > Johannes Schindelin (17): > > Add a function to solve least-cost assignment problems > > Add a new builtin: branch-diff > > branch-di

Re: [PATCH 02/18] Add a new builtin: branch-diff

Hi Duy, On Fri, 4 May 2018, Duy Nguyen wrote: > On Thu, May 3, 2018 at 10:32 PM, Johannes Schindelin > <johannes.schinde...@gmx.de> wrote: > > > > On Thu, 3 May 2018, Johannes Schindelin wrote: > > > >> On Thu, 3 May 2018, Duy Nguyen wrote: > >>

Re: [PATCH 03/18] branch-diff: first rudimentary implementation

Hi Junio, On Fri, 4 May 2018, Junio C Hamano wrote: > Johannes Schindelin <johannes.schinde...@gmx.de> writes: > > > Note: due to differences in the diff algorithm (`tbdiff` uses the > > Pythong module `difflib`, Git uses its xdiff fork), the cost matrix > > Pyth

Re: [PATCH 17/18] branch-diff: add a man page

Hi Eric, On Thu, 3 May 2018, Eric Sunshine wrote: > On Thu, May 3, 2018 at 11:31 AM, Johannes Schindelin > <johannes.schinde...@gmx.de> wrote: > > This is a heavily butchered version of the README written by Thomas > > Rast and Thomas Gummerer, lifted from https:/

Re: [PATCH 05/18] branch-diff: also show the diff between patches

Hi Eric, On Thu, 3 May 2018, Eric Sunshine wrote: > On Thu, May 3, 2018 at 11:30 AM, Johannes Schindelin > <johannes.schinde...@gmx.de> wrote: > > Just like tbdiff, we now show the diff between matching patches. This is > > a "diff of two diffs", s

Re: [PATCH 03/18] branch-diff: first rudimentary implementation

Hi Eric, On Thu, 3 May 2018, Eric Sunshine wrote: > On Thu, May 3, 2018 at 11:30 AM, Johannes Schindelin > <johannes.schinde...@gmx.de> wrote: > > At this stage, `git branch-diff` can determine corresponding commits of > > two related commit ranges. This makes use of

Re: [PATCH 02/18] Add a new builtin: branch-diff

Hi Eric, On Thu, 3 May 2018, Eric Sunshine wrote: > On Thu, May 3, 2018 at 11:30 AM, Johannes Schindelin > <johannes.schinde...@gmx.de> wrote: > > This builtin does not do a whole lot so far, apart from showing a usage > > that is oddly similar to that of `git tbdiff

<    5   6   7   8   9   10   11   12   13   14   >