Eric Sunshine writes:
>> available. Provide a short option, -P, to make the option easier
>> accessible.
>
> s/easier accessible/easier to access/
> --- or ---
> s/easier accessible/more easily accessible/
> --- or ---
> s/easier accessible/more accessible/
>
> The patch
Johannes Schindelin writes:
> Johannes Schindelin (17):
> Add a function to solve least-cost assignment problems
> Add a new builtin: branch-diff
> branch-diff: first rudimentary implementation
> branch-diff: improve the order of the shown commits
>
On Thu, May 3, 2018 at 10:32 PM, Johannes Schindelin
wrote:
> Hi Duy,
>
> On Thu, 3 May 2018, Johannes Schindelin wrote:
>
>> On Thu, 3 May 2018, Duy Nguyen wrote:
>>
>> > On Thu, May 3, 2018 at 5:30 PM, Johannes Schindelin
>> > wrote:
>> >
Johannes Schindelin writes:
> Note: due to differences in the diff algorithm (`tbdiff` uses the
> Pythong module `difflib`, Git uses its xdiff fork), the cost matrix
Pythong???
> calculated by `branch-diff` is different (but very similar) to the one
> calculated by
On Thu, May 3, 2018 at 11:31 AM, Johannes Schindelin
wrote:
> 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 Schindelin writes:
> So please: as soon as you have a concrete suggestion where to use cyan
> (and preferably even a DIFF_* constant to feed to diff_get_color_opt()), I
> will be more than interested.
I do not think Stefan's comment was that he was keen to
On Thu, May 3, 2018 at 10:51 PM, Eric Sunshine wrote:
> On Thu, May 3, 2018 at 11:30 AM, Johannes Schindelin
> wrote:
>> Note: while we now parse diff options such as --color, the effect is not
>> yet the same as in tbdiff, where also the
Ben Peart writes:
I'd downcase the verb on the subject.
> Add the ability to control rename detection for merge via a config setting.
> This setting behaves the same and defaults to the value of diff.renames but
> only
> applies to merge.
>
> Reviewed-by: Johannes
Ich bin Sgt.Monica Lin Brown, ursprünglich aus Lake Jackson Texas USA. Ich habe
persönlich eine spezielle Recherche auf der Internetseite durchgeführt und bin
auf Ihre Informationen gestoßen. Ich schreibe Ihnen diese Mail von U.S.
Military Base Kabul Afghanistan. Ich habe einen gesicherten
On Thu, May 3, 2018 at 11:30 AM, 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
> beginnger.
s/beginnger/beginner/
> This brings branch-diff
Jakub Narebski writes:
> I think the problem is not with aligning, otherwise we would simply get
> bad aling, and not visible corruption. The ACTUAL PROBLEM is most
> probably because of concatenating strings marked as UTF-8 and strings
> not marked as UTF-8. Strange things
On Thu, May 3, 2018 at 11:30 AM, Johannes Schindelin
wrote:
> At this stage, `git branch-diff` can determine corresponding commits of
> two related commit ranges. This makes use of the recently introduced
> implementation of the Hungarian algorithm.
>
> The core of
On Thu, May 3, 2018 at 11:30 AM, 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:
> the next commits will turn `branch-diff` into a full-blown
"brian m. carlson" writes:
> ... We can help both AsciiDoc and Asciidoctor do the right thing
> here (and keep our 8-space tabs) by enclosing the diagram in a block
> like so:
>
> [literal]
> --
>Args Expanded argumentsSelected commits
>D
Jonathan Tan writes:
> On Thu, 3 May 2018 11:58:59 -0700
> Stefan Beller wrote:
>
>> > + test_must_fail git -C server serve --stateless-rpc /dev/null
>> > 2>err &&
>>
>> Minor nit:
>> Why do we pipe stdout to /dev/null ?
>
> Usually there's
Ævar Arnfjörð Bjarmason writes:
> The reason I'm doing this is because I found it confusing that I can't
> do:
>
> for t in tag commit tree blob; do ./git --exec-path=$PWD rev-parse
> 7452^{$t}; done
>
> And get, respectively, only the SHAs that match the respective type,
On Wed, May 02, 2018 at 08:20:54AM +0200, Martin Ågren wrote:
> On 2 May 2018 at 06:50, Junio C Hamano wrote:
> > Martin Ågren writes:
> >
> >> The diagram renders fine in AsciiDoc before and after this patch.
> >> Asciidoctor, on the other hand,
On Tue, May 01, 2018 at 12:42:57PM +0200, Duy Nguyen wrote:
> On Mon, Apr 23, 2018 at 11:39:49PM +, brian m. carlson wrote:
> > Several of our shell scripts hard-code the object ID of the empty tree.
> > To avoid any problems when changing hashes, compute this value on
> > startup of the
The upload-pack code paths never call git_config() with
upload_pack_config() when protocol v2 is used, causing options like
uploadpack.packobjectshook to not take effect. Ensure that this function
is called.
Signed-off-by: Jonathan Tan
---
t/t5702-protocol-v2.sh | 14
The fetch-pack/upload-pack protocol v2 was developed independently of
the filter parameter (used in partial fetches), thus it did not include
support for it. Add support for the filter parameter.
Like in the legacy protocol, the server advertises and supports "filter"
only if
Fix a typo in an error message.
Also, this line was introduced in 3145ea957d2c ("upload-pack: introduce
fetch server command", 2018-03-15), which did not contain a test for the
case which causes this error to be printed, so introduce a test.
Signed-off-by: Jonathan Tan
Changes from v2: followed all Stefan's comments.
Jonathan Tan (3):
upload-pack: fix error message typo
upload-pack: read config when serving protocol v2
{fetch,upload}-pack: support filter in protocol v2
Documentation/technical/protocol-v2.txt | 9 ++
fetch-pack.c
On Thu, 3 May 2018 12:08:16 -0700
Stefan Beller wrote:
> test_path_is_missing ?
Thanks for the pointer. Done.
> > + GIT_TRACE=/tmp/y git -c protocol.version=2 clone
> > "file://$(pwd)/server" client &&
>
> Why do we redirect GIT_TRACE outside the test suite? do we
On Thu, 3 May 2018 11:58:59 -0700
Stefan Beller wrote:
> > + test_must_fail git -C server serve --stateless-rpc /dev/null
> > 2>err &&
>
> Minor nit:
> Why do we pipe stdout to /dev/null ?
Usually there's a binary packfile produced, but not in this case. I'll
remove
From: "Johannes Schindelin"
From: Thomas Rast
These are essentially lifted from https://github.com/trast/tbdiff, with
light touch-ups to account for the new command name.
Apart from renaming `tbdiff` to `branch-diff`, only one test case needed
On 03/05/18 21:25, Johannes Schindelin wrote:
> On Thu, 3 May 2018, Ramsay Jones wrote:
>> On 03/05/18 16:30, Johannes Schindelin wrote:
[snip]
>>> diff --git a/builtin/branch-diff.c b/builtin/branch-diff.c
>>> new file mode 100644
>>> index 000..97266cd326d
>>> --- /dev/null
>>> +++
When a user provides a todo list containing something like
reset [new root]
merge my-branch
let's do the same as if pulling into an orphan branch: simply
fast-forward.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 12
This patch extracts the code from is_index_unchanged() to initialize or
update the index' cache tree (i.e. a tree object reflecting the current
index' top-level tree).
The new helper will be used in the upcoming code to support `git rebase
-i --root` via the sequencer.
Signed-off-by: Johannes
Reported by Wink Saville: when rebasing with no-rebase-cousins, we
will want to refrain from rebasing all of them, even when they are
root commits.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 3 ++-
t/t3430-rebase-merges.sh | 25
When an interactive rebase wants to recreate a root commit, it
- first creates a new, empty root commit,
- checks it out,
- converts the next `pick` command so that it amends the empty root
commit
Introduce support in the sequencer to handle such an empty root commit,
by looking for the file
When I reimplemented the most performance-critical bits of the
interactive rebase in the sequencer, to speed up `git rebase -i`
particularly on Windows (even if the benefits are still quite notable on
Linux or macOS), I punted on the --root part.
I had always hoped that some other contributor (or
In the context of the new --rebase-merges mode, which was designed
specifically to allow for changing the existing branch topology
liberally, a user may want to extract commits into a completely fresh
branch that starts with a newly-created root commit.
This is now possible by inserting the
In this developer's earlier attempt to accelerate interactive rebases by
converting large parts from Unix shell script into portable, performant
C, the --root handling was specifically excluded (to simplify the task a
little bit; it still took over a year to get that reduced set of patches
into
On Wed, May 2, 2018 at 11:22 AM, Duy Nguyen wrote:
> I think the two have quite different characteristics. alloc.c code is
> driven by overhead. struct blob is only 24 bytes each and about 1/3
> the repo is blobs, and each malloc has 16 bytes overhead or so if I
> remember
Signed-off-by: Stefan Beller
---
>> The reason for my doubt is the potential quadratic behavior for new
>> allocations,
>> in mem_pool_alloc() we walk all mp_blocks to see if we can fit the requested
>> allocation in one of the later blocks.
>> So if we call mem_pool_alloc a
Hi Paul,
On Fri, 4 May 2018, Paul-Sebastian Ungureanu wrote:
> The community bonding period started. It is well known that for a
> greater rate of success, it is recommended to send weekly reports
> regarding project status. But, what would be a good form for such a
> report? I, for one, think
Hi Stefan,
On Thu, 3 May 2018, Stefan Beller wrote:
> >> In addition to that patch, we'd have to buffer commit messages and
> >> buffer multiple commits, as that only buffers a diff of a single
> >> commit.
> >
> > ... and make sure that the moved-code logic (which is currently the
> > only user
On Thu, May 3, 2018 at 11:05 AM, Ævar Arnfjörð Bjarmason
wrote:
>
> On Thu, May 03 2018, 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 list) is slightly
Hi Stefan,
On Thu, 3 May 2018, Stefan Beller wrote:
> On Thu, May 3, 2018 at 1:42 PM, Johannes Schindelin
> wrote:
>
> >> Speaking of colors, for origin/sb/blame-color Junio hinted at re-using
> >> cyan for "uninteresting" parts to deliver a consistent color scheme
Hello everybody,
The community bonding period started. It is well known that for a
greater rate of success, it is recommended to send weekly reports
regarding project status. But, what would be a good form for such a
report? I, for one, think that starting a blog is one of the best
options
> To be honest, the main reason I spawn here is that I did not want to be
> bothered with resetting the commit flags after traversing the first commit
> range. But I guess I was just too cheap and should really do it?
Oh right, you'd have to do multiple revision walks.
> OTOH spawning here is a
> -Original Message-
> From: git-ow...@vger.kernel.org On Behalf Of
> Stefan Beller
> Sent: Thursday, May 3, 2018 4:59 PM
> To: Duy Nguyen
> Cc: Jameson Miller ; git@vger.kernel.org;
> gits...@pobox.com;
On Thu, May 3, 2018 at 1:42 PM, Johannes Schindelin
wrote:
>> Speaking of colors, for origin/sb/blame-color Junio hinted at re-using
>> cyan for "uninteresting" parts to deliver a consistent color scheme for
>> Git. Eventually he dreams of having 2 layers of
Hi Ævar,
On Thu, 3 May 2018, Ævar Arnfjörð Bjarmason wrote:
> On Thu, May 03 2018, 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
> > list) is slightly less useful for
Hi Stefan,
On Thu, 3 May 2018, Stefan Beller wrote:
> On Thu, May 3, 2018 at 8:30 AM, Johannes Schindelin
> wrote:
> > From: Thomas Rast
> >
> > These are essentially lifted from https://github.com/trast/tbdiff, with
> > light touch-ups to
Hi Ævar,
On Thu, 3 May 2018, Ævar Arnfjörð Bjarmason wrote:
> On Thu, May 03 2018, Johannes Schindelin wrote:
>
> > *before* the existing emtpy line. And apparently xdiff picks a different
>
> s/emtpy/empty/
Thanks for the spell check!
Dscho
Hi Stefan,
On Thu, 3 May 2018, Stefan Beller wrote:
> On Thu, May 3, 2018 at 8:30 AM, Johannes Schindelin
> wrote:
>
> > Note: due to differences in the diff algorithm (`tbdiff` uses the
> > Pythong module `difflib`, Git uses its xdiff fork), the cost matrix
> >
On Thu, May 3, 2018 at 12:17 PM, Duy Nguyen wrote:
>
>> To me it is also a clear yes when it comes to combining these
>> two memory pools.
>
> I also did not notice that jm/mem-pool already landed in master.
Oh, thanks for telling! Now that I look at it, I am doubting it;
The
Hi Ramsay,
On Thu, 3 May 2018, Ramsay Jones wrote:
> On 03/05/18 16:30, Johannes Schindelin wrote:
> > At this stage, `git branch-diff` can determine corresponding commits of
> > two related commit ranges. This makes use of the recently introduced
> > implementation of the Hungarian algorithm.
>
Hi Stefan,
On Thu, 3 May 2018, Stefan Beller wrote:
> On Thu, May 3, 2018 at 8:30 AM, 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
> >
Hi Duy,
On Thu, 3 May 2018, Johannes Schindelin wrote:
> On Thu, 3 May 2018, Duy Nguyen wrote:
>
> > On Thu, May 3, 2018 at 5:30 PM, Johannes Schindelin
> > wrote:
> > > diff --git a/command-list.txt b/command-list.txt
> > > index a1fad28fd82..c89ac8f417f 100644
> >
Hi Duy,
On Thu, 3 May 2018, Duy Nguyen wrote:
> On Thu, May 3, 2018 at 5:30 PM, Johannes Schindelin
> wrote:
> > diff --git a/command-list.txt b/command-list.txt
> > index a1fad28fd82..c89ac8f417f 100644
> > --- a/command-list.txt
> > +++ b/command-list.txt
> > @@
Hi Ramsay,
On Thu, 3 May 2018, Ramsay Jones wrote:
> On 03/05/18 16:30, 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:
> > the next commits will turn `branch-diff`
Hi Jonathan,
On Tue, May 1, 2018 at 5:31 PM, Jonathan Tan wrote:
> The fetch-pack/upload-pack protocol v2 was developed independently of
> the filter parameter (used in partial fetches), thus it did not include
> support for it. Add support for the filter parameter.
>
>
On Thu, May 3, 2018 at 1:15 PM, Johannes Sixt wrote:
> It is possible to configure 'less', the pager, to use an alternate
> screen to show the content, for example, by setting LESS=RS in the
> environment. When it is closed in this configuration, it switches
> back to the original
On Thu, May 3, 2018 at 7:21 PM, Stefan Beller wrote:
> On Thu, May 3, 2018 at 9:35 AM, Duy Nguyen wrote:
>> On Mon, Apr 30, 2018 at 5:31 PM, Jameson Miller wrote:
>>> This patch series improves the performance of loading indexes by
On Tue, May 1, 2018 at 5:31 PM, Jonathan Tan wrote:
> The upload-pack code paths never call git_config() with
> upload_pack_config() when protocol v2 is used, causing options like
> uploadpack.packobjectshook to not take effect. Ensure that this function
> is called.
>
>
On Tue, May 1, 2018 at 5:31 PM, Jonathan Tan wrote:
> Fix a typo in an error message.
>
> Also, this line was introduced in 3145ea957d2c ("upload-pack: introduce
> fetch server command", 2018-03-15), which did not contain a test for the
> case which causes this error to
The subcommand 'commit-diff' does not support the option
'--add-author-from'.
Signed-off-by: Andreas Heiduk
Signed-off-by: Eric Wong
---
Documentation/git-svn.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-svn.txt
Explain that `git ls-files --ignored` requires at least one
of the `--exclude*` options to do its job.
Signed-off-by: Andreas Heiduk
---
Documentation/git-ls-files.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-ls-files.txt
Signed-off-by: Andreas Heiduk
Reviewed-by: Junio C Hamano
---
Documentation/revisions.txt | 6 ++
1 file changed, 6 insertions(+)
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index dfcc49c72c..e760416d07 100644
---
Add the missing `-o` shortcut for `--push-option` to the synopsis.
Add the missing `-d` shortcut for `--delete` in the main section.
Signed-off-by: Andreas Heiduk
Reviewed-by: Martin Ågren
---
Documentation/git-push.txt | 3 ++-
1 file changed, 2
SYNOPSIS and other manuals use [options] but DESCRIPTION
used [--options].
Signed-off-by: Andreas Heiduk
---
Documentation/git-diff.txt | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
Make the two '' parameters in DESCRIPTION mandatory and
move the `--options` part to the same place where the other
variants show them. And finally make `--no-index` in SYNOPSIS
as mandatory as in DESCRIPTION.
Signed-off-by: Andreas Heiduk
Reviewed-by: Martin Ågren
Typeset commands and similar things with as `git foo` instead of
'git foo' or 'git-foo' and add linkgit to the commands which run
the hooks.
Signed-off-by: Andreas Heiduk
Reviewed-by: Martin Ågren
---
Documentation/githooks.txt | 115
Changes since the last reroll:
- Better commit comment for "doc: align 'diff --no-index' in text and synopsis"
This includes Martin's `s/with/and/` comment.
- Eric's typo fix in "doc: add note about shell quoting to revision.txt"
- Added new patch for git-diff.txt with s/--options/options/.
Derrick Stolee writes:
> The static remove_redundant() method is used to filter a list
> of commits by removing those that are reachable from another
> commit in the list. This is used to remove all possible merge-
> bases except a maximal, mutually independent set.
>
> To
On Thu, May 3, 2018 at 10:47 AM, Jonathan Tan wrote:
> On Wed, 2 May 2018 17:53:54 -0700
> Stefan Beller wrote:
>
>> From: Prathamesh Chavan
>>
>> When running 'git submodule foreach --recursive' from a subdirectory of
>> your
On Thu, May 03 2018, 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 list) is slightly
> less useful for this developer due to the fact that it requires the
> `hungarian`
>
On Wed, 2 May 2018 17:53:58 -0700
Stefan Beller wrote:
> + argv_array_pushf(, "path=%s; %s",
> + path, info->argv[0]);
Do we need to quote the path here? (For example, what if path has a
quotation mark?)
Also, would it be useful to
On Wed, 2 May 2018 17:53:56 -0700
Stefan Beller wrote:
> $name is the name of the relevant submodule section in `.gitmodules`,
> $sm_path is the path of the submodule as recorded in the superproject,
> $sha1 is the commit as recorded in the superproject,
On Wed, 2 May 2018 17:53:55 -0700
Stefan Beller wrote:
> foreach [--recursive] ::
> Evaluates an arbitrary shell command in each checked out submodule.
> - The command has access to the variables $name, $path, $sha1 and
> + The command has access to the
On Wed, 2 May 2018 17:53:54 -0700
Stefan Beller wrote:
> From: Prathamesh Chavan
>
> When running 'git submodule foreach --recursive' from a subdirectory of
> your repository, nested submodules get a bogus value for $path:
I know I said in a previous
On Thu, May 3, 2018 at 7:24 PM, Stefan Beller wrote:
>>> +void clear_alloc_state(struct alloc_state *s)
>>> +{
>>> + while (s->slab_nr > 0) {
>>> + s->slab_nr--;
>>> + free(s->slabs[s->slab_nr]);
>>
>> I think you're leaking memory here.
On Wed, May 2, 2018 at 1:50 PM, Jonathan Tan wrote:
> On Tue, 1 May 2018 14:34:03 -0700
> Stefan Beller wrote:
>
>> +void *allocate_alloc_state(void)
>> +{
>> + return xcalloc(1, sizeof(struct alloc_state));
>> +}
>> +
>> +void
On Wed, May 2, 2018 at 10:44 AM, Duy Nguyen wrote:
> On Tue, May 1, 2018 at 11:34 PM, Stefan Beller wrote:
>> #include "cache.h"
>> #include "object.h"
>> @@ -30,8 +31,25 @@ struct alloc_state {
>> int count; /* total number of nodes allocated */
On Thu, May 3, 2018 at 9:35 AM, Duy Nguyen wrote:
> On Mon, Apr 30, 2018 at 5:31 PM, Jameson Miller wrote:
>> This patch series improves the performance of loading indexes by
>> reducing the number of malloc() calls. Loading the index from disk is
>>
It is possible to configure 'less', the pager, to use an alternate
screen to show the content, for example, by setting LESS=RS in the
environment. When it is closed in this configuration, it switches
back to the original screen, and all content is gone.
It is not uncommon to request that the
On Thu, May 3, 2018 at 8:30 AM, Johannes Schindelin
wrote:
> From: Thomas Rast
>
> These are essentially lifted from https://github.com/trast/tbdiff, with
> light touch-ups to account for the new command name.
>
> Apart from renaming `tbdiff` to
On Thu, May 3, 2018 at 8:30 AM, Johannes Schindelin
wrote:
> Note: due to differences in the diff algorithm (`tbdiff` uses the
> Pythong module `difflib`, Git uses its xdiff fork), the cost matrix
> calculated by `branch-diff` is different (but very similar) to the
On Thu, May 03 2018, Johannes Schindelin wrote:
> *before* the existing emtpy line. And apparently xdiff picks a different
s/emtpy/empty/
Hi,
On Wed, May 02, 2018 at 07:30:25AM +, Middelschulte, Leif wrote:
> Am Montag, den 30.04.2018, 19:02 +0200 schrieb Heiko Voigt:
> > On Thu, Apr 26, 2018 at 03:19:36PM -0700, Stefan Beller wrote:
> > > Stefan wrote:
> > > > See
> > > >
Hi Johannes,
On Thu, May 3, 2018 at 8:30 AM, 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:
> the next commits will turn `branch-diff` into a
On Thu, May 3, 2018 at 5:30 PM, Johannes Schindelin
wrote:
> diff --git a/command-list.txt b/command-list.txt
> index a1fad28fd82..c89ac8f417f 100644
> --- a/command-list.txt
> +++ b/command-list.txt
> @@ -19,6 +19,7 @@ git-archive
On Mon, Apr 30, 2018 at 5:31 PM, Jameson Miller wrote:
> This patch series improves the performance of loading indexes by
> reducing the number of malloc() calls. Loading the index from disk is
> partly dominated by the time in malloc(), which is called for each
> index
On 03/05/18 16:30, Johannes Schindelin wrote:
> At this stage, `git branch-diff` can determine corresponding commits of
> two related commit ranges. This makes use of the recently introduced
> implementation of the Hungarian algorithm.
>
> The core of this patch is a straight port of the ideas
On Mon, Apr 30, 2018 at 5:31 PM, Jameson Miller wrote:
> Add an option (controlled by an environment variable) perform extra
> validations on mem_pool allocated cache entries. When set:
>
> 1) Invalidate cache_entry memory when discarding cache_entry.
>
> 2) When
Another I noticed in the jm/mem-pool series is this loop in mem_pool_alloc()
for (p = mem_pool->mp_block; p; p = p->next_block)
if (p->end - p->next_free >= len)
break;
You always go from the start (mp_block) but at some point those first
blocks are filled up and we don't
On 03/05/18 16:30, 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:
> the next commits will turn `branch-diff` into a full-blown replacement
> for `tbdiff`.
>
> At this
On Tue, Apr 17, 2018 at 12:33 PM, Taylor Blau wrote:
>
> On Tue, Apr 17, 2018 at 12:08:20PM -0600, Ben Toews wrote:
> > On Mon, Apr 16, 2018 at 7:54 PM, Junio C Hamano wrote:
> > > "brian m. carlson" writes:
> > >
> > >> If we
Tab completion of `branch-diff` is very convenient, especially given
that the revision arguments that need to be passed to `git branch-diff`
are typically more complex than, say, your grandfather's `git log`
arguments.
Without this patch, we would only complete the `branch-diff` part but
not the
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
---
Documentation/git-branch-diff.txt | 239 ++
1 file changed,
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 and postimage is colored like the
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 machinery spits out a
white-space
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
---
builtin/branch-diff.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/builtin/branch-diff.c
When showing what changed between old and new commits, we show a diff of
the patches. This diff is a diff between diffs, therefore there are
nested +/- signs, and it can be relatively hard to understand what is
going on.
With the --dual-color option, the preimage and the postimage are colored
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
---
color.h | 6 ++
1
From: Thomas Rast
These are essentially lifted from https://github.com/trast/tbdiff, with
light touch-ups to account for the new command name.
Apart from renaming `tbdiff` to `branch-diff`, only one test case needed
to be adjusted: 11 - 'changed message'.
The underlying
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
---
builtin/branch-diff.c | 9 +
1 file
Arguably the most important part of branch-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 the
first line in `git show`'s
1 - 100 of 126 matches
Mail list logo