On Sat, Jul 28, 2018 at 12:48:57AM -0400, Jeff King wrote:
> On Sat, Jul 28, 2018 at 06:45:43AM +0200, Duy Nguyen wrote:
>
> > > I agree throwing a real exception would be bad. But how about detecting
> > > the problem and trying our best to keep the repo in somewhat usable
> > > state like this?
On Sat, Jul 28, 2018 at 06:45:43AM +0200, Duy Nguyen wrote:
> > I agree throwing a real exception would be bad. But how about detecting
> > the problem and trying our best to keep the repo in somewhat usable
> > state like this?
> >
> > This patch uses sparse checkout to hide all those paths that
On Sat, Jul 28, 2018 at 6:36 AM Duy Nguyen wrote:
>
> On Fri, Jul 27, 2018 at 08:59:09PM +, brian m. carlson wrote:
> > On Fri, Jul 27, 2018 at 11:59:33AM +0200, Paweł Paruzel wrote:
> > > Hi,
> > >
> > > Lately, I have been wondering why my test files in repo are modified
> > > after I clone
On Fri, Jul 27, 2018 at 08:59:09PM +, brian m. carlson wrote:
> On Fri, Jul 27, 2018 at 11:59:33AM +0200, Paweł Paruzel wrote:
> > Hi,
> >
> > Lately, I have been wondering why my test files in repo are modified
> > after I clone it. It turned out to be two files: boolStyle_t_f and
> >
On Fri, Jul 27, 2018 at 6:01 PM Junio C Hamano wrote:
>
> Stefan Beller writes:
>
> > A use reported a submodule issue regarding strange case indentation
>
> s/use//; Is this "indentation" issue?
eh case sensitivity*
> > + q_to_tab >testConfig_expect <<-EOF &&
> > + #
Signed-off-by: Stefan Beller
---
diff.c | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/diff.c b/diff.c
index fdad7ffdd77..f565a2c0c2b 100644
--- a/diff.c
+++ b/diff.c
@@ -576,11 +576,12 @@ static void check_blank_at_eof(mmfile_t *mf1, mmfile_t
*mf2,
}
emit_line_0 has no nested conditions, but puts out all its arguments
(if set) in order. There is still a slight confusion with set
and set_sign, but let's defer that to a later patch.
'first' used be output always no matter if it was 0, but that got lost
got lost at e8c285c4f9c (diff: add an
For now just change the signature, we'll reason about the actual
change in a follow up patch.
Pass set_sign (which is output before the sign) and set that is setting
the color after the sign. Hence, promote any 'set's to set_sign as
we want to have color before the sign for now.
Signed-off-by:
All lines that use emit_line_0 multiple times per line, are combined
into a single call to emit_line_0, making use of the 'set' argument.
Signed-off-by: Stefan Beller
---
diff.c | 26 --
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/diff.c b/diff.c
The order shall be all colors first, then the content, flags at the end.
The colors are in order.
Signed-off-by: Stefan Beller
---
diff.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/diff.c b/diff.c
index f7251c89cbb..8fd2171d808 100644
--- a/diff.c
+++
Due to the previous condition we know "set_sign != NULL" at that point.
Signed-off-by: Stefan Beller
---
diff.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 272b0b93834..f7251c89cbb 100644
--- a/diff.c
+++ b/diff.c
@@ -997,8 +997,7 @@ static void
The 'expect'ed outcome is taken by running the 'range-diff |decode';
it is not meant as guidance, rather as a documentation of the current
situation.
Signed-off-by: Stefan Beller
---
t/t3206-range-diff.sh | 39 +++
1 file changed, 39 insertions(+)
diff --git
Signed-off-by: Stefan Beller
---
t/test-lib-functions.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 2b2181dca09..be8244c47b5 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -42,6 +42,8 @@ test_decode_color
This is based on origin/js/range-diff (c255a588bcd) and is also available
via
git fetch https://github.com/stefanbeller/git ws_cleanup-ontop-range-diff-2
This adds some color testing to range-diff and then attempts to make the code
in diff.c around emit_line_0 more readable.
I think we can go
Stefan Beller writes:
> I really appreciate the work by DScho (and Peff as I recall him as an active
> reviewer there) on 4f4d0b42bae (Merge branch 'js/empty-config-section-fix',
> 2018-05-08), as the corner cases are all correct, modulo the one line fix
> in this patch.
Amen to the early part
Stefan Beller writes:
> A use reported a submodule issue regarding strange case indentation
s/use//; Is this "indentation" issue?
> issues, but it could be boiled down to the following test case:
> ...
> +test_expect_success 'old-fashioned settings are case insensitive' '
> +
I cc'd the wrong peff. Sorry about that.
On Fri, Jul 27, 2018 at 4:36 PM Stefan Beller wrote:
A use reported a submodule issue regarding strange case indentation
issues, but it could be boiled down to the following test case:
$ git init test && cd test
$ git config foo."Bar".key test
$ git config foo."bar".key test
$ tail -n 3 .git/config
[foo "Bar"]
key = test
On Fri, Jul 27, 2018 at 2:39 PM Junio C Hamano wrote:
>
> Brandon Williams writes:
>
> > Either way you're probably going to need to be careful about how you do
> > string comparison against the different parts.
>
> Good suggestion.
The suggestion is a rabit hole and was a waste of time.
Josh Steadmon writes:
> # Supporting HTTP remotes in "git archive"
>
> We would like to allow remote archiving from HTTP servers. There are a
> few possible implementations to be discussed:
>
> ## Shallow clone to temporary repo
>
> This approach builds on existing endpoints. Clients will
Skip searching for better indentation heuristics if we'd slide a hunk more
than its size. This is the easiest fix proposed in the analysis[1] in
response to a patch that mercurial took for xdiff to limit searching
by a constant. Using a performance test as:
#!python
open('a',
Ævar Arnfjörð Bjarmason writes:
>>
>> author Bugs Bunny 1234567890 +
>> committer Bugs Bunny 1234567890 +
>
> This is covered by the "missingEmail" part of the test, but there's
> nothing wrong with the timestamp itself.
I think you didn't get what I meant.
What makes you
Drew Noakes writes:
> Passing -z with --name-only causes double nulls.
>
> $ git log -z --pretty=format:"%H" --name-only | grep -obUaP "\x00\x00" | wc
> -l
> 8994
> $ git log -z --pretty=format:"%H" | grep -obUaP "\x00\x00" | wc -l
> 0
With --pretty that tells you to show %H and --name-only
(just cc-ing René Scharfe, archive expert; Peff; Dscho; Franck Bui-Huu
to see how his creation is evolving.
Using the correct address for René this time. Sorry for the noise.)
Josh Steadmon wrote:
> # Supporting HTTP remotes in "git archive"
>
> We would like to allow remote archiving from HTTP
(just cc-ing René Scharfe, archive expert; Peff; Dscho; Franck Bui-Huu
to see how his creation is evolving)
Josh Steadmon wrote:
> # Supporting HTTP remotes in "git archive"
>
> We would like to allow remote archiving from HTTP servers. There are a
> few possible implementations to be discussed:
Ævar Arnfjörð Bjarmason writes:
Ævar Arnfjörð Bjarmason writes:
> Change various tests that use an idiom of the form:
>
> >expect &&
> test_cmp expect actual
>
> To instead use:
>
> test_must_be_empty actual
I trust that you eyeballed the result to make sure steps after these
# Supporting HTTP remotes in "git archive"
We would like to allow remote archiving from HTTP servers. There are a
few possible implementations to be discussed:
## Shallow clone to temporary repo
This approach builds on existing endpoints. Clients will connect to the
remote server's
Ævar Arnfjörð Bjarmason writes:
> When fsck. is set to an unknown value it'll cause "fsck" to
> die, but the same is not rue of the "fetch" and "receive"
> variants. Document this and test for it.
Interesting. Before documenting and adding a test to cast the
current behaviour in stone, do we
Brandon Williams writes:
> Either way you're probably going to need to be careful about how you do
> string comparison against the different parts.
Good suggestion.
>> diff --git a/t/t1300-config.sh b/t/t1300-config.sh
>> index 03c223708eb..8325d4495f4 100755
>> --- a/t/t1300-config.sh
>> +++
Stefan Beller writes:
> A use reported a submodule issue regarding strange case indentation
> issues, but it could be boiled down to the following test case:
>
> $ git init test && cd test
> $ git config foo."Bar".key test
> $ git config foo."bar".key test
> $ tail -n 3 .git/config
>
Ævar Arnfjörð Bjarmason writes:
> Test and document that the {fetch,receive}.fsck.* family of variables
> doesn't fall back on the corresponding .fsck.* variables.
>
> This was alluded to in the existing documentation by saying that
> "receive" looks at receive.fsck.* and "fsck" looks at fsck.*
On 07/27, Stefan Beller wrote:
> A use reported a submodule issue regarding strange case indentation
> issues, but it could be boiled down to the following test case:
>
> $ git init test && cd test
> $ git config foo."Bar".key test
> $ git config foo."bar".key test
> $ tail -n 3
Ævar Arnfjörð Bjarmason writes:
> - argv_array_push(, "--strict");
> + argv_array_pushf(, "--strict%s",
> + fsck_msg_types.buf);
> ...
> + if (git_config_pathname(, var, value))
> +
On Fri, Jul 27, 2018 at 11:59:33AM +0200, Paweł Paruzel wrote:
> Hi,
>
> Lately, I have been wondering why my test files in repo are modified
> after I clone it. It turned out to be two files: boolStyle_t_f and
> boolStyle_T_F.
> The system that pushed those files was case sensitive while my mac
A use reported a submodule issue regarding strange case indentation
issues, but it could be boiled down to the following test case:
$ git init test && cd test
$ git config foo."Bar".key test
$ git config foo."bar".key test
$ tail -n 3 .git/config
[foo "Bar"]
key = test
Hi all,
I'm a developer on the Git Extensions project [1] and am looking at an
issue parsing the output of `git log` in that application.
Some investigation suggests that a certain combination of arguments causes
multiple consecutive null bytes between rows, where I would ordinarily
expect one.
Ævar Arnfjörð Bjarmason writes:
> +
> Setting `fsck.` will be picked up by linkgit:git-fsck[1], but
> -to accept pushes of such data set `receive.fsck.` instead.
> +to accept pushes of such data set `receive.fsck.` instead, or
Inherited from the original, but I find it a lot more readable to
a
On Fri, Jul 27 2018, Ævar Arnfjörð Bjarmason wrote:
> When fsck. is set to an unknown value it'll cause "fsck" to
> die, but the same is not rue of the "fetch" and "receive"
s/rue/t&/. Looks like we're headed for a v4. I'll fix this typo.
Ævar Arnfjörð Bjarmason writes:
> +For now, the paranoid need to find some way to emulate the quarantine
> +environment if they'd like the same protection as "push". E.g. in the
We probably should mention that you can immediately prune, as these
unwanted crufts are unreferenced. That would
On Fri, Jul 27 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> Remove the setting of a receive.fsck.badDate config variable to
>> "ignore". This was added in efaba7cc77 ("fsck: optionally ignore
>> specific fsck issues completely", 2015-06-22) but never did anything,
>>
Ævar Arnfjörð Bjarmason writes:
> The existing documentation led the user to believe that all we were
> doing were basic reachability sanity checks, but that hasn't been true
> for a very long time. Update the description to match reality, and
> note the caveat that there's a quarantine for
Ævar Arnfjörð Bjarmason writes:
> The documentation for the fsck. and receive.fsck.
> variables was mostly duplicated in two places, with fsck.
> making no mention of the corresponding receive.fsck., and the
> same for fsck.skipList.
Overall the result reads a lot easily. Especially this
Ævar Arnfjörð Bjarmason writes:
> Refer readers of fetch.fsckObjects and receive.fsckObjects to
> transfer.fsckObjects instead of repeating the description at each
> location.
>
> I don't think this description of them makes much sense, but for now
> I'm just moving the existing documentation
Ævar Arnfjörð Bjarmason writes:
> Remove the setting of a receive.fsck.badDate config variable to
> "ignore". This was added in efaba7cc77 ("fsck: optionally ignore
> specific fsck issues completely", 2015-06-22) but never did anything,
> presumably it was part of some work-in-progress code
On Thu, Jul 26 2018, Phillip Wood wrote:
> From: Phillip Wood
>
> Unfortuantely v4 had test failures due to a suprious brace from a last
> minute edit to a comment that I forgot to test. This version fixes
> that, my applogies for the patch churn.
>
> I've updated this series based on Ævar's
On Fri, Jul 27, 2018 at 7:22 AM Chen Bin wrote:
> The `p4-pre-submit` hook is executed before git-p4 submits code.
> If the hook exits with non-zero value, submit process not start.
>
> Signed-off-by: Chen Bin
> ---
> diff --git a/git-p4.py b/git-p4.py
> @@ -1494,7 +1494,13 @@ def
Ben Peart writes:
> Sending this update as Elijah is on vacation. This only updates the test
> case based on feedback from the list.
>
> Base Ref: master
> Web-Diff: https://github.com/benpeart/git/commit/0ab3816d61
> Checkout: git fetch https://github.com/benpeart/git merge-recursive-v2 && git
On Fri, Jul 27, 2018 at 7:31 PM Stefan Beller wrote:
>
> On Fri, Jul 27, 2018 at 10:19 AM Brandon Williams wrote:
> >
> > On 07/27, Duy Nguyen wrote:
> > > On Fri, Jul 27, 2018 at 2:40 AM Stefan Beller wrote:
> > > >
> > > > Currently the refs API takes a 'ref_store' as an argument to specify
>
On Fri, Jul 27, 2018 at 6:22 PM Ben Peart wrote:
>
>
>
> On 7/27/2018 11:42 AM, Duy Nguyen wrote:
> > On Thu, Jul 26, 2018 at 12:40:05PM -0700, Junio C Hamano wrote:
> >> Duy Nguyen writes:
> >>
> >>> I'm excited so I decided to try out anyway. This is what I've come up
> >>> with. Switching
On Fri, Jul 27, 2018 at 7:14 PM Junio C Hamano wrote:
>
> Duy Nguyen writes:
>
> > diff --git a/unpack-trees.c b/unpack-trees.c
> > index 66741130ae..9c791b55b2 100644
> > --- a/unpack-trees.c
> > +++ b/unpack-trees.c
> > @@ -642,6 +642,110 @@ static inline int are_same_oid(struct name_entry
>
Max Kirillov writes:
> Only the 3rd patch has changed
Thanks.
Change various tests that use an idiom of the form:
>expect &&
test_cmp expect actual
To instead use:
test_must_be_empty actual
The test_must_be_empty() wrapper was introduced in ca8d148daf ("test:
test_must_be_empty helper", 2013-06-09). Many of these tests have been
added after
Jeff King writes:
>> $ git rebase --onto HEAD @{-1}~3 @{-1}^0
>
> Interesting. I'd have probably done it with an interactive rebase:
>
> $ git rebase -i HEAD~4
> [change first "pick" to "edit"; after stopping...]
> $ git reset --hard HEAD^ ;# throw away patch 1
> $ git am -s mbox
On Fri, Jul 27, 2018 at 10:19 AM Brandon Williams wrote:
>
> On 07/27, Duy Nguyen wrote:
> > On Fri, Jul 27, 2018 at 2:40 AM Stefan Beller wrote:
> > >
> > > Currently the refs API takes a 'ref_store' as an argument to specify
> > > which ref store to iterate over; however it is more useful to
Æ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 something to show that you did
carefully review the series especially
On Fri, Jul 27, 2018 at 6:13 AM Jeff King wrote:
>
> On Tue, Jul 24, 2018 at 10:20:05AM -0700, Stefan Beller wrote:
>
> > So in my understanding we have a "common base pack" and specific
> > packs on top for each "island".
>
> Sort of. This is another hacky part. The islands themselves are
>
On 07/27, Duy Nguyen wrote:
> On Fri, Jul 27, 2018 at 2:40 AM Stefan Beller wrote:
> >
> > Currently the refs API takes a 'ref_store' as an argument to specify
> > which ref store to iterate over; however it is more useful to specify
> > the repository instead (or later a specific worktree of a
Duy Nguyen writes:
> diff --git a/unpack-trees.c b/unpack-trees.c
> index 66741130ae..9c791b55b2 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -642,6 +642,110 @@ static inline int are_same_oid(struct name_entry
> *name_j, struct name_entry *nam
> return name_j->oid &&
On 7/27/2018 11:42 AM, Duy Nguyen wrote:
On Thu, Jul 26, 2018 at 12:40:05PM -0700, Junio C Hamano wrote:
Duy Nguyen writes:
I'm excited so I decided to try out anyway. This is what I've come up
with. Switching trees on git.git shows it could skip plenty entries,
so promising. It's ugly
Phillip Wood writes:
> The code actually looks at the lines that are selected rather than
> omitted. So in the example above it groups them as [1,2] (because they
> are contiguous), [4],[5] (these are split because one is an insertion
> and one a deletion) and [7]. It then sees that there are
Phillip Wood writes:
> On 26/07/18 20:36, Junio C Hamano wrote:
>> Phillip Wood writes:
>>
>>> +sub label_hunk_lines {
>>> + my $hunk = shift;
>>> + my $text = $hunk->{TEXT};
>>> + my (@line_flags, @lines);
>>> + my ($block, $label, $last_mode) = (0, 0, '');
>>> + for my $line
On Fri, Jul 27, 2018 at 2:40 AM Stefan Beller wrote:
>
> Currently the refs API takes a 'ref_store' as an argument to specify
> which ref store to iterate over; however it is more useful to specify
> the repository instead (or later a specific worktree of a repository).
There is no 'later'.
Tejun Heo writes:
> ... After all, calling the program twice isn't all that
> difficult.
As long as we all agree on that, I think we can move forward.
Because I think this ...
>> ... But it feels like
>> "reverse-map the cherry-picks" is orthogonal to the idea of name-rev.
... is a better way
On 7/26/2018 3:40 PM, Junio C Hamano wrote:
Duy Nguyen writes:
I'm excited so I decided to try out anyway. This is what I've come up
with. Switching trees on git.git shows it could skip plenty entries,
so promising. It's ugly and it fails at t6020 though, there's still
work ahead. But I
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 2d189da2f1..b0cef509ab 100755
> >> ---
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:
> >
> >
On Thu, Jul 26, 2018 at 12:40:05PM -0700, Junio C Hamano wrote:
> Duy Nguyen writes:
>
> > I'm excited so I decided to try out anyway. This is what I've come up
> > with. Switching trees on git.git shows it could skip plenty entries,
> > so promising. It's ugly and it fails at t6020 though,
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 like to have an extra space in front of all the
Hello, Jeff.
On Fri, Jul 27, 2018 at 4:47 AM Jeff King wrote:
> - the set of names might be distinct from the set of commits you'd want
>to traverse. For instance, you might want to use "name-rev --tags",
>but find cherry-picks even on untagged branches (e.g., "--all").
Hmm... maybe
Stress test the parsing logic shared by fsck.skipList and
{fetch,receive}.fsck.skipList added in cd94c6f91e ("fsck: git
receive-pack: support excluding objects from fsck'ing",
2015-06-22). There were no tests for the work done by the
init_skiplist() routine, e.g. how it dies on invalid input.
When fsck. is set to an unknown value it'll cause "fsck" to
die, but the same is not rue of the "fetch" and "receive"
variants. Document this and test for it.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config.txt| 4
t/t5504-fetch-receive-strict.sh | 14
Test and document that the {fetch,receive}.fsck.* family of variables
doesn't fall back on the corresponding .fsck.* variables.
This was alluded to in the existing documentation by saying that
"receive" looks at receive.fsck.* and "fsck" looks at fsck.* etc., but
it wasn't explicitly stated that
Implement support for fetch.fsck.* corresponding with the existing
receive.fsck.*. This allows for pedantically cloning repositories with
specific issues without turning off fetch.fsckObjects.
One such repository is https://github.com/robbyrussell/oh-my-zsh.git
which before this change will emit
Change the transfer.fsckObjects documentation to explicitly note the
unique security and/or corruption issues fetch.fsckObjects suffers
from, since it doesn't have a quarantine environment.
This was already alluded to in the existing documentation, but let's
spell it out so there's no confusion
The documentation for the fsck. and receive.fsck.
variables was mostly duplicated in two places, with fsck.
making no mention of the corresponding receive.fsck., and the
same for fsck.skipList.
I spent quite a lot of time today wondering why setting the
fsck. variant wasn't working to clone a
The tests for transfer.fsckObjects have grown organically over time to
not make much sense.
Initially when these were added in b10a53583f ("test: fetch/receive
with fsckobjects", 2011-09-04) they were only testing the "corrupt or
missing object" case, but later on in 70a4ae73d8 ("fsck: add a
The existing documentation led the user to believe that all we were
doing were basic reachability sanity checks, but that hasn't been true
for a very long time. Update the description to match reality, and
note the caveat that there's a quarantine for accepting pushes, but
not for fetching.
Also
Refer readers of fetch.fsckObjects and receive.fsckObjects to
transfer.fsckObjects instead of repeating the description at each
location.
I don't think this description of them makes much sense, but for now
I'm just moving the existing documentation around. Making it better
will be done in a
It's been a couple of months since I submitted v2 of this. This takes
into account all the feedback in the previous thread
(https://public-inbox.org/git/20180525192811.25680-1-ava...@gmail.com/).
To recap, this series is mainly about implementing
fetch.fsck., so you can turn on
Remove the setting of a receive.fsck.badDate config variable to
"ignore". This was added in efaba7cc77 ("fsck: optionally ignore
specific fsck issues completely", 2015-06-22) but never did anything,
presumably it was part of some work-in-progress code that never made
it into git.git.
None of
On Wed, Jul 25 2018, Junio C Hamano wrote:
> * js/range-diff (2018-07-25) 21 commits
> [...]
>
> "git tbdiff" that lets us compare individual patches in two
> iterations of a topic has been rewritten and made into a built-in
> command.
>
> Undecided.
>
> Many "The feature is useful"
On Tue, Jul 24, 2018 at 10:20:05AM -0700, Stefan Beller wrote:
> So in my understanding we have a "common base pack" and specific
> packs on top for each "island".
Sort of. This is another hacky part. The islands themselves are
generally just about forbidding deltas, and not any particular kind
On Tue, Jul 24, 2018 at 09:47:29AM -0700, Junio C Hamano wrote:
> > +/*
> > + * Allocate a new bitmap; if "old" is not NULL, the new bitmap will be a
> > copy
> > + * of "old". Otherwise, the new bitmap is empty.
> > + */
> > +static struct island_bitmap *island_bitmap_new(const struct
From: Elijah Newren
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
From: Ben Peart
Recent changes in merge_content() induced a bug when merging files that are
not present in the local working directory due to sparse-checkout. Add a
test case to demonstrate the bug so that we can ensure the fix resolves
it and to prevent future regressions.
Signed-off-by: Ben
Sending this update as Elijah is on vacation. This only updates the test
case based on feedback from the list.
Base Ref: master
Web-Diff: https://github.com/benpeart/git/commit/0ab3816d61
Checkout: git fetch https://github.com/benpeart/git merge-recursive-v2 && git
checkout 0ab3816d61
###
On 7/26/2018 5:09 AM, SZEDER Gábor wrote:
+void slog_set_command_name(const char *command_name)
+{
+ /*
+* Capture the command name even if logging is not enabled
+* because we don't know if the config has been loaded yet by
+* the cmd_() and/or it may be too
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 2018, Phillip Wood
On Tue, Jul 24, 2018 at 09:19:27AM -0700, Junio C Hamano wrote:
> Christian Couder writes:
>
> > 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'.
>
> As a public function
The `p4-pre-submit` hook is executed before git-p4 submits code.
If the hook exits with non-zero value, submit process not start.
Signed-off-by: Chen Bin
---
Documentation/git-p4.txt | 8
Documentation/githooks.txt | 7 +++
git-p4.py | 16 +++-
Hi Johannes
On 26/07/18 13:33, Johannes Schindelin wrote:
> 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
Hi Junio, thanks for the comments
On 26/07/18 20:30, Junio C Hamano wrote:
> Phillip Wood writes:
>
> An interesting problem you are solving ;-)
>
>> For example given the hunk
>> 1 -* a longer description of the
>> 2 - first item
>> 3 -* second
>> 4 -* third
>>
On 26/07/18 20:36, Junio C Hamano wrote:
> Phillip Wood writes:
>
>> +sub label_hunk_lines {
>> +my $hunk = shift;
>> +my $text = $hunk->{TEXT};
>> +my (@line_flags, @lines);
>> +my ($block, $label, $last_mode) = (0, 0, '');
>> +for my $line (1..$#{$text}) {
>
> $text is a
Hi,
Lately, I have been wondering why my test files in repo are modified after I
clone it. It turned out to be two files: boolStyle_t_f and boolStyle_T_F.
The system that pushed those files was case sensitive while my mac after High
Sierra update had APFS which is by default case-insensitive. I
On Sun, Jul 22, 2018 at 07:48:33AM +0200, Christian Couder wrote:
> + /*
> + * We process only trees, as commits and tags have already been handled
> + * (and passed their marks on to root trees, as well. We must make sure
> + * to process them in descending tree-depth order so
Hello Dear
How are you and your family? I hope fine.Happy to inform you about My
success in getting those funds transferred under the cooperation of a
new partner from Sweden, Presently i'm in Sweden,Now contact my
secretary ( joydesmond...@gmail.com ) ask him to send you the atm
worths sum of
On Thu, Jul 26, 2018 at 12:01:34PM -0700, Junio C Hamano wrote:
> Tejun Heo writes:
>
> > I should have explained the use case better.
>
> No, you did not need to. I was not saying the feature is not useful.
> I was only saying that "explain where in the history X sits" command
> (i.e.
On Thu, Jul 26, 2018 at 10:33:27AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > So here's a replacement for just patch 1 (I'm assuming this creates less
> > work than re-posting them all, but it may not be if Junio prefers
> > dealing with a whole new mbox rather than a "rebase -i",
98 matches
Mail list logo
