Jonathan Tan writes:
> This is on _both_ ds/commit-graph-fsck and sb/object-store-lookup,
> following Stolee's suggestion.
>
> (It also seems better to build it this way to me, since both these
> branches are going into "next" according to the latest What's Cooking.)
OK. I am perfectly OK if
Johannes Schindelin writes:
> So maybe a much better idea is to use our `has_dos_drive_prefix()`
> function:
>
> if (!has_dos_drive_prefix(Buffer))
> return error("'%s': invalid drive letter", Buffer);
"'%s': path without valid drive prefix", you mean?
On 7/6/2018 1:27 AM, Eric Sunshine wrote:
On Thu, Jul 5, 2018 at 8:54 PM Derrick Stolee wrote:
The final pair of chunks for the multi-pack-index file stores the object
offsets. We default to using 32-bit offsets as in the pack-index version
1 format, but if there exists an offset larger than
On 7/12/2018 9:19 AM, Derrick Stolee wrote:
On 7/6/2018 1:39 AM, Eric Sunshine wrote:
On Thu, Jul 5, 2018 at 8:54 PM Derrick Stolee wrote:
The core.multiPackIndex config setting controls the multi-pack-
index (MIDX) feature. If false, the setting will disable all reads
from the
Johannes Schindelin writes:
> Git is used in *so many* different scenarios, and both in terms of
> commits/day as well as overall repository size *and* development speed,
That misses another important factor, though. How well the project
uses the tool, iow, how canonical should its way of
Johannes Schindelin writes:
>> > +static int option_read_message(struct parse_opt_ctx_t *ctx,
>> > + const struct option *opt, int unset)
>> > +{
>> > + struct strbuf *buf = opt->value;
>> > + const char *arg;
>> > +
>> > + if (unset)
>> > + BUG("-F cannot be
> As we discussed during the review on v1, ":/"
> is *NOT* pathspec (that is why having these tests in t4208 is wrong
> but we are following existing mistakes).
Ah, I understand the terminology better now. Thanks. I'll change the
commit message wording to use "extended SHA-1s" instead of
On 7/9/2018 3:08 PM, Junio C Hamano wrote:
Derrick Stolee writes:
diff --git a/midx.h b/midx.h
index dbdbe9f873..2d83dd9ec1 100644
--- a/midx.h
+++ b/midx.h
@@ -1,6 +1,10 @@
#ifndef __MIDX_H__
#define __MIDX_H__
+struct multi_pack_index;
I actually was quite surprised that this struct
William Chargin writes:
> This patch broadens the set of commits matched by ":/" pathspecs to
As we discussed during the review on v1, ":/"
is *NOT* pathspec (that is why having these tests in t4208 is wrong
but we are following existing mistakes). It is a way to specify a
commit object name
Signed-off-by: Ramsay Jones
---
Hi Olga,
If you need to re-roll your 'ot/ref-filter-object-info' branch,
could you please squash this into the relevant patch (commit c5d9a471d6,
"ref-filter: use oid_object_info() to get object", 2018-07-09).
[Both sparse and my static-check.pl script are
On Thu, Jul 12, 2018 at 02:22:14PM +0200, SZEDER Gábor wrote:
> diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
> index a2af693068..5c9ca19401 100755
> --- a/t/t5541-http-push-smart.sh
> +++ b/t/t5541-http-push-smart.sh
> @@ -38,6 +38,10 @@ GET
>
Hi Elijah,
On Wed, 27 Jun 2018, Elijah Newren wrote:
> Signed-off-by: Elijah Newren
> ---
>
> Changes since v1:
> - Fixed up commit message (move below comment to below diffstat as
> originally intended)
>
> Long term I just want to make git-rebase--merge go away, so this patch
> will
On Wed, Jul 11, 2018 at 10:49:09PM -0700, William Chargin wrote:
> This patch broadens the set of commits matched by ":/" pathspecs to
> include commits reachable from HEAD but not any named ref. This avoids
> surprising behavior when working with a detached HEAD and trying to
> refer to a commit
On Windows, if a tool calls SetCurrentDirectory with a lower case drive
letter, the subsequent call to GetCurrentDirectory will return the same
lower case drive letter. Powershell, for example, does not normalize the
path. If that happens, test-drop-caches will error out as it does not
correctly
Hi Elijah,
On Wed, 27 Jun 2018, Elijah Newren wrote:
> git-rebase.sh wrote strategy options to .git/rebase/merge/strategy_opts
> in the following format:
> '--ours' '--renormalize'
> Note the double spaces.
>
> git-rebase--interactive uses sequencer.c to parse that file, and
> sequencer.c
On 7/12/2018 9:31 AM, SZEDER Gábor wrote:
On Thu, Jul 12, 2018 at 3:01 PM Derrick Stolee wrote:
On 7/11/2018 5:48 AM, SZEDER Gábor wrote:
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ab641bf5a9..ab895ebb32 100644
--- a/Documentation/config.txt
+++
Johannes Schindelin writes:
>> That may be something worth discussing before doing; I'd prefer to
>> wait until these 6 patches, plus the unsized static array one you
>> did spearately, graduates to the 'master' branch.
>
> If this change to DEVOPTS was done as 7/7, then this would be very easy
Signed-off-by: Ramsay Jones
---
Hi Junio,
I had a test failure on 'pu' today - Eric's chain-lint series
found another broken chain in one of Elijah's new tests (on the
'en/t6036-recursive-corner-cases' branch).
ATB,
Ramsay Jones
t/t6036-recursive-corner-cases.sh | 2 +-
1 file changed, 1
Hi Junio,
On Wed, 11 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > To summarize, there are two commits recorded for that Message-Id, the
> > later one not mapped back, and neither is the correct commit that made it
> > into `master`.
> >
> > It would be nice to figure out
Vitali Lovich writes:
> Repro (starting with cwd within git project):
>> (cd xdiff; git rev-parse --show-toplevel)
> ... path to git repository
>> git rebase -i 18404434bf406f6a6f892ed73320c5cf9cc187dd
> # Stop at some commit for editing
>> (cd xdiff; git rev-parse --show-toplevel)
> ... path to
Hi Gábor,
On Wed, 11 Jul 2018, SZEDER Gábor wrote:
> > diff --git a/linear-assignment.c b/linear-assignment.c
> > new file mode 100644
> > index 0..0b0344b5f
> > --- /dev/null
> > +++ b/linear-assignment.c
> > @@ -0,0 +1,203 @@
> > +/*
> > + * Based on: Jonker, R., & Volgenant, A.
Hi,
On Thu, 12 Jul 2018, Johannes Schindelin wrote:
> On Wed, 11 Jul 2018, Vitali Lovich wrote:
>
> > On Wed, Jul 11, 2018 at 7:50 PM Vitali Lovich wrote:
> > >
> > > Typically git rev-parse --show-toplevel prints the folder containing
> > > the .git folder regardless what subdirectory one is
Hi Vitali,
[please avoid top-posting on this mailing list]
On Wed, 11 Jul 2018, Vitali Lovich wrote:
> On Wed, Jul 11, 2018 at 7:50 PM Vitali Lovich wrote:
> >
> > Typically git rev-parse --show-toplevel prints the folder containing
> > the .git folder regardless what subdirectory one is in.
On 7/6/2018 12:36 AM, Eric Sunshine wrote:
On Thu, Jul 5, 2018 at 8:54 PM Derrick Stolee wrote:
+ for i in $(test_seq 6 10)
+ do
+ iii=$(printf '%03i' $i)
+ test-tool genrandom "bar" 200 >wide_delta_$iii &&
+ test-tool genrandom "baz $iii"
Hello,
Sorry for late notification, my blog is up too.
https://prertik.github.io/post/week-10
Good job!
I also forgot to post it here, although the blog entry was available
since days ago. I am sorry for that!
https://ungps.github.io/
P.S: Since the moment I wrote that text, there are
Hi Ben,
On Wed, 11 Jul 2018, Ben Peart wrote:
> Teach test-drop-caches to handle lower case drive letters on Windows.
Maybe mention that you can trigger this by using a lower case drive letter
in Powershell (CMD normalizes your path, Powershell does not).
> diff --git
On Thu, Jul 12, 2018 at 3:01 PM Derrick Stolee wrote:
>
> On 7/11/2018 5:48 AM, SZEDER Gábor wrote:
> >> diff --git a/Documentation/config.txt b/Documentation/config.txt
> >> index ab641bf5a9..ab895ebb32 100644
> >> --- a/Documentation/config.txt
> >> +++ b/Documentation/config.txt
> >> @@ -908,6
Hi,
On Wed, 11 Jul 2018, Junio C Hamano wrote:
> Beat Bolli writes:
>
> > Should we add a "pedantic" flag to DEVOPTS that would simplify
> > building pedantically? It would also have to set
> > USE_PARENS_AROUND_GETTEXT_N so as to not overwhelm the developer with
> > too much output.
>
> That
On 7/6/2018 1:39 AM, Eric Sunshine wrote:
On Thu, Jul 5, 2018 at 8:54 PM Derrick Stolee wrote:
The core.multiPackIndex config setting controls the multi-pack-
index (MIDX) feature. If false, the setting will disable all reads
from the multi-pack-index file.
Add comparison commands in
Hi Junio,
On Wed, 11 Jul 2018, Junio C Hamano wrote:
> Eric Sunshine writes:
>
> >> @@ -2956,28 +2991,76 @@ static int do_merge(struct commit *commit, const
> >> char *arg, int arg_len,
> >> + cmd.git_cmd = 1;
> >> + argv_array_push(, "merge");
> >> +
Hi Eric,
On Wed, 11 Jul 2018, Eric Sunshine wrote:
> On Wed, Jul 11, 2018 at 8:38 AM Johannes Schindelin via GitGitGadget
> wrote:
> > diff --git a/sequencer.c b/sequencer.c
> > @@ -2932,7 +2966,8 @@ static int do_merge(struct commit *commit, const char
> > *arg, int arg_len,
> > -
On 7/11/2018 5:48 AM, SZEDER Gábor wrote:
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ab641bf5a9..ab895ebb32 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -908,6 +908,10 @@ core.commitGraph::
Enable git commit graph feature. Allows
Hi Junio,
On Wed, 11 Jul 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > diff --git a/builtin/merge.c b/builtin/merge.c
> > index 4a4c09496..b0e907751 100644
> > --- a/builtin/merge.c
> > +++ b/builtin/merge.c
> > @@ -111,6 +111,35 @@ static int
Hi Stefan,
On Wed, 11 Jul 2018, Stefan Beller wrote:
> On Wed, Jul 11, 2018 at 10:35 AM Junio C Hamano wrote:
> > To be honest, I am not sure if there still are people who use
> > octopus
>
> The latest merge with more than 2 parents in linux.git is df958569dbaa
> (Merge branches 'acpi-tables'
Hi Junio,
On Wed, 11 Jul 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > The `--rebase-merges` option of `git rebase` generates todo lists that
> > include the merge commits that are to be rebased.
> >
> > To keep things simpler to review, I decided to
Hi Dear, my name is Jack and i am seeking for a relationship in which i will
feel loved after a series of failed relationships.
I am hoping that you would be interested and we could possibly get to know each
other more if you do not mind. I am open to answering questions from you as i
think
Hi Elijah,
On Wed, 11 Jul 2018, Elijah Newren wrote:
> On Fri, Mar 9, 2018 at 8:36 AM, Johannes Schindelin via GitGitGadget
> wrote:
>
> > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> > index 0e20a66e7..c4bcd24bb 100644
> > --- a/Documentation/git-rebase.txt
> >
> Signed-off-by: Eric Sunshine
> ---
> t/t5300-pack-object.sh | 2 +-
> t/t5302-pack-index.sh | 2 +-
> t/t5401-update-hooks.sh| 4 ++--
> t/t5500-fetch-pack.sh | 2 +-
> t/t5505-remote.sh | 2 +-
> t/t5512-ls-remote.sh | 4 ++--
>
To recap: 't5561-http-backend.sh' is prone to occasional failures;
luckily it's not 'git-http-backend's fault, but the test script is a
bit racy; patch 3/3's commit message discusses the details at length.
Changes since v2:
- Use 'test_when_finished' to clear the access log in the first
Four tests in three httpd-related test scripts check the contents of
Apache's 'access.log', and they all do so by running 'sed' with the
exact same script consisting of four s/// commands to strip
uninteresting log fields and to vertically align the requested URLs.
Extract this into a common
The last test of 't5561-http-backend.sh', 'server request log matches
test results' may fail occasionally, because the order of entries in
Apache's access log doesn't match the order of requests sent in the
previous tests, although all the right requests are there. I saw it
fail on Travis CI five
In the second test of 't5541-http-push-smart.sh', 'no empty path
components' we truncate Apache's access log by running:
echo >.../access.log
There are two issues with this approach:
- This doesn't leave an empty file behind, like a proper truncation
would, but a file with a lone
It looks like write_author_script() intends to write out a file in
Bourne shell syntax, but it doesn't put a closing single quote on the
last line.
This patch makes .git/rebase-merge/author-script actually parsable by
sh(1) by adding a single quote and a linefeed to terminate the line
properly.
On Wed, Jul 11, 2018 at 5:37 PM Junio C Hamano wrote:
> As with the previous "transform the script and feed the result to
> shell" approach, this risks to force us into writing our tests in a
> subset of valid shell language, which is the primary reason why I
> was not enthused when I saw the
101 - 144 of 144 matches
Mail list logo