On Mon, Jul 30 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> And, as an aside, the reason we can't easily make it better ourselves is
>> because the build process for git.git doesn't have a facility to run
>> code to detect this type of stuff (the configure script is always
On Tue, Jul 31 2018, Michael Felt wrote:
> For AIX: again - the determination is simple. If _AIX is set to 1 then
> use BigEndian, or, use:
> michael@x071:[/home/michael]uname
> AIX
> i.e., something like:
> $(uname) == "AIX" && BigEndian=1
In lieu of some "let's test this with a compile-test"
On Tue, Jul 31, 2018 at 1:37 PM Han-Wen Nienhuys wrote:
> diff --git a/config.h b/config.h
> @@ -178,10 +178,16 @@ struct config_set {
> +/*
> + * The int return values in the functions is 1 if not found, 0 if found,
> leaving
> + * the found value in teh 'dest' pointer.
> + */
"teh"?
Instead o
Hi Eric
Thanks for taking a look at this
On 31/07/18 21:47, Eric Sunshine wrote:
On Tue, Jul 31, 2018 at 7:15 AM Phillip Wood wrote:
The calling code treated NULL as a valid return value, so fix this by
returning and integer and passing in a parameter to receive the author.
It might be diff
Switch to the _DUP variant of string_list for remote_branches to allow
string_list_clear() to release the allocated memory at the end, and
actually call that function. Free the util pointer as well; it is
allocated in read_remote_branches().
NB: This string_list is empty until read_remote_branche
Hi Eric
On 31/07/18 22:39, Eric Sunshine wrote:
On Tue, Jul 31, 2018 at 7:15 AM Phillip Wood wrote:
Single quotes should be escaped as \' not \\'. Note that this only
affects authors that contain a single quote and then only external
scripts that read the author script and users whose git is u
I updated the patch. But for some reason the test keep failing at this line,
`test_must_fail git p4 submit --dry-run >errs 2>&1 &&`.
If I change this line to `test_must_fail git-p4 submit --dry-run >errs
2>&1 &&` the test will pass.
Could you help me to resolve this issue? I'm really confused. I'
On Tue, Jul 31, 2018 at 7:03 PM Ben Peart wrote:
>
> From: Ben Peart
>
> Skip merging the commit, updating the index and working directory if and
> only if we are creating a new branch via "git checkout -b ."
> Any other checkout options will still go through the former code path.
I'd like to se
chen bin writes:
> I updated the patch. But for some reason the test keep failing at this line,
> `test_must_fail git p4 submit --dry-run >errs 2>&1 &&`.
>
> If I change this line to `test_must_fail git-p4 submit --dry-run >errs
> 2>&1 &&` the test will pass.
Hmph. I somehow suspect that the te
On Tue, Jul 31, 2018 at 9:13 PM Junio C Hamano wrote:
>
> Nguyễn Thái Ngọc Duy writes:
>
> > Another thing we probably should do is catch in "git checkout" too,
> > not just "git clone" since your linux/unix colleage colleague may
> > accidentally add some files that your mac/windows machine is
Change the handling of fetch.negotiationAlgorithm= to error out
on unknown strings, i.e. everything except "default" or "skipping".
This changes the behavior added in 42cc7485a2 ("negotiator/skipping:
skip commits during fetch", 2018-07-16) which would ignore all unknown
values and silently fall b
Users interested in the fetch.negotiationAlgorithm variable added in
42cc7485a2 ("negotiator/skipping: skip commits during fetch",
2018-07-16) are probably interested in the related --negotiation-tip
option added in 3390e42adb ("fetch-pack: support negotiation tip
whitelist", 2018-07-02).
Change t
On Tue, Jul 31 2018, Jonathan Tan wrote:
>> > +fetch.negotiationAlgorithm::
>> > + Control how information about the commits in the local repository is
>> > + sent when negotiating the contents of the packfile to be sent by the
>> > + server. Set to "skipping" to use an algorithm that skips com
On Tue, Jul 31, 2018 at 8:44 PM Elijah Newren wrote:
> Is it worth attempting to also warn about paths that only differ in
> UTF-normalization on relevant MacOS systems?
Down this thread, Jeff Hostetler drew a scarier picture of "case"
handling on MacOS and Windows. I think we should start with s
Phillip Wood writes:
>> Is the:
>>
>> ...for some reason sq_dequote() called by read_author_ident()
>> seems to handle the broken quoting correctly.
>>
>> bit outdated? We know now from patch 2/4 of my series[1] that
>> read_author_ident() wasn't handling it correctly at all. It was mer
On Tue, Jul 31, 2018 at 8:23 PM Torsten Bögershausen wrote:
> I wonder if we can tell the users more about the "problems"
> and how to avoid them, or to live with them.
>
> This is more loud thinking:
>
> "The following paths only differ in case\n"
> "One a case-insensitive file system only one at
Eric Sunshine writes:
> On Tue, Jul 31, 2018 at 1:37 PM Han-Wen Nienhuys wrote:
>> Highlight keywords in remote sideband output.
>
> Prefix with the module you're touching, don't capitalize, and drop the
> period. Perhaps:
>
> sideband: highlight keywords in remote sideband output
Yup (I lo
On 31/07/18 22:39, Eric Sunshine wrote:
On Tue, Jul 31, 2018 at 7:15 AM Phillip Wood wrote:
Single quotes should be escaped as \' not \\'. Note that this only
affects authors that contain a single quote and then only external
scripts that read the author script and users whose git is upgraded f
The `p4-pre-submit` hook is executed before git-p4 submits code.
If the hook exits with non-zero value, submit process won't start.
Signed-off-by: Chen Bin
---
Documentation/git-p4.txt | 8
Documentation/githooks.txt | 7 +++
git-p4.py | 16 +++-
t/t
Hi Junio,
On Mon, 30 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > FWIW I picked up your Asciidoc-underline fix, and I also fixed a typo in a
> > commit message (you may want to pick that up, too, unless you want me to
> > send a full new iteration, I don't care either way
On Tue, Jul 31, 2018 at 01:31:31PM -0400, Ben Peart wrote:
>
>
> On 7/31/2018 12:50 PM, Ben Peart wrote:
> >
> >
> > On 7/31/2018 11:31 AM, Duy Nguyen wrote:
>
> >>
> >>> In the performance game of whack-a-mole, that call to repair cache-tree
> >>> is now looking quite expensive...
> >>
> >> Y
On Wed, Aug 1, 2018 at 5:41 PM Junio C Hamano wrote:
> Hmm, do we actually say things like "Error: blah"? I am not sure if
> I like this strncasecmp all that much.
this is for the remote end, so what we (git-core) says isn't all that
relevant. The reason I put this here is that Gerrit has some
Problem: I want to avoid recursively fetching submodules when I run a
`fetch` command, and instead defer that operation to the next
`submodule update`. Essentially I want `fetch.recurseSubmodules` to be
`false`, and `get submodule update` to do exactly what it does with
the `--remote` option, but s
When matching a non-wildcard LHS of a refspec against a list of
refs, find_ref_by_name_abbrev() returns the first ref that matches
using any DWIM rules used by refname_match() in refs.c, even if a
better match occurs later in the list of refs.
This causes unexpected behavior when (for example) fet
Chen Bin writes:
> The `p4-pre-submit` hook is executed before git-p4 submits code.
> If the hook exits with non-zero value, submit process won't start.
>
> Signed-off-by: Chen Bin
> ---
I see that the only difference between this and what has been queued
on 'pu', i.e.
https://github.com/gi
> +test_expect_success 'LHS of refspec follows ref disambiguation rules' '
> + mkdir lhs-ambiguous &&
> + (
> + cd lhs-ambiguous &&
> + git init server &&
> + test_commit -C server unwanted &&
> + test_commit -C server wanted &&
> +
> +
Han-Wen Nienhuys writes:
> On Wed, Aug 1, 2018 at 5:41 PM Junio C Hamano wrote:
>
>> Hmm, do we actually say things like "Error: blah"? I am not sure if
>> I like this strncasecmp all that much.
>
> this is for the remote end, so what we (git-core) says isn't all that
> relevant.
It is very re
On 07/31, Jonathan Tan wrote:
> > On Mon, Jul 30, 2018 at 03:56:01PM -0700, Jonathan Tan wrote:
> >
> > > Commit 989b8c4452 ("fetch-pack: put shallow info in output parameter",
> > > 2018-06-28) allows transports to report the refs that they have fetched
> > > in a new out-parameter "fetched_refs"
Jonathan Tan writes:
>> +test_expect_success 'LHS of refspec follows ref disambiguation rules' '
>> +mkdir lhs-ambiguous &&
>> +(
>> +cd lhs-ambiguous &&
>> +git init server &&
>> +test_commit -C server unwanted &&
>> +test_commit -C server
The option help text for the force-with-lease option to "git push"
reads like this:
$ git push -h 2>&1 | grep -e force-with-lease
--force-with-lease[=:]
which come from this
0, CAS_OPT_NAME, &cas, N_("refname>:" at both
ends.
It turns out that parse-options machiner
Johannes Schindelin writes:
>> If any other issue arises, I do not mind taking an update, either,
>> but I think at this point the topic is reaching the point of
>> diminishing returns and should switch to incremental.
>
> Thomas had a couple of good suggestions, still, and I am considering to
>
Stefan Beller writes:
> Stefan Beller (8):
> test_decode_color: understand FAINT and ITALIC
> t3206: add color test for range-diff --dual-color
> diff.c: simplify caller of emit_line_0
> diff.c: reorder arguments for emit_line_ws_markup
> diff.c: add set_sign to emit_line_0
> diff: us
On Wed, Aug 1, 2018 at 11:50 AM Phillip Wood wrote:
> On 31/07/18 22:39, Eric Sunshine wrote:
> > On Tue, Jul 31, 2018 at 7:15 AM Phillip Wood
> > wrote:
> >> + /*
> >> +* write_author_script() used to fail to terminate the
> >> GIT_AUTHOR_DATE
> >> +* line with a "'" and
The bug was noticed when writing the previous patch; a fix for this bug
is not easy though: If we choose to ignore the case of the subsection
(and revert most of the code of the previous patch, just keeping
s/strncasecmp/strcmp/), then we'd introduce new sections using the
new syntax, such that
-
This documents current behavior of the config machinery, when changing
the value of some settings. This patch just serves to provide a baseline
for the follow up that will fix some issues with the current behavior.
Signed-off-by: Stefan Beller
---
t/t1300-config.sh | 86 +
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
k
> Am I correct to understand that this patch is a "FIX" for breakage
> introduced by that commit? The phrasing is not helping me to pick
> a good base to queue these patches on.
Please pick 4f4d0b42bae (Merge branch 'js/empty-config-section-fix', 2018-05-08)
as the base of this new series (am nee
On Wed, Aug 1, 2018 at 12:13 PM Junio C Hamano wrote:
>
> Stefan Beller writes:
>
> > Stefan Beller (8):
> > test_decode_color: understand FAINT and ITALIC
> > t3206: add color test for range-diff --dual-color
> > diff.c: simplify caller of emit_line_0
> > diff.c: reorder arguments for em
On Wed, Aug 1, 2018 at 3:34 PM Stefan Beller wrote:
> The first patch stands as is unchanged, and the second and third patch
> are different enough that range-diff doesn't want to show a diff.
For future reference, range-diff's --creation-factor tweak may help
here. Depending upon just how heavil
When a user fetches:
- at least one up-to-date ref and at least one non-up-to-date ref,
- using HTTP with protocol v0 (or something else that uses the fetch
command of a remote helper)
some refs might not be updated after the fetch.
This bug was introduced in commit 989b8c4452 ("fetch-pack: p
> I think 01/02 in this patch series implements something that's better
> & more future-proof.
Thanks. Both patches are:
Reviewed-by: Jonathan Tan
A small note:
> - packfile; any other value instructs Git to use the default algorithm
> + packfile; The default is "default" which instruct
On 7/20/2018 6:16 PM, Stefan Beller wrote:
* Use single rev-parse commands in test output, and pipe the OIDs through 'sort'
Why do we need to sort them? The order of the answers given by rev-parse
is the same as the input given and we did not need to sort it before, i.e.
the unit under test woul
On 7/23/2018 4:41 PM, Jonathan Tan wrote:
+ if (parse_commit(list[i]) ||
+ list[i]->generation < min_generation)
Here...
+ if (parse_commit(parent->item) ||
+ parent->item->date <
On 7/25/2018 6:13 PM, Junio C Hamano wrote:
* ds/reachable (2018-07-20) 18 commits
- commit-reach: use can_all_from_reach
- commit-reach: make can_all_from_reach... linear
- commit-reach: replace ref_newer logic
- test-reach: test commit_contains
- test-reach: test can_all_from_reach_wi
On Wed, Aug 01 2018, Junio C Hamano wrote:
> The option help text for the force-with-lease option to "git push"
> reads like this:
>
> $ git push -h 2>&1 | grep -e force-with-lease
>--force-with-lease[=:]
>
> which come from this
>
> 0, CAS_OPT_NAME, &cas, N_("refname
On 7/25/2018 6:13 PM, Junio C Hamano wrote:
* ds/multi-pack-index (2018-07-20) 23 commits
- midx: clear midx on repack
- packfile: skip loading index if in multi-pack-index
- midx: prevent duplicate packfile loads
- midx: use midx in approximate_object_count
- midx: use existing midx wh
On 01/08/18 20:34, Stefan Beller wrote:
> A use reported a submodule issue regarding strange case indentation
s/use/user/ ?
ATB,
Ramsay Jones
On Wed, Aug 01 2018, Jonathan Tan wrote:
>> I think 01/02 in this patch series implements something that's better
>> & more future-proof.
>
> Thanks. Both patches are:
> Reviewed-by: Jonathan Tan
>
> A small note:
>
>> -packfile; any other value instructs Git to use the default algorithm
>>
Junio C Hamano writes:
> Jeff King writes:
>
>>> Presumably we are already in an error codepath, so if it is
>>> absolutely necessary, then we can issue a lstat() to grab the inum
>>> for the path we are about to create, iterate over the previously
>>> checked out paths issuing lstat() and see w
On 08/01, Jonathan Tan wrote:
> When a user fetches:
> - at least one up-to-date ref and at least one non-up-to-date ref,
> - using HTTP with protocol v0 (or something else that uses the fetch
>command of a remote helper)
> some refs might not be updated after the fetch.
>
> This bug was int
Ævar Arnfjörð Bjarmason writes:
>> + /* N_() will get "<>" around, resulting in
>> ":" */
>
> ...but this comment isn't accurate at all, N_() doesn't wrap the string
> with <>'s, as can be seen by applying this patch:
I know. It is a short-hand for "what's inside N_() we see here"
Derrick Stolee writes:
>> Stuck in review?
>> cf. <20180723203500.231932-1-jonathanta...@google.com>
>
> This comments on the initial values of 'struct ref_filter' (that are
> not used). All we need is the diff below squashed into "test-reach:
> test commit_contains".
>
>> cf. <201807232041
Derrick Stolee writes:
> On 7/25/2018 6:13 PM, Junio C Hamano wrote:
>> * ds/multi-pack-index (2018-07-20) 23 commits
>> ...
>> Ready to move to 'next', with some known issues to be followed up?
>> cf.
> I'm not sure if there is anything actionable for me to do in response
> to this message.
Brandon Williams writes:
> ..., I expect we may need to do a bit more work on the whole
> fetching stack to get what we'd want in that case (because we would want
> to avoid this issue again).
Amen. Thanks all.
Ramsay Jones writes:
> On 01/08/18 20:34, Stefan Beller wrote:
>> A use reported a submodule issue regarding strange case indentation
>
> s/use/user/ ?
True. Also s/indentation/something else/ ?
Insufficient proofreading, perhaps?
On Wed, Aug 01 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>>> + /* N_() will get "<>" around, resulting in
>>> ":" */
>>
>> ...but this comment isn't accurate at all, N_() doesn't wrap the string
>> with <>'s, as can be seen by applying this patch:
>
> I know.
Hi,
Robert Dailey wrote:
> Problem: I want to avoid recursively fetching submodules when I run a
> `fetch` command, and instead defer that operation to the next
> `submodule update`. Essentially I want `fetch.recurseSubmodules` to be
> `false`, and `get submodule update` to do exactly what it doe
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:
Perhaps
s/use/user/
s/case indentation issues/section mix-up/
> ... However we do not have a test for writing out config correctly with
Hi,
Junio C Hamano wrote:
> Add a comment to save future readers from wasting time just like I
> did ;-)
Thanks. I think we should go further, and start the comment with
TRANSLATORS so it shows up for the audience most affected by this as
well. See the note on TRANSLATORS in po/README for deta
Hi,
Junio C Hamano wrote:
> When matching a non-wildcard LHS of a refspec against a list of
> refs, find_ref_by_name_abbrev() returns the first ref that matches
> using any DWIM rules used by refname_match() in refs.c, even if a
> better match occurs later in the list of refs.
Nicely explained.
On Tue, Jul 31, 2018 at 03:33:27AM -0400, Eric Sunshine wrote:
> This is a re-roll of [1] which fixes sequencer bugs resulting in commit
> object corruption when "rebase -i --root" swaps in a new commit as root.
> Unfortunately, those bugs made it into v2.18.0 and have already
> corrupted at least
Jonathan Nieder writes:
>> +const int num_rules = ARRAY_SIZE(ref_rev_parse_rules) - 1;
>
> This is assuming ref_rev_parse_rules consists exactly of its items
> followed by a NULL terminator, which is potentially a bit subtle. I
> wonder if we should put
>
> static const char *ref_rev_p
Junio C Hamano wrote:
> One thing I forgot to mention.
>
> When asking to fetch T, in order to be able to favor refs/tags/T
> over refs/heads/T at the fetching end, you would have to be able to
> *see* both, so all 6 variants "T", "refs/tags/T", "refs/heads/T",
> "refs/remotes/T", "refs/remotes/T/
Hi,
René Scharfe wrote:
> Subject: remote: clear string_list after use in mv()
This subject line doesn't fully reflect the goodness of this change.
How about something like:
remote mv: avoid leaking ref names in string_list
?
> Switch to the _DUP variant of string_list for remote_bran
Hi again,
Robert Dailey wrote:
> Problem: I want to avoid recursively fetching submodules when I run a
> `fetch` command, and instead defer that operation to the next
> `submodule update`. Essentially I want `fetch.recurseSubmodules` to be
> `false`, and `get submodule update` to do exactly what
From: Christian Couder
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
t/t0410-partial-clone.sh | 24 +++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index 71a9b9a3e8..9d513ebf57 100755
From: Christian Couder
We will need to reinitialize the remote odb configuration
as we will make some changes to it in a later commit when
we will detect that a remote is also a remote odb.
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
remote-odb.c | 14 --
rem
From: Christian Couder
Let's make the partial clone filter specific to one odb
instead of general to all the odbs.
This makes it possible to have different partial clone
filters for different odbs.
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
builtin/fetch.c
From: Christian Couder
Instead of using the repository_format_partial_clone global
and fetch_object() directly, let's use has_remote_odb() and
remote_odb_get_direct().
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
builtin/cat-file.c| 5 +++--
builtin/fetch.c
From: Christian Couder
The callers of the fetch_object() and fetch_objects() might
be interested in knowing if these functions succeeded or not.
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
fetch-object.c | 15 +--
fetch-object.h | 6 +++---
sha1-file.c|
From: Christian Couder
The remote-odb.{c,h} files will contain the functions
that are called by the rest of Git mostly from
"sha1-file.c" to access the objects managed by the
remote odbs.
The odb-helper.{c,h} files will contain the functions to
actually implement communication with either the in
From: Christian Couder
This is implemented only in the promisor remote mode
for now by calling fetch_object().
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
odb-helper.c | 14 ++
odb-helper.h | 3 ++-
remote-odb.c | 17 +
remote-odb.h | 1 +
4
From: Christian Couder
This function will be used to get many objects from a promisor
remote.
Signed-off-by: Christian Couder
Signed-off-by: Junio C Hamano
---
odb-helper.c | 15 +++
odb-helper.h | 3 +++
remote-odb.c | 17 +
remote-odb.h | 1 +
4 files changed,
This path series is a follow up from the patch series called "odb
remote" that I sent earlier this year, which was itself a follow up
from previous series. See the links section for more information.
As with the previous "odb remote" series, this series is only about
integrating with the promisor/
From: Christian Couder
Signed-off-by: Junio C Hamano
---
Documentation/config.txt | 5 +
1 file changed, 5 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 43b2de7b5f..2d048d47f2 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -25
75 matches
Mail list logo