Re: [PATCH v4 1/1] commit-reach: properly peel tags and clear flags

On Mon, Sep 24, 2018 at 4:58 PM Derrick Stolee via GitGitGadget wrote: > diff --git a/commit-reach.c b/commit-reach.c > @@ -544,20 +544,42 @@ int can_all_from_reach_with_flag(struct object_array > *from, > { > + from_one = deref_tag(the_repository, from_one, > +

Re: Git for games working group

On Mon, Sep 24, 2018 at 12:58 PM Taylor Blau wrote: > I'm replying to this part of the email to note that this would cause Git > LFS to have to do some extra work, since running 'git lfs install' > already writes to .git/hooks/post-commit (ironically, to detect and > unlock locks that we should

Re: [PATCH 3/8] refs: new ref types to make per-worktree refs visible to all worktrees

On Sat, Sep 22, 2018 at 11:05 AM Nguyễn Thái Ngọc Duy wrote: > > One of the problems with multiple worktree is accessing per-worktree > refs of one worktree from another worktree. This was sort of solved by > multiple ref store, where the code can open the ref store of another > worktree and has

Re: [PATCH 2/8] Add a place for (not) sharing stuff between worktrees

On Sat, Sep 22, 2018 at 11:05 AM Nguyễn Thái Ngọc Duy wrote: > > When multiple worktrees are used, we need rules to determine if > something belongs to one worktree or all of them. Instead of keeping > adding rules when new stuff comes, have a generic rule: > > - Inside $GIT_DIR, which is

Re: [PATCH v2] mailmap: consistently normalize brian m. carlson's name

brian m. carlson wrote: > On Mon, Sep 24, 2018 at 10:39:02AM -0700, Jonathan Nieder wrote: >> brian m. carlson wrote: >>> I think this commit message makes sense. [...] >> What would it take to make the patch make >> sense, too? ;-) > > I certainly didn't mean to

Re: [PATCH] submodule.c: Make get_superproject_working_tree() work when supermodule has unmerged changes of the submodule reference

On Mon, Sep 24, 2018 at 2:25 PM Sam McKelvie wrote: Thanks for writing a patch! I wonder if we can shorten the subject and make it a bit more concise, how about submodule: Alllow staged changes for get_superproject_working_tree or rev-parse: allow staged submodule in

Re: [PATCH v2] mailmap: consistently normalize brian m. carlson's name

On Mon, Sep 24, 2018 at 10:39:02AM -0700, Jonathan Nieder wrote: > Hi, > > brian m. carlson wrote: > > > I think this commit message makes sense. I apparently still fail to > > understand how the .mailmap format works, so I can't tell you if the > > patch is correct. > > Thanks for looking it

Re: [RFC PATCH 3/3] diff: add --color-moved-ws=allow-mixed-indentation-change

On Mon, Sep 24, 2018 at 3:06 AM Phillip Wood wrote: > > From: Phillip Wood > > This adds another mode for highlighting lines that have moved with an > indentation change. Unlike the existing > --color-moved-ws=allow-indentation-change setting this mode uses the > visible change in the

Re: What's cooking in git.git (Sep 2018, #05; Mon, 24)

On 9/24/2018 6:06 PM, Junio C Hamano wrote: * ds/reachable (2018-09-21) 2 commits (merged to 'next' on 2018-09-21 at d4cd62108e) + commit-reach: fix memory and flag leaks + commit-reach: properly peel tags Recent update broke the reachability algorithm when refs (e.g. tags) that

Re: [BUG] A part of an edge from an octopus merge gets colored, even with --color=never

On Sat, 8 Sep 2018 at 12:13, Jeff King wrote: > Great (and sorry for the delayed response). No problem, I know it's not the most urgent bug ever :) > So I think this is doing the right thing. I'm not sure if there's a > better way to explain "dashless" or not. I've updated the comments and

Re: git silently ignores include directive with single quotes

On 2018-09-24 02:08 PM, Ævar Arnfjörð Bjarmason wrote: [...] > Posting to this mailing list is generally how it's done Thank you, Ævar, for clarifying that there is no issue tracker for the git project. > The best way to fix stuff in git that you can't interest others in is to > do it yourself.

Re: [RFC PATCH 1/3] xdiff-interface: make xdl_blankline() available

On Mon, Sep 24, 2018 at 3:06 AM Phillip Wood wrote: > > From: Phillip Wood > > This will be used by the move detection code. > > Signed-off-by: Phillip Wood > --- > xdiff-interface.c | 5 + > xdiff-interface.h | 5 + > 2 files changed, 10 insertions(+) > > diff --git

Re: [PATCH v2 3/3] transport.c: introduce core.alternateRefsPrefixes

On Mon, Sep 24, 2018 at 02:55:57PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > Do you have an opinion on whether for_each_alternate_refs() interface > > should stop passing back refnames? By the "they may not even exist" > > rationale in this sub-thread, I think it's probably foolish

Re: [PATCH v5 1/9] submodule: add a print_config_from_gitmodules() helper

> > +int print_config_from_gitmodules(const char *key) > > I am thinking about adding a "struct repository" argument to this > function Sounds like a good idea.

Re: [PATCH 0/1] Re: git silently ignores include directive with single quotes

On 2018-09-24 03:24 PM, Philip Oakley wrote: > Rather than attaching the problem with code, I decided to simply update > the config file documentation. > > As the userbase expands the documentation will need to be more comprehensive > about exclusions and omissions, along with better highlighting

[PATCH 0/1] Re: git silently ignores include directive with single quotes

Rather than attaching the problem with code, I decided to simply update the config file documentation. As the userbase expands the documentation will need to be more comprehensive about exclusions and omissions, along with better highlighting for core areas. I would be useful if Stas could

[PATCH 1/1] config doc: highlight the name=value syntax

Stas Bekman reported [1] that Git config was not accepting single quotes around a filename as may have been expected by shell users. Highlight the 'name = value' syntax with its own heading. Clarify that single quotes are not special here. Also point to this paragraph in the 'include' section

Re: [PATCH 1/1] read-cache: update index format default to v4

SZEDER Gábor writes: > On Mon, Sep 24, 2018 at 02:15:30PM -0700, Derrick Stolee via GitGitGadget > wrote: >> From: Derrick Stolee >> >> The index v4 format has been available since 2012 with 9d22778 >> "reach-cache.c: write prefix-compressed names in the index". Since >> the format has been

Re: bug in 'git describe'?

Sebastian Kuzminsky writes: > I've got two tiny git repos whose commit graphs are identical, but > where 'git describe' gives different results. > ... > The histories differ only in the timestamps of the commits... describe does take the commit timestamps into account, so it is expected you

What's cooking in git.git (Sep 2018, #05; Mon, 24)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. The tip of 'master' has been

bug in 'git describe'?

I think I've run in to a bug in 'git describe' (reproduced with git 2.11.0, 2.16.1, and 2.19.0.221.g150f307af). I've got two tiny git repos whose commit graphs are identical, but where 'git describe' gives different results. * merge 1.1 into 2.0 (HEAD -> release-2.0) |\ | *

Re: [PATCH v2 3/3] transport.c: introduce core.alternateRefsPrefixes

Jeff King writes: > Do you have an opinion on whether for_each_alternate_refs() interface > should stop passing back refnames? By the "they may not even exist" > rationale in this sub-thread, I think it's probably foolish for any > caller to actually depend on the names being meaningful. I

Re: [PATCH 1/1] read-cache: update index format default to v4

On Mon, Sep 24, 2018 at 02:15:30PM -0700, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee > > The index v4 format has been available since 2012 with 9d22778 > "reach-cache.c: write prefix-compressed names in the index". Since > the format has been stable for so long, almost all

Re: [PATCH] ref-filter: don't look for objects when outside of a repository

On Mon, Sep 24, 2018 at 11:20:34PM +0200, SZEDER Gábor wrote: > > Would we perhaps want to give the user a hint that the object is not > > really missing, but rather that we're not in a repository? E.g., > > something like: > > > > if (!have_git_dir()) > > return strbuf_addf_ret(err, -1,

[PATCH] submodule.c: Make get_superproject_working_tree() work when supermodule has unmerged changes of the submodule reference

Previously, "fatal: BUG: returned path string doesn't match cwd?" is displayed and git-rev-parse aborted. The problem is due to the fact that when a merge of the submodule reference is in progress, "git --stage —full-name ” returns three seperate entries for the submodule

Re: [PATCH] ref-filter: don't look for objects when outside of a repository

On Mon, Sep 24, 2018 at 02:17:22PM -0400, Jeff King wrote: > On Sat, Sep 22, 2018 at 04:11:45PM +0200, SZEDER Gábor wrote: > > diff --git a/ref-filter.c b/ref-filter.c > > index e1bcb4ca8a..3555bc29e7 100644 > > --- a/ref-filter.c > > +++ b/ref-filter.c > > @@ -1473,7 +1473,8 @@ static int

[PATCH 1/1] read-cache: update index format default to v4

From: Derrick Stolee The index v4 format has been available since 2012 with 9d22778 "reach-cache.c: write prefix-compressed names in the index". Since the format has been stable for so long, almost all versions of Git in use today understand version 4, removing one barrier to upgrade -- that

[PATCH 0/1] read-cache: update index format default to v4

After discussing this with several people off-list, I thought I would open the question up to the list: Should we update the default index version to v4? The .git/index file stores the list of every path tracked by Git in the working directory, including merge information, staged paths, and

Re: [PATCH v4 1/1] commit-reach: properly peel tags and clear flags

On Mon, Sep 24, 2018 at 01:57:52PM -0700, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee > > The can_all_from_reach_with_flag() algorithm was refactored in 4fbcca4e > "commit-reach: make can_all_from_reach... linear" but incorrectly > assumed that all objects provided were

Re: git silently ignores include directive with single quotes

On Sun, Sep 23 2018, Stas Bekman wrote: > Apologies for I don't know how this project manages issues, so I'm not > sure whether it is my responsibility to make sure this issue gets > resolved, or do you have some tracking mechanism where you have it > registered? There is no rush, I'm asking

Re: [PATCH v3 1/5] CodingGuidelines: add shell piping guidelines

On Thu, Sep 20, 2018 at 06:43:27PM -0700, Matthew DeVore wrote: > Add two guidelines: > > - pipe characters should appear at the end of lines, and not cause >indentation > - pipes should be avoided when they swallow exit codes that can >potentially fail > --- >

Re: [PATCH v3 4/4] wt-status.c: Set the committable flag in the collect phase.

Stephen Smith writes: > I can see three solutions and could support any of the three: > 1) Move the free calls to run_status() and cmd_status(). > 2) Move the calls calls to wt_status_print since that is the last function > from wt_status.c that is called befor the structure goes out of scope

Re: [PATCH v2 3/3] transport.c: introduce core.alternateRefsPrefixes

On Mon, Sep 24, 2018 at 04:50:22PM -0400, Jeff King wrote: > On Mon, Sep 24, 2018 at 01:32:26PM -0700, Junio C Hamano wrote: > > > Jeff King writes: > > > > > So I think it's conceptually consistent to always show a subset. > > > > OK. Then I agree with you that it is a good approach to

Re: [PATCH v5 9/9] submodule: support reading .gitmodules when it's not in the working tree

On Mon, Sep 24, 2018 at 3:20 AM Antonio Ospite wrote: > > The third call, however, looks at the nested submodule at > > 'submodule/sub', which doesn't contain a '.gitmodules' file. So this > > function goes on with the second condition and calls > > get_oid(GITMODULES_INDEX, ), which then

Re: [PATCH] git help: promote 'git help -av'

Jeff King writes: > I agree that "help -av" is likely to be more friendly. I kind of wonder > if it should just be the default for "-a". Do we have any obligation not > to change the format of that output? I know that at least older versions of git-completion.bash (I think it was up to 2.17.x

[PATCH v4 0/1] Properly peel tags in can_all_from_reach_with_flags()

As Peff reported [1], the refactored can_all_from_reach_with_flags() method does not properly peel tags. Since the helper method can_all_from_reach() and code in t/helper/test-reach.c all peel tags before getting to this method, it is not super-simple to create a test that demonstrates this. I

[PATCH v4 1/1] commit-reach: properly peel tags and clear flags

From: Derrick Stolee The can_all_from_reach_with_flag() algorithm was refactored in 4fbcca4e "commit-reach: make can_all_from_reach... linear" but incorrectly assumed that all objects provided were commits. During a fetch negotiation, ok_to_give_up() in upload-pack.c may provide unpeeled tags to

git clone works in ide but not git bash CLI

Howdy, I have a conundrum: App: Spring Cloud Config Server envvars: GIT_URL and SSH_KEY IDE: Intellij 2018.2.4 Ultimate When I use the IDE to assign the SSH_KEY value all is copacetic. If I assign the envvar at the Git Bash CLI: com.jcraft.jsch.JSchException: Auth fail Any guesses? Thanks

Re: [PATCH v2 3/3] transport.c: introduce core.alternateRefsPrefixes

On Mon, Sep 24, 2018 at 01:32:26PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > So I think it's conceptually consistent to always show a subset. > > OK. Then I agree with you that it is a good approach to first adopt > core.* knobs that universally apply, and add specialized ones as

Re: [PATCH v2 3/3] transport.c: introduce core.alternateRefsPrefixes

Jeff King writes: > So I think it's conceptually consistent to always show a subset. OK. Then I agree with you that it is a good approach to first adopt core.* knobs that universally apply, and add specialized ones as they are needed later. Thanks.

Re: [PATCH] git help: promote 'git help -av'

On Mon, Sep 24, 2018 at 03:20:00PM -0500, Taylor Blau wrote: > On Mon, Sep 24, 2018 at 02:19:28PM -0400, Jeff King wrote: > > On Sat, Sep 22, 2018 at 07:47:07PM +0200, Nguyễn Thái Ngọc Duy wrote: > > > > > When you type "git help" (or just "git") you are greeted with a list > > > with commonly

Re: [PATCH] git help: promote 'git help -av'

On Mon, Sep 24, 2018 at 02:19:28PM -0400, Jeff King wrote: > On Sat, Sep 22, 2018 at 07:47:07PM +0200, Nguyễn Thái Ngọc Duy wrote: > > > When you type "git help" (or just "git") you are greeted with a list > > with commonly used commands and their short description and are > > suggested to use

Re: [PATCH] Add an EditorConfig file

"brian m. carlson" writes: >> But that is a response in a dream-world. If there is no such tool, >> I am perfectly OK if the plan is to manually keep them (loosely) in >> sync. I do not think it is good use of our time to try to come up >> with such a tool (unless somebody is really interested

Re: Git for games working group

On Mon, Sep 24, 2018 at 08:34:44AM -0700, John Austin wrote: > Perhaps git-global-graph is a decent name. GGG? G3? :). The structure > right now in my head looks a bit like: > > Global Graph: > client - post-commit git hooks to push changes up to the GG I'm replying to this part of the email

Re: "git rev-parse --show-superproject-working-tree" fails with "fatal: BUG: returned path string doesn't match cwd?" if supermodule has unmerged changes of the submodule reference

On Mon, Sep 24, 2018 at 10:59 AM Sam McKelvie wrote: > > I experienced this problem using git 2.17.1; however, from inspection of the > next branch, function get_superproject_working_tree() in submodule.c has not > changed in 2 years. > > I believe the problem is related to the fact that when a

Re: [PATCH v3 2/2] commit-reach: fix memory and flag leaks

On Mon, Sep 24, 2018 at 01:25:12PM -0400, Derrick Stolee wrote: > On 9/21/2018 7:58 PM, Jeff King wrote: > > On Fri, Sep 21, 2018 at 08:05:27AM -0700, Derrick Stolee via GitGitGadget > > wrote: > > > > > From: Derrick Stolee > > > > > > The can_all_from_reach_with_flag() method uses

Re: [PATCH 1/3] t7001: reformat to newer style

On Mon, Sep 24, 2018 at 6:31 AM Derrick Stolee wrote: > > On 9/21/2018 7:58 PM, Stefan Beller wrote: > > The old formatting style is a real hindrance of getting people up to speed > > contributing as they use existing code as an example and follow that style. > > So let's get rid of the old style

Re: [PATCH] git help: promote 'git help -av'

On Sat, Sep 22, 2018 at 07:47:07PM +0200, Nguyễn Thái Ngọc Duy wrote: > When you type "git help" (or just "git") you are greeted with a list > with commonly used commands and their short description and are > suggested to use "git help -a" or "git help -g" for more details. > > "git help -av"

Re: [PATCH] ref-filter: don't look for objects when outside of a repository

On Sat, Sep 22, 2018 at 04:11:45PM +0200, SZEDER Gábor wrote: > The command 'git ls-remote --sort=authordate ' segfaults when > run outside of a repository, ever since the introduction of its > '--sort' option in 1fb20dfd8e (ls-remote: create '--sort' option, > 2018-04-09). > > While in general

Re: [PATCH v2 3/3] transport.c: introduce core.alternateRefsPrefixes

On Mon, Sep 24, 2018 at 08:17:14AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > I was suggesting that check_everything_connected() is not strictly > > transport-related, so would be inappropriate for transport.*, and we'd > > need a more generic name. And my "either way" was that I

"git rev-parse --show-superproject-working-tree" fails with "fatal: BUG: returned path string doesn't match cwd?" if supermodule has unmerged changes of the submodule reference

I experienced this problem using git 2.17.1; however, from inspection of the next branch, function get_superproject_working_tree() in submodule.c has not changed in 2 years. I believe the problem is related to the fact that when a merge of the submodule reference is in progress, "git --stage

[PATCH v2] mailmap: consistently normalize brian m. carlson's name

v2.18.0-rc0~70^2 (mailmap: update brian m. carlson's email address, 2018-05-08) changed the mailmap to map sand...@crustytoothpaste.ath.cx -> brian m. carlson instead of sand...@crustytoothpaste.net -> brian m. carlson That means the mapping Brian M. Carlson -> brian m.

I want you to Distribute my funds to less priviledge if interested reply now

Re: [PATCH v3 2/2] commit-reach: fix memory and flag leaks

On 9/21/2018 7:58 PM, Jeff King wrote: On Fri, Sep 21, 2018 at 08:05:27AM -0700, Derrick Stolee via GitGitGadget wrote: From: Derrick Stolee The can_all_from_reach_with_flag() method uses 'assign_flag' as a value we can use to mark objects temporarily during our commit walk. The intent is

Re: Import/Export as a fast way to purge files from Git?

On Sun, Sep 23, 2018 at 6:08 AM Lars Schneider wrote: > > Hi, > > I recently had to purge files from large Git repos (many files, many commits). > The usual recommendation is to use `git filter-branch --index-filter` to purge > files. However, this is *very* slow for large repos (e.g. it takes

Re: [ANNOUNCE] Git v2.8.3

Thank you for sharing! ip19216811.site -- Sent from: http://git.661346.n2.nabble.com/

Re: [PATCH] ref-filter: don't look for objects when outside of a repository

SZEDER Gábor writes: > The command 'git ls-remote --sort=authordate ' segfaults when > run outside of a repository, ever since the introduction of its > '--sort' option in 1fb20dfd8e (ls-remote: create '--sort' option, > 2018-04-09). > > While in general the 'git ls-remote' command can be run

Re: [PATCH 1/3] t7001: reformat to newer style

Derrick Stolee writes: >> +test_expect_success 'moving the file back into subdirectory' ' >> +cd path0 && git mv ../path1/COPYING COPYING >> +' > > Split at &&, use subshell? Yes, I was almost going to point out the same, saying "'reformat to newer style' is much larger than only changing

Re: [PATCH] receive-pack: update comment with check_everything_connected

Jeff King writes: > That function is now called "check_connected()", but we forgot to update > this comment in 7043c7071c (check_everything_connected: use a struct > with named options, 2016-07-15). > > Signed-off-by: Jeff King > --- > Just a minor annoyance I happened to notice while

[PATCH] fetch-pack: approximate no_dependents with filter

Whenever a lazy fetch is performed for a tree object, any trees and blobs it directly or indirectly references will be fetched as well. There is a "no_dependents" argument in struct fetch_pack_args that indicates that objects that the wanted object references need not be sent, but it currently has

Re: Git for games working group

Perhaps git-global-graph is a decent name. GGG? G3? :). The structure right now in my head looks a bit like: Global Graph: client - post-commit git hooks to push changes up to the GG git server - just the standard git server configuration query server - replies with information

Re: [PATCH v2 3/3] transport.c: introduce core.alternateRefsPrefixes

Jeff King writes: > I was suggesting that check_everything_connected() is not strictly > transport-related, so would be inappropriate for transport.*, and we'd > need a more generic name. And my "either way" was that I could see > an argument that it _is_ transport related, since we only call it

Re: git fetch behaves weirdely when run in a worktree

On Sun, Sep 23, 2018 at 10:19 PM Kaartic Sivaraam wrote: > > Hi, > > I was actually trying to automae the building and installation of Git > source code to reduce my burden. I tried to automate it with the help > of a script that runs daily via cron and a separate worktree used only > by the

Re: [PATCH] worktree: add per-worktree config files

On Sun, Sep 23, 2018 at 07:04:38PM +0200, Nguyễn Thái Ngọc Duy wrote: > A new repo extension is added, worktreeConfig. When it is present: I was initially scratching my head at why this should be a repository extension, but... > - The special treatment for core.bare and core.worktree, to stay >

Re: Git for games working group

On Sun, Sep 23, 2018 at 12:53:58PM -0700, John Austin wrote: > On Sun, Sep 23, 2018 at 10:57 AM Randall S. Becker > wrote: > > I would even like to help with your effort and have non-unixy platforms > > I'd like to do this on. > > Having this separate from git LFS is an even better idea IMO,

Re: Git for games working group

On Sun, Sep 23, 2018 at 01:56:37PM -0400, Randall S. Becker wrote: > On September 23, 2018 1:29 PM, John Austin wrote: > > I've been putting together a prototype file-locking implementation for a > > system that plays better with git. What are everyone's thoughts on > > something like the

Re: [PATCH 1/3] t7001: reformat to newer style

On 9/21/2018 7:58 PM, Stefan Beller wrote: The old formatting style is a real hindrance of getting people up to speed contributing as they use existing code as an example and follow that style. So let's get rid of the old style and reformat it in our current style. I was suspicious of your

Re: [PATCH v3 1/2] commit-reach: properly peel tags

On 9/21/2018 7:56 PM, Jeff King wrote: On Fri, Sep 21, 2018 at 08:05:26AM -0700, Derrick Stolee via GitGitGadget wrote: + if (!from_one || from_one->type != OBJ_COMMIT) { + /* no way to tell if this is reachable by +* looking at the

Re: [RFC PATCH 0/3] diff --color-moved-ws: allow mixed spaces and tabs in indentation change

On 24/09/2018 11:06, Phillip Wood wrote: > From: Phillip Wood > > When trying out the new --color-moved-ws=allow-indentation-change I > was disappointed to discover it did not work if the indentation > contains a mix of spaces and tabs. This series adds a new option that > does. It's and RFC as

Re: [PATCH v5 1/9] submodule: add a print_config_from_gitmodules() helper

On Mon, 17 Sep 2018 16:09:32 +0200 Antonio Ospite wrote: > Add a new print_config_from_gitmodules() helper function to print values > from .gitmodules just like "git config -f .gitmodules" would. > [...] > +int print_config_from_gitmodules(const char *key) I am thinking about adding a

Re: [PATCH v5 9/9] submodule: support reading .gitmodules when it's not in the working tree

On Tue, 18 Sep 2018 19:12:57 +0200 SZEDER Gábor wrote: [...] > On Mon, Sep 17, 2018 at 04:09:40PM +0200, Antonio Ospite wrote: > > When the .gitmodules file is not available in the working tree, try > > using the content from the index and from the current branch. > > "from the index and from

[RFC PATCH 2/3] diff.c: remove unused variables

From: Phillip Wood The string lengths are not used in cmp_in_block_with_wsd() so lets remove them. Signed-off-by: Phillip Wood --- diff.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/diff.c b/diff.c index 9393993e33..0a652e28d4 100644 --- a/diff.c +++ b/diff.c

[RFC PATCH 3/3] diff: add --color-moved-ws=allow-mixed-indentation-change

From: Phillip Wood This adds another mode for highlighting lines that have moved with an indentation change. Unlike the existing --color-moved-ws=allow-indentation-change setting this mode uses the visible change in the indentation to group lines, rather than the indentation string. This means

[RFC PATCH 0/3] diff --color-moved-ws: allow mixed spaces and tabs in indentation change

From: Phillip Wood When trying out the new --color-moved-ws=allow-indentation-change I was disappointed to discover it did not work if the indentation contains a mix of spaces and tabs. This series adds a new option that does. It's and RFC as there are some open questions about how to proceed,

[RFC PATCH 1/3] xdiff-interface: make xdl_blankline() available

From: Phillip Wood This will be used by the move detection code. Signed-off-by: Phillip Wood --- xdiff-interface.c | 5 + xdiff-interface.h | 5 + 2 files changed, 10 insertions(+) diff --git a/xdiff-interface.c b/xdiff-interface.c index 9315bc0ede..eceabfa72d 100644 ---