From: Johannes Schindelin
We should not interrupt. sentences in the middle.
Signed-off-by: Johannes Schindelin
---
remote-curl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/remote-curl.c b/remote-curl.c
index 99b0bedc6..fb28309e8 100644
--- a/remote-curl.c
+++ b/remote
Hi Junio,
On Mon, 6 Aug 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > Git for Windows' original 4aa8b8c8283 (Teach 'git pull' to handle
> > --rebase=interactive, 2011
Hi Eric,
On Sun, 5 Aug 2018, Eric Sunshine wrote:
> On Sat, Aug 4, 2018 at 6:18 PM Johannes Schindelin via GitGitGadget
> wrote:
> > The assertion in question really indicates a bug, when triggered, so we
> > might just as well use the sanctioned method to report it.
Hi Eric,
On Sun, 5 Aug 2018, Eric Sunshine wrote:
> On Sat, Aug 4, 2018 at 6:18 PM Johannes Schindelin via GitGitGadget
> wrote:
> > When traversing commits and adjusting the ranges, things can get really
> > tricky. For example, when the line range of interest encloses
Hi Jonathan,
On Sat, 4 Aug 2018, Jonathan Nieder wrote:
> Johannes Schindelin wrote:
>
> > Currently, this test case throws an assertion:
> >
> > Assertion failed!
> >
> > Program: git.exe
> > File: line-log.c, Line 71
> >
> > Si
Team,
On Mon, 6 Aug 2018, Johannes Schindelin via GitGitGadget wrote:
> It was reported via IRC that the exec lines are inserted in the wrong spots
> when using --rebase-merges.
>
> The reason is that we used a simple, incorrect implementation that happened
> to work as long a
From: Johannes Schindelin
The --exec option's implementation is not really well-prepared for
--rebase-merges. Demonstrate this.
Signed-off-by: Johannes Schindelin
---
t/t3430-rebase-merges.sh | 17 +
1 file changed, 17 insertions(+)
diff --git a/t/t3430-rebase-merges.sh b/t
From: Johannes Schindelin
The idea of `--exec` is to append an `exec` call after each `pick`.
Since the introduction of fixup!/squash! commits, this idea was extended
to apply to "pick, possibly followed by a fixup/squash chain", i.e. an
exec would not be inserted between a `pic
with--rebase-merges.
Fix this issue by using a correct, if longer and slightly more complex
implementation instead.
Johannes Schindelin (2):
t3430: demonstrate what -r, --autosquash & --exec should do
rebase --exec: make it work with --rebase-merges
sequencer.c
Hi Junio,
On Fri, 3 Aug 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > diff --git a/sequencer.c b/sequencer.c
> > index 31038472f..dda5cdbba 100644
> > --- a/sequencer.c
> > +++ b/sequencer.c
> > @@ -4244,10
Hi Junio,
On Fri, 3 Aug 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > + /*
> > +* Insert after every pick. Here, fixup/squash chains
> > +* are considered part of the pick, so we insert the com
Hi Junio,
On Fri, 3 Aug 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > The idea of `--exec` is to append an `exec` call after each `pick`.
> >
> > Since the introduction
Hi Junio,
On Thu, 2 Aug 2018, Junio C Hamano wrote:
> * pk/rebase-in-c (2018-07-30) 3 commits
> - builtin/rebase: support running "git rebase "
> - rebase: refactor common shell functions into their own file
> - rebase: start implementing it as a builtin
>
> Rewrite of the "rebase"
From: Johannes Schindelin
Currently, this test case throws an assertion:
Assertion failed!
Program: git.exe
File: line-log.c, Line 71
Signed-off-by: Johannes Schindelin
---
t/t4211-line-log.sh | 17 +
1 file changed, 17 insertions(+)
diff --git a/t
ave been a >= (I tried to wrap my head around this, but I would feel more
comfortable if a domain expert would analyze this, whistling, and looking
Eric's way).
Cc: Eric Sunshine sunsh...@sunshineco.com [sunsh...@sunshineco.com]
Johannes Schindelin (4):
line-log: demonstrate a bug with nearly-overl
From: Johannes Schindelin
The assertion in question really indicates a bug, when triggered, so we
might just as well use the sanctioned method to report it.
Signed-off-by: Johannes Schindelin
---
line-log.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/line-log.c b
From: Johannes Schindelin
Technically, it is okay to have line ranges that touch (i.e. the end of
the first range ends just before the next range begins). However, it is
inefficient, and when the user provides such touching ranges via
multiple `-L` options, we already join them.
When we
From: Johannes Schindelin
When traversing commits and adjusting the ranges, things can get really
tricky. For example, when the line range of interest encloses several
hunks of a commit, the line range can actually shrink.
Currently, range_set_shift_diff() does not anticipate that scenario
this convenience, at long last.
Johannes Schindelin (1):
pull --rebase=: allow single-letter abbreviations for the type
builtin/pull.c | 6 +++---
t/t5520-pull.sh | 12
2 files changed, 15 insertions(+), 3 deletions(-)
base-commit: 1d89318c48d233d52f1db230cf622935ac3c69fa
Published
From: Johannes Schindelin
Git for Windows' original 4aa8b8c8283 (Teach 'git pull' to handle
--rebase=interactive, 2011-10-21) had support for the very convenient
abbreviation
git pull --rebase=i
which was later lost when it was ported to the builtin `git pull
with--rebase-merges.
Fix this issue by using a correct, if longer and slightly more complex
implementation instead.
Johannes Schindelin (2):
t3430: demonstrate what -r, --autosquash & --exec should do
rebase --exec: make it work with --rebase-merges
sequencer.c
From: Johannes Schindelin
The --exec option's implementation is not really well-prepared for
--rebase-merges. Demonstrate this.
Signed-off-by: Johannes Schindelin
---
t/t3430-rebase-merges.sh | 17 +
1 file changed, 17 insertions(+)
diff --git a/t/t3430-rebase-merges.sh b/t
From: Johannes Schindelin
The idea of `--exec` is to append an `exec` call after each `pick`.
Since the introduction of fixup!/squash! commits, this idea was extended
to apply to "pick, possibly followed by a fixup/squash chain", i.e. an
exec would not be inserted between a `pic
Hi Jonathan,
On Fri, 27 Jul 2018, Johannes Schindelin wrote:
> On Thu, 26 Jul 2018, Jonathan Tan wrote:
>
> > > On Mon, 16 Jul 2018, Jonathan Tan wrote:
> > >
> > > > t/t5552-skipping-fetch-negotiator.sh | 179 +++
> > >
>
Hi Eric,
On Thu, 2 Aug 2018, Eric Sunshine wrote:
> want_color_fd() is designed to work only with standard input, output,
> and error file descriptors, and stores information about each descriptor
> in an array. However, it doesn't verify that the passed-in descriptor
> lives within that set,
Hi Junio,
On Mon, 30 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > FWIW I picked up your Asciidoc-underline fix, and I also fixed a typo in a
> > commit message (you may want to pick that up, too, unless you want me to
> > send a full new iterat
t line are added
> > *before* the existing empty line. And apparently xdiff picks a different
> > option here than Python's difflib.
> >
> > Signed-off-by: Johannes Schindelin
>
Hi Thomas & Eric,
On Sun, 29 Jul 2018, Thomas Gummerer wrote:
> On 07/29, Eric Sunshine wrote:
> > On Sun, Jul 29, 2018 at 3:04 PM Thomas Gummerer
> > wrote:
> > > On 07/21, Johannes Schindelin via GitGitGadget wrote:
> > > > Just like tbdiff, we no
Hi Thomas,
On Sun, 29 Jul 2018, Thomas Gummerer wrote:
> On 07/21, Johannes Schindelin via GitGitGadget wrote:
> > From: Johannes Schindelin
> >
> > At this stage, `git range-diff` can determine corresponding commits
> > of two related commit ranges. This makes use
Hi Thomas,
On Sat, 28 Jul 2018, Thomas Gummerer wrote:
> On 07/21, Johannes Schindelin via GitGitGadget wrote:
> > From: Johannes Schindelin
> >
> > The problem solved by the code introduced in this commit goes like this:
> > given two sets of items, and a cost
Hi Phillip,
On Mon, 30 Jul 2018, Phillip Wood wrote:
> On 30/07/18 10:29, Eric Sunshine wrote:
> > This series fixes bugs causing corruption of the root commit when
> > "rebase -i --root" is used to swap in a new root commit. In particular,
> > the "author" header has trailing garbage. Some
Hi Eric,
On Mon, 30 Jul 2018, Eric Sunshine wrote:
> On Mon, Jul 30, 2018 at 5:30 AM Eric Sunshine wrote:
> > This series fixes bugs causing corruption of the root commit when
> > "rebase -i --root" is used to swap in a new root commit. In particular,
> > the "author" header has trailing
Hi Eric,
On Mon, 30 Jul 2018, Eric Sunshine wrote:
> When "git rebase -i --root" creates a new root commit (say, by swapping
> in a different commit for the root), it corrupts the commit's "author"
> header with trailing garbage:
>
> author A U Thor @1112912773 -0700...@example.com
>
>
From: Johannes Schindelin
The quite useful cSpell extension allows VS Code to have "squiggly"
lines under spelling mistakes. By default, this would add too much
clutter, though, because so much of Git's source code uses words that
would trigger cSpell.
Let's add a few words to make
From: Johannes Schindelin
This adds a couple settings for the .c/.h files so that it is easier to
conform to Git's conventions while editing the source code.
Signed-off-by: Johannes Schindelin
---
contrib/vscode/init.sh | 8
1 file changed, 8 insertions(+)
diff --git a/contrib
From: Johannes Schindelin
This helps VS Code's intellisense to figure out that we want to include
windows.h, and that we want to define the minimum target Windows version
as Windows Vista/2008R2.
Signed-off-by: Johannes Schindelin
---
config.mak.uname | 2 +-
1 file changed, 1 insertion(+), 1
what
flags to pass to the C compiler, in particular which constants are defined,
because they change the compile flow in rather dramatic ways (determining, e.g.
which SHA-1 backend to use).
Changes since v1:
- Clarified commit message of the first commit.
Johannes Schindelin (9):
contrib: add a
From: Johannes Schindelin
When configuring VS Code as core.editor (via `code --wait`), we really
want to adhere to the Git conventions of wrapping commit messages.
Signed-off-by: Johannes Schindelin
---
contrib/vscode/init.sh | 4
1 file changed, 4 insertions(+)
diff --git a/contrib
From: Johannes Schindelin
By default, the cSpell extension ignores all files under .git/. That
includes, unfortunately, COMMIT_EDITMSG, i.e. commit messages. However,
spell checking is *quite* useful when writing commit messages... And
since the user hardly ever opens any file inside .git (apart
From: Johannes Schindelin
VS Code is a lightweight but powerful source code editor which runs on
your desktop and is available for Windows, macOS and Linux. Among other
languages, it has support for C/C++ via an extension, which offers to
not only build and debug the code, but also Intellisense
From: Johannes Schindelin
While it is technically possible, it is confusing. Not only the user,
but also VS Code's intellisense.
Signed-off-by: Johannes Schindelin
---
cache.h | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/cache.h b/cache.h
From: Johannes Schindelin
The C/C++ settings are special, as they are the only generated VS Code
configurations that *will* change over the course of Git's development,
e.g. when a new constant is defined.
Therefore, let's only update the C/C++ settings, also to prevent user
modifications from
From: Johannes Schindelin
Sadly, we do not get all of the definitions via ALL_CFLAGS. Some defines
are passed to GCC *only* when compiling specific files, such as git.o.
Let's just hard-code them into the script for the time being.
Signed-off-by: Johannes Schindelin
---
contrib/vscode
Hi Hannes,
On Wed, 25 Jul 2018, Johannes Sixt wrote:
> Am 23.07.2018 um 15:52 schrieb Johannes Schindelin via GitGitGadget:
> > From: Johannes Schindelin
> >
> > This adds a couple settings for the .c/.h files so that it is easier to
> > conform to Git's conventio
Hi Jonathan,
On Mon, 23 Jul 2018, Jonathan Nieder wrote:
> Johannes Schindelin via GitGitGadget wrote:
>
> > From: Johannes Schindelin
> >
> > Sadly, we do not get all of the definitions via ALL_CFLAGS. Some defines
> > are passed to GCC *only* when compiling
Hi Junio,
On Mon, 23 Jul 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > diff --git a/contrib/vscode/init.sh b/contrib/vscode/init.sh
> > new file mode 100755
> > index 0..3cc93243f
> > --- /dev/null
&
Hi Jonathan,
On Mon, 23 Jul 2018, Jonathan Nieder wrote:
> Johannes Schindelin via GitGitGadget wrote:
>
> > From: Johannes Schindelin
> >
> > VS Code is a lightweight but powerful source code editor which runs on
> > your desktop and is available for Windows
Hi Junio,
On Fri, 27 Jul 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
> > Count me in the "this is useful" camp, but also I did look at the latest
> > submission this time around, but had nothing to say, so I didn't say
> > anything :)
>
> Please make it a habit to do say
Hi,
On Fri, 27 Jul 2018, Junio C Hamano wrote:
> Stefan Beller writes:
>
> [...]
Thanks for the patch!
The only thing that was not clear to me from the patch and from the commit
message was: the first part *is* case insensitive, right? How does the
patch take care of that? Is it relying on
Hi Brian,
On Tue, 24 Jul 2018, brian m. carlson wrote:
> On Tue, Jul 24, 2018 at 02:13:07PM -0700, Junio C Hamano wrote:
> > Yup. I actually was leaning toward saying "all of them are OK in
> > practice, so the person who is actually spear-heading the work gets to
> > choose", but if we picked
Hi Junio,
On Thu, 26 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Hi Junio,
> >
> > On Tue, 17 Jul 2018, Junio C Hamano wrote:
> >
> >> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> >> index
Hi Jonathan,
On Thu, 26 Jul 2018, Jonathan Tan wrote:
> > On Mon, 16 Jul 2018, Jonathan Tan wrote:
> >
> > > t/t5552-skipping-fetch-negotiator.sh | 179 +++
> >
> > This test seems to be failing consistently in the recent `pu` builds:
> >
> >
Hi Eric,
On Thu, 26 Jul 2018, Eric Sunshine wrote:
> On Thu, Jul 26, 2018 at 6:56 AM Johannes Schindelin
> wrote:
> > On Tue, 17 Jul 2018, Eric Sunshine wrote:
> > > On Tue, Jul 17, 2018 at 6:31 AM Johannes Schindelin
> > > wrote:
> > > > BTW I l
Hi Phillip, Junio and Akinori,
I just noticed that t3404 is broken without my patches (but with Junio's
fixup), on Windows, macOS and Linux. (See log at the end.)
On Fri, 27 Jul 2018, Phillip Wood wrote:
> On 26/07/18 13:33, Johannes Schindelin wrote:
> >
> > On Wed, 18 Jul 201
Hi Andrei,
On Thu, 26 Jul 2018, Andrei Rybak wrote:
> On 2018-05-30 10:03, Eric Sunshine wrote:
> > Dscho recently implemented a 'tbdiff' replacement as a Git builtin named
> > git-branch-diff[1] which computes differences between two versions of a
> > patch series. Such a diff can be a useful
Hi Jonathan,
On Thu, 26 Jul 2018, Johannes Schindelin wrote:
> On Mon, 16 Jul 2018, Jonathan Tan wrote:
>
> > t/t5552-skipping-fetch-negotiator.sh | 179 +++
>
> This test seems to be failing consistently in the recent `pu` builds:
>
> https://git-for-
Hi Chris,
On Sun, 22 Jul 2018, Christian Couder wrote:
> This patch series is upstreaming work made by GitHub and available in:
>
> https://github.com/peff/git/commits/jk/delta-islands
>
> The patch in the above branch has been split into 5 patches with their
> own new commit message, but no
Hi Phillip,
On Thu, 19 Jul 2018, Phillip Wood wrote:
> On 18/07/18 18:17, Junio C Hamano wrote:
> > Phillip Wood writes:
> >
> >>> (I think we had code to do so in "git am"
> >>> that was rewritten in C first).
> >>
> >> The code in builtin/am.c doesn't try to write valid posix shell (if
> >>
Hi Phillip,
On Wed, 18 Jul 2018, Phillip Wood wrote:
> From: Phillip Wood
>
> Single quotes should be escaped as \' not \\'. Note that this only
> affects authors that contain a single quote and then only external
> scripts that read the author script and users whose git is upgraded from
> the
Hi Junio,
On Tue, 17 Jul 2018, Junio C Hamano wrote:
> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> index 2d189da2f1..b0cef509ab 100755
> --- a/t/t3404-rebase-interactive.sh
> +++ b/t/t3404-rebase-interactive.sh
> @@ -81,11 +81,13 @@ test_expect_success 'rebase -i
Hi Eric,
On Tue, 17 Jul 2018, Eric Sunshine wrote:
> On Tue, Jul 17, 2018 at 6:31 AM Johannes Schindelin
> wrote:
> > On Wed, 30 May 2018, Eric Sunshine wrote:
>
> > > + if (range_diff) {
> > > + struct argv_array ranges = ARGV_ARRAY_INIT;
>
Hi Stefan,
On Tue, 17 Jul 2018, Stefan Beller wrote:
> > A tangent.
> >
> > Because this "-- " is a conventional signature separator, MUAs like
> > Emacs message-mode seems to omit everything below it from the quote
> > while responding, making it cumbersome to comment on the tbdiff.
> >
> >
Hi Jonathan,
On Mon, 16 Jul 2018, Jonathan Tan wrote:
> t/t5552-skipping-fetch-negotiator.sh | 179 +++
This test seems to be failing consistently in the recent `pu` builds:
https://git-for-windows.visualstudio.com/git/_build/results?buildId=14337=logs
Could you have a look,
Hi Joan,
On Sun, 22 Jul 2018, Joan Daemen wrote:
> I wanted to react to some statements I read in this discussion. But
> first let me introduce myself. I'm Joan Daemen and I'm working in
> symmetric cryptography since 1988. Vincent Rijmen and I designed
> Rijndael that was selected to become AES
Hi Eric,
On Sun, 22 Jul 2018, Eric Deplagne wrote:
> On Sun, 22 Jul 2018 14:21:48 +, brian m. carlson wrote:
> > On Sun, Jul 22, 2018 at 11:34:42AM +0200, Eric Deplagne wrote:
> > > On Sat, 21 Jul 2018 23:59:41 +, brian m. carlson wrote:
> > > > I don't know your colleagues, and they
Hi Stefan,
On Mon, 23 Jul 2018, Stefan Beller wrote:
> On Sat, Jul 21, 2018 at 3:04 PM Johannes Schindelin via GitGitGadget
> wrote:
>
> > Range-diff vs v3:
> >
> > 1: 39272eefc ! 1: f7e70689e linear-assignment: a function to solve
> > least-cost assig
Hi,
On Fri, 20 Jul 2018, brian m. carlson wrote:
> On Fri, Jul 20, 2018 at 05:51:46PM -0400, Jeffrey Walton wrote:
>
> > (If anyone is interested in first class Solaris support then I am
> > happy to help. The patch set needed for the platform has been stable
> > for the last couple of years).
From: Johannes Schindelin
While it is technically possible, it is confusing. Not only the user,
but also VS Code's intellisense.
Signed-off-by: Johannes Schindelin
---
cache.h | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/cache.h b/cache.h
From: Johannes Schindelin
This adds a couple settings for the .c/.h files so that it is easier to
conform to Git's conventions while editing the source code.
Signed-off-by: Johannes Schindelin
---
contrib/vscode/init.sh | 8
1 file changed, 8 insertions(+)
diff --git a/contrib
From: Johannes Schindelin
The C/C++ settings are special, as they are the only generated VS Code
configurations that *will* change over the course of Git's development,
e.g. when a new constant is defined.
Therefore, let's only update the C/C++ settings, also to prevent user
modifications from
From: Johannes Schindelin
This helps VS Code's intellisense to figure out that we want to include
windows.h, and that we want to define the minimum target Windows version
as Windows Vista/2008R2.
Signed-off-by: Johannes Schindelin
---
config.mak.uname | 2 +-
1 file changed, 1 insertion(+), 1
From: Johannes Schindelin
By default, the cSpell extension ignores all files under .git/. That
includes, unfortunately, COMMIT_EDITMSG, i.e. commit messages. However,
spell checking is *quite* useful when writing commit messages... And
since the user hardly ever opens any file inside .git (apart
From: Johannes Schindelin
The quite useful cSpell extension allows VS Code to have "squiggly"
lines under spelling mistakes. By default, this would add too much
clutter, though, because so much of Git's source code uses words that
would trigger cSpell.
Let's add a few words to make
From: Johannes Schindelin
When configuring VS Code as core.editor (via `code --wait`), we really
want to adhere to the Git conventions of wrapping commit messages.
Signed-off-by: Johannes Schindelin
---
contrib/vscode/init.sh | 4
1 file changed, 4 insertions(+)
diff --git a/contrib
y change the compile flow in rather dramatic ways (determining, e.g.
which SHA-1 backend to use).
Johannes Schindelin (9):
contrib: add a script to initialize VS Code configuration
vscode: hard-code a couple defines
cache.h: extract enum declaration from inside a struct declaration
From: Johannes Schindelin
VS Code is a lightweight but powerful source code editor which runs on
your desktop and is available for Windows, macOS and Linux. Among other
languages, it has support for C/C++ via an extension.
To start developing Git with VS Code, simply run the Unix shell script
From: Johannes Schindelin
Sadly, we do not get all of the definitions via ALL_CFLAGS. Some defines
are passed to GCC *only* when compiling specific files, such as git.o.
Let's just hard-code them into the script for the time being.
Signed-off-by: Johannes Schindelin
---
contrib/vscode
From: Johannes Schindelin
Regression tests are automated tests which try to ensure a specific
behavior. The idea is: if the test case fails, the behavior indicated in
the test case's title regressed.
If a regression test that fails, even occasionally, for any reason other
than to indicate
This fixes a regression test that produces false positives occasionally:
https://git-for-windows.visualstudio.com/git/_build/results?buildId=14035=logs
Johannes Schindelin (1):
t7406: avoid failures solely due to timing issues
t/t7406-submodule-update.sh | 11 ++-
1 file changed, 6
Hi Brian,
On Fri, 20 Jul 2018, brian m. carlson wrote:
> On Mon, Jun 11, 2018 at 12:29:42PM -0700, Jonathan Nieder wrote:
> > My understanding of the discussion so far:
> >
> > Keccak team encourages us[1] to consider a variant like K12 instead of
> > SHA3.
> >
> > AGL explains[2] that the
Hi Stefan,
On Fri, 20 Jul 2018, Stefan Beller wrote:
> > 1. To roll again.
> >
> > A player who rolls two sixes can reroll the dice for an additional
> > turn.
>
> This is where I had my AHA moment!
> (Consider my software development process as chaotic as a dice roll
> So
From: Johannes Schindelin
It *is* a confusing thing to look at a diff of diffs. All too easy is it
to mix up whether the -/+ markers refer to the "inner" or the "outer"
diff, i.e. whether a `+` indicates that a line was added by either the
old or the new diff (or both), or
From: Johannes Schindelin
After using this command extensively for the last two months, this
developer came to the conclusion that even if the dual color mode still
leaves a lot of room for confusion about what was actually changed, the
non-dual color mode is substantially worse in that regard
From: Johannes Schindelin
When comparing commit messages, we need to keep in mind that they are
indented by four spaces. That is, empty lines are no longer empty, but
have "trailing whitespace". When displaying them in color, that results
in those nagging red lines.
Let's just
From: Johannes Schindelin
The bulk of this patch consists of a heavily butchered version of
tbdiff's README written by Thomas Rast and Thomas Gummerer, lifted from
https://github.com/trast/tbdiff.
Signed-off-by: Johannes Schindelin
---
Documentation/git-range-diff.txt | 229
From: Johannes Schindelin
The main information in the `range-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
---
builtin/range-diff.c | 10 ++
1
From: Johannes Schindelin
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.
An alternative would be to display an interdiff, i.e. the hypothetical
diff which is the result of first
From: Johannes Schindelin
As pointed out by Elijah Newren, tbdiff has this neat little alignment
trick where it outputs the commit pairs with patch numbers that are
padded to the maximal patch number's width:
1: cafedead = 1: acefade first patch
[...]
314: beefeada
From: Johannes Schindelin
This "color" simply reverts background and foreground. It will be used
in the upcoming "dual color" mode of `git range-diff`, where we will
reverse colors for the -/+ markers and the fragment headers of the
"outer" diff.
Signed-off-by: Joh
From: Johannes Schindelin
When displaying a diff of diffs, it is possible that there is an outer
`+` before a context line. That happens when the context changed between
old and new commit. When that context line starts with a tab (after the
space that marks it as context line), our diff
From: Johannes Schindelin
At this stage, `git range-diff` can determine corresponding commits
of two related commit ranges. This makes use of the recently introduced
implementation of the linear assignment algorithm.
The core of this patch is a straight port of the ideas of tbdiff
From: Johannes Schindelin
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
---
range-diff.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/range-diff.c b/range-diff.c
From: Johannes Schindelin
This change brings `git range-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
---
range-diff.c | 64
From: Johannes Schindelin
When diffing diffs, it can be quite daunting to figure out what the heck
is going on, as there are nested +/- signs.
Let's make this easier by adding a flag in diff_options that allows
color-coding the outer diff sign with inverted colors, so that the
preimage
From: Johannes Schindelin
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
From: Johannes Schindelin
Arguably the most important part of `git range-diff`'s output is the
list of commits in the two branches, together with their relationships.
For that reason, tbdiff introduced color-coding that is pretty
intuitive, especially for unchanged patches (all dim yellow, like
From: Johannes Schindelin
The problem solved by the code introduced in this commit goes like this:
given two sets of items, and a cost matrix which says how much it
"costs" to assign any given item of the first set to any given item of
the second, assign all items (except when the
From: Johannes Schindelin
This command 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:
the next commits will turn `range-branch` into a full-blown replacement
for `tbdiff`.
At this point, we ignore tbdiff's color
signment.c`
- Made `--dual-color` the default, and changed it to still auto-detect whether
color should be used rather than forcing it
Johannes Schindelin (20):
linear-assignment: a function to solve least-cost assignment problems
Introduce `range-diff` to compare iterations of a topic branch
From: Johannes Schindelin
Tab completion of `git range-diff` is very convenient, especially
given that the revision arguments to specify the commit ranges to
compare are typically more complex than, say, what is normally passed
to `git log`.
Signed-off-by: Johannes Schindelin
---
contrib
601 - 700 of 5954 matches
Mail list logo
