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 other change has been made.
I kept Peff as the author and took the
From: Jeff King
Implement support for delta islands in git pack-objects
and document how delta islands work in
"Documentation/git-pack-objects.txt".
Signed-off-by: Jeff King
Signed-off-by: Christian Couder
---
Documentation/git-pack-objects.txt | 88 +++
From: Jeff King
Implement simple support for --delta-islands option and
repack.useDeltaIslands config variable in git repack.
Signed-off-by: Jeff King
Signed-off-by: Christian Couder
---
Documentation/config.txt | 4
Documentation/git-repack.txt | 5 +
builtin/repack.c
On Sat, Jul 21, 2018 at 6:05 PM Johannes Schindelin via GitGitGadget
wrote:
> 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
From: Jeff King
Hosting providers that allow users to "fork" existing
repos want as much as possible those forks to use a
small amount of disk space.
Using alternates to keep all the objects from all
the forks into a unique central repo is way to do
that, but it can have some drawbacks.
From: Jeff King
Signed-off-by: Jeff King
Signed-off-by: Christian Couder
---
t/t9930-delta-islands.sh | 143 +++
1 file changed, 143 insertions(+)
create mode 100755 t/t9930-delta-islands.sh
diff --git a/t/t9930-delta-islands.sh b/t/t9930-delta-islands.sh
From: Jeff King
As get_delta_base() will be used outside 'packfile.c' in
a following commit, let's make it non static and let's
declare it in 'packfile.h'.
Signed-off-by: Jeff King
Signed-off-by: Christian Couder
---
packfile.c | 10 +-
packfile.h | 3 +++
2 files changed, 8
On Sat, Jul 21, 2018 at 6:05 PM Thomas Rast via GitGitGadget
wrote:
> These are essentially lifted from https://github.com/trast/tbdiff, with
> light touch-ups to account for the command now being names `git
s/names/named/
> range-diff`.
>
> Apart from renaming `tbdiff` to `range-diff`, only
Hi,
On Sat, Jul 21, 2018 at 6:36 PM Beat Bolli wrote:
>
> The macro GIT_PATH_FUNC expands to a function definition that ends with
> a closing brace. The extra semicolon produces a warning when compiling
> with -pedantic.
>
> Signed-off-by: Beat Bolli
> ---
>
> Junio, this applies on top of
On Sun, Jul 22, 2018 at 12:38:41AM +0200, Johannes Schindelin wrote:
> Do you really want to value contributors' opinion more than
> cryptographers'? I mean, that's exactly what got us into this hard-coded
> SHA-1 mess in the first place.
I agree (believe me, of all people, I agree) that
On Sat, Jul 21, 2018 at 3:39 PM Johannes Schindelin
wrote:
>
> Do you really want to value contributors' opinion more than
> cryptographers'? I mean, that's exactly what got us into this hard-coded
> SHA-1 mess in the first place.
Don't be silly.
Other real cryptographers consider SHA256 to be
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 whether the new diff
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 right-trim the
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 reverting the
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: Johannes Schindelin
---
color.h
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, the
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 and
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-by:
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 sets have
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
From: Thomas Rast
These are essentially lifted from https://github.com/trast/tbdiff, with
light touch-ups to account for the command now being names `git
range-diff`.
Apart from renaming `tbdiff` to `range-diff`, only one test case needed
to be adjusted: 11 - 'changed message'.
The underlying
The incredibly useful [`git-tbdiff`](https://github.com/trast/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` and `numpy` Python
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
---
From: Johannes Schindelin
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
From: Johannes Schindelin
This patch lets `git range-diff` use the same order as tbdiff.
The idea is simple: for left-to-right readers, it is natural to assume
that the `git range-diff` is performed between an older vs a newer
version of the branch. As such, the user is probably more interested
Hi,
On Fri, 20 Jul 2018, Stefan Beller wrote:
> +cc list
> On Fri, Jul 20, 2018 at 2:29 PM Junio C Hamano wrote:
> > ... which means that it does not matter if I have an elaborate rewrite hook
> > that constantly updates the reverse mapping or if the reverse mapping is
> > made immediately
Hi Junio,
On Fri, 20 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > AFAICT there is at least one scenario where you run `rebase -i`, the notes
> > get updated, and of course the *reverse mapping* does *not* get updated:
>
> It turns out that I never had a rewrite hook;
Hi Stefan,
On Tue, 10 Jul 2018, Stefan Beller wrote:
> On Tue, Jul 10, 2018 at 3:08 AM Johannes Schindelin
> wrote:
> >
> > On Mon, 9 Jul 2018, Junio C Hamano wrote:
> >
> > > I also wonder if we should be feeding the context lines to ws.c
> > > machinery in the first place though.
> >
> > It
Hi Stefan,
On Tue, 10 Jul 2018, Stefan Beller wrote:
> This is developed on top of 4a68b95ce2a6 (your series here)
>
> This is an attempt to explain the previous email better,
> specially the second (yet unfinished) patch, but the resulting
> emit_line_0 is way clearer in my mind, dropping the
In the interest of code hygiene, make it easier to compile Git with the
flag -pedantic.
Pure pedantic compilation with GCC 7.3 results in one warning per use of
the translation macro `N_`:
warning: array initialized from parenthesized string constant [-Wpedantic]
Therefore also disable the
On Sat, Jul 21, 2018 at 09:52:05PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
> On Fri, Jul 20 2018, brian m. carlson wrote:
> > I know this discussion has sort of petered out, but I'd like to see if
> > we can revive it. I'm writing index v3 and having a decision would help
> > me write tests for
Good day,
I am Mdm. SUI Yang, Chief Financial Officer of the Bank of China
I am looking for a manager / investment partner who will work with me for
a joint venture.
Contact me in my private email for more details.
email (suiyan...@gmail.com)
Waiting to hear from you.
Thank you,
Mdm SUI Yang
On Fri, Jul 20 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 algorithms
On Sat, Jul 21 2018, Beat Bolli wrote:
> In the interest of code hygiene, make it easier to compile Git with the
> flag -pedantic.
>
> Pure pedantic compilation results in one warning per use of the
> translation macro `N_`, therefore also disable the parenthesising of
> i18n strings with
Hi,
I'm pleased to announce Tig version 2.4.0 with improvements to UTF-8
handling and compatibility with Git as well as a ton of bug fixes,
What is Tig?
Tig is an ncurses-based text-mode interface for git. It functions mainly
as a Git repository browser, but can also assist in
In the interest of code hygiene, make it easier to compile Git with the
flag -pedantic.
Pure pedantic compilation results in one warning per use of the
translation macro `N_`, therefore also disable the parenthesising of
i18n strings with -DUSE_PARENS_AROUND_GETTEXT_N=0 to show only real
Hello Dear.
My Name is Mrs. Bella Yostin Mohammad, I got your contact from a
business directory search and I decided to contact you directly. well
am originally from South Africa, but based in London, i am searching
for a reliable and honest and understanding person to go into
partnership in
HELLO.
This might come to you as a surprise, especially since we have never met or
discuss before, basically the message might sound strange but it is factual in
reality if only you care to listen to me. The truth is that I should have
notified you first through a more confidential means,
On 7/21/2018 2:34 AM, Elijah Newren wrote:
From: Ben Peart
Signed-off-by: Elijah Newren
---
Testcase provided by Ben, so committing with him as the author. Just need
a sign off from him.
Thanks Elijah, consider it
Signed-off-by: Ben Peart
t/t3507-cherry-pick-conflict.sh | 13
The macro GIT_PATH_FUNC expands to a function definition that ends with
a closing brace. The extra semicolon produces a warning when compiling
with -pedantic.
Signed-off-by: Beat Bolli
---
Junio, this applies on top of pk/rebase-in-c.
Thanks, Beat
builtin/rebase.c | 4 ++--
1 file changed, 2
Bonjour,
Nous représentons des investisseurs privés sérieux d’Europe, des
Émirats Arabes Unis et l’Afrique, qui recherchent de bonnes et
rentables des projets qu’ils pourraient financer en tant que
partenaire et ils offrent également prêt pour répondre aux besoins
particuliers des projets
On Sat, Jun 30, 2018 at 11:20 AM Nguyễn Thái Ngọc Duy wrote:
>
> Like part 1 this is also boring. I wanted to drop these 'extern'
> everywhere actually, so before I touched any header file in this
> series, I did a clean up first. This is the result (and to reduce diff
> noise later)
Junio,
Signed-off-by: Nguyễn Thái Ngọc Duy
---
dir.c| 6 +++---
t/t3005-ls-files-relative.sh | 4 ++--
t/t7400-submodule-basic.sh | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dir.c b/dir.c
index e1a2e1cffb..7c6e7a0a37 100644
--- a/dir.c
+++ b/dir.c
@@
Signed-off-by: Nguyễn Thái Ngọc Duy
---
connect.c | 74 +++
t/t5570-git-daemon.sh | 6 ++--
2 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/connect.c b/connect.c
index 308475b7eb..94547e5056 100644
--- a/connect.c
+++
Signed-off-by: Nguyễn Thái Ngọc Duy
---
commit-graph.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/commit-graph.c b/commit-graph.c
index b63a1fc85e..c8d521923c 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -77,28 +77,28 @@ struct commit_graph
Signed-off-by: Nguyễn Thái Ngọc Duy
---
archive-tar.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/archive-tar.c b/archive-tar.c
index b6f58ddf38..68e72d9176 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -121,7 +121,7 @@ static int stream_blocked(const
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/replace.c | 74 +++
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/builtin/replace.c b/builtin/replace.c
index 5926ad11de..e879ace277 100644
--- a/builtin/replace.c
+++
Signed-off-by: Nguyễn Thái Ngọc Duy
---
archive-zip.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/archive-zip.c b/archive-zip.c
index 48d843489c..7ad46d8854 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -309,11 +309,11 @@ static int
Signed-off-by: Nguyễn Thái Ngọc Duy
---
sequencer.c | 26 ++
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 6b6162d194..f7c2f2422d 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -716,7 +716,7 @@ static const char
Many messages will be marked for translation in the following
commits. This commit updates some of them to be more consistent and
reduce diff noise in those commits. Changes are
- keep the first letter of die(), error() and warning() in lowercase
- no full stop in die(), error() or warning() if
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/config.c | 48 +--
t/t1308-config-set.sh | 2 +-
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/builtin/config.c b/builtin/config.c
index a09ead5bc8..5761a2c4ac 100644
---
Signed-off-by: Nguyễn Thái Ngọc Duy
---
object.c| 10 +-
t/t1450-fsck.sh | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/object.c b/object.c
index 10d167825e..477e686da7 100644
--- a/object.c
+++ b/object.c
@@ -49,7 +49,7 @@ int
Signed-off-by: Nguyễn Thái Ngọc Duy
---
exec-cmd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/exec-cmd.c b/exec-cmd.c
index 02d31ee897..4f81f44310 100644
--- a/exec-cmd.c
+++ b/exec-cmd.c
@@ -358,7 +358,7 @@ int execl_git_cmd(const char *cmd, ...)
}
Most of these are straight forward. GETTEXT_POISON does catch the last
string in cmd_pack_objects(), but since this is --progress output, it's
not supposed to be machine-readable.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/pack-objects.c | 102 +
Signed-off-by: Nguyễn Thái Ngọc Duy
---
sha1-file.c | 104 ++--
1 file changed, 52 insertions(+), 52 deletions(-)
diff --git a/sha1-file.c b/sha1-file.c
index ed7ac73fa9..92c27583db 100644
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -378,8 +378,8 @@
Signed-off-by: Nguyễn Thái Ngọc Duy
---
environment.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/environment.c b/environment.c
index 2a6de2330b..d129c4adc5 100644
--- a/environment.c
+++ b/environment.c
@@ -147,7 +147,7 @@ static char *expand_namespace(const char
Signed-off-by: Nguyễn Thái Ngọc Duy
---
transport.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/transport.c b/transport.c
index 9fcc33915a..516a83b7f6 100644
--- a/transport.c
+++ b/transport.c
@@ -139,7 +139,7 @@ static struct ref
Signed-off-by: Nguyễn Thái Ngọc Duy
---
convert.c | 38 --
t/t0021-conversion.sh | 2 +-
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/convert.c b/convert.c
index f47e60022e..e53911d4f8 100644
--- a/convert.c
+++ b/convert.c
@@
Signed-off-by: Nguyễn Thái Ngọc Duy
---
replace-object.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/replace-object.c b/replace-object.c
index 801b5c1678..ddc1546b8c 100644
--- a/replace-object.c
+++ b/replace-object.c
@@ -17,7 +17,7 @@ static int
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t/t5801-remote-helpers.sh | 8 ++--
transport-helper.c| 87 ---
2 files changed, 48 insertions(+), 47 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 88c7f158ef..e3bc53b0c7
Signed-off-by: Nguyễn Thái Ngọc Duy
---
refs.c| 40 +--
t/t1400-update-ref.sh | 20 +++---
t/t1404-update-ref-errors.sh | 4 +--
t/t3210-pack-refs.sh | 2 +-
Signed-off-by: Nguyễn Thái Ngọc Duy
---
refspec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/refspec.c b/refspec.c
index c66351743b..f529092fd6 100644
--- a/refspec.c
+++ b/refspec.c
@@ -134,7 +134,7 @@ void refspec_item_init_or_die(struct refspec_item *item,
const char
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/grep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 9774920999..58f941e951 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -489,7 +489,7 @@ static int grep_cache(struct grep_opt *opt,
Signed-off-by: Nguyễn Thái Ngọc Duy
---
pkt-line.c | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/pkt-line.c b/pkt-line.c
index 941e41dfc1..04d10bbd03 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -101,7 +101,7 @@ int packet_flush_gently(int fd)
{
Signed-off-by: Nguyễn Thái Ngọc Duy
---
config.c | 72 +++
t/t1305-config-include.sh | 2 +-
2 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/config.c b/config.c
index a57e3056ef..736b9f23f7 100644
--- a/config.c
+++
v3 fixes up some other things that Junio spotted. branch-diff
diff --git a/builtin/config.c b/builtin/config.c
index 3c26df6c48..5761a2c4ac 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -626,7 +626,7 @@ int cmd_config(int argc, const char **argv, const char
*prefix)
On Thu, Jul 19, 2018 at 8:18 PM Junio C Hamano wrote:
> > --- a/config.c
> > +++ b/config.c
> > @@ -461,7 +461,7 @@ int git_config_from_parameters(config_fn_t fn, void
> > *data)
> > envw = xstrdup(env);
> >
> > if (sq_dequote_to_argv(envw, , , ) < 0) {
> > - ret =
On Sat, Jul 21, 2018 at 2:34 AM Elijah Newren wrote:
> diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
> @@ -392,4 +392,17 @@ test_expect_success 'commit --amend -s places the
> sign-off at the right place' '
> +test_expect_failure 'failed cherry-pick with
On Sat, Jul 21, 2018 at 8:56 AM Elijah Newren wrote:
> > -- 8< --
> ...
> > diff --git a/pack-objects.h b/pack-objects.h
> > index 9f977ae800..11890e7217 100644
> > --- a/pack-objects.h
> > +++ b/pack-objects.h
> > @@ -15,7 +15,7 @@
> ...
> > @@ -353,37 +354,26 @@ static inline void
On Sat, Jul 21, 2018 at 6:07 AM Duy Nguyen wrote:
> > However, I'm just concentrating on a beefy machine; it may be that v6
> > drastically outperforms v2 on weaker hardware? Can others measure a
> > lower memory usage for v6 than v2?
>
> I'll try it with massif on linux.git, but this is a very
On Fri, Jul 20, 2018 at 9:47 PM, Duy Nguyen wrote:
> On Fri, Jul 20, 2018 at 10:43:25AM -0700, Elijah Newren wrote:
>> Out of curiosity, would it be possible to use the delta_size_ field
>> for deltas that are small enough, and only use an external data
>> structure (perhaps a hash rather than
From: Ben Peart
Signed-off-by: Elijah Newren
---
Testcase provided by Ben, so committing with him as the author. Just need
a sign off from him.
t/t3507-cherry-pick-conflict.sh | 13 +
1 file changed, 13 insertions(+)
diff --git a/t/t3507-cherry-pick-conflict.sh
merge-recursive used to update files in the working tree
unnecessarily. This was reported by Linus in the 2.18.0 cycle and
fixed in commit 1de70dbd1 ("merge-recursive: fix check for skipability
of working tree updates", 2018-04-19). Unfortunately, this bug masked
another one: that
merge-recursive takes any files marked as unmerged by unpack_trees,
tries to figure out whether they can be resolved (e.g. using renames
or a file-level merge), and then if they can be it will delete the old
cache entries and writes new ones. This means that any ce_flags for
those cache entries
On Thu, Jul 19, 2018 at 8:21 PM Junio C Hamano wrote:
>
> Nguyễn Thái Ngọc Duy writes:
>
> > @@ -256,7 +256,7 @@ static int write_tar_entry(struct archiver_args *args,
> > *header.typeflag = TYPEFLAG_REG;
> > mode = (mode | ((mode & 0100) ? 0777 : 0666)) &
85 matches
Mail list logo
