Re: GDPR compliance best practices?

On Sun, Jun 03 2018, Peter Backes wrote: > On Sun, Jun 03, 2018 at 12:45:25PM +0200, Ævar Arnfjörð Bjarmason wrote: >> protection". I.e. regulators / prosecutors are much likely to go after >> some advertising company than some project using a Git repo. > > Well, it

Re: GDPR compliance best practices?

On Sun, Jun 03 2018, Peter Backes wrote: > Unfortunatly this important topic of GDPR compliance has not seen much > interest. I don't think you can infer that there's not much interest, but maybe people just don't have anything to say about it. There's a lot of discussions about this that

[PATCH v6 1/8] checkout tests: index should be clean after dwim checkout

t;checkout", failed or otherwise. Then if we ever run into this sort of regression, either in the existing code or with a new feature, we'll know. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t2024-checkout-dwim.sh | 29 + 1 file changed, 29 insertions(+) diff -

[PATCH v6 6/8] builtin/checkout.c: use "ret" variable for return

There is no point in doing this right now, but in later change the "ret" variable will be inspected. This change makes that meaningful change smaller. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/checkout.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-)

[PATCH v6 7/8] checkout: add advice for ambiguous "checkout "

As the "checkout" documentation describes: If is not found but there does exist a tracking branch in exactly one remote (call it ) with a matching name, treat as equivalent to [...] / Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/config.txt | 7 +++

[PATCH v6 3/8] checkout.c: introduce an *_INIT macro

Add an *_INIT macro for the tracking_name_data similar to what exists elsewhere in the codebase, e.g. OID_ARRAY_INIT in sha1-array.h. This will make it more idiomatic in later changes to add more fields to the struct & its initialization macro. Signed-off-by: Ævar Arnfjörð Bjarm

[PATCH v6 8/8] checkout & worktree: introduce checkout.defaultRemote

origin/frotz"", 2009-10-18) which introduced this DWIM feature to begin with, and 4e85333197 ("worktree: make add dwim", 2017-11-26) which added it to git-worktree. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/config.txt | 21

[PATCH v6 2/8] checkout.h: wrap the arguments to unique_tracking_name()

The line was too long already, and will be longer still when a later change adds another argument. Signed-off-by: Ævar Arnfjörð Bjarmason --- checkout.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checkout.h b/checkout.h index 9980711179..4cd4cd1c23 100644

[PATCH v6 5/8] checkout: pass the "num_matches" up to callers

Pass the previously added "num_matches" struct value up to the callers of unique_tracking_name(). This will allow callers to optionally print better error messages in a later change. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/checkout.c | 10 +++--- builtin/workt

[PATCH v6 4/8] checkout.c]: change "unique" member to "num_matches"

Internally track how many matches we find in the check_tracking_name() callback. Nothing uses this now, but it will be made use of in a later change. Signed-off-by: Ævar Arnfjörð Bjarmason --- checkout.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checkout.c b

[PATCH v6 0/8] ambiguous checkout UI & checkout.defaultRemote

3f4f checkout.c: introduce an *_INIT macro @@ -1,6 +1,6 @@ Author: Ævar Arnfjörð Bjarmason -checkout.[ch]: introduce an *_INIT macro +checkout.c: introduce an *_INIT macro Add an *_INIT macro for the tracking_name_data similar to

[PATCH v5 5/8] checkout: pass the "num_matches" up to callers

Pass the previously added "num_matches" struct value up to the callers of unique_tracking_name(). This will allow callers to optionally print better error messages in a later change. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/checkout.c | 10 +++--- builtin/workt

[PATCH v5 2/8] checkout.h: wrap the arguments to unique_tracking_name()

The line was too long already, and will be longer still when a later change adds another argument. Signed-off-by: Ævar Arnfjörð Bjarmason --- checkout.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checkout.h b/checkout.h index 9980711179..4cd4cd1c23 100644

[PATCH v5 6/8] builtin/checkout.c: use "ret" variable for return

There is no point in doing this right now, but in later change the "ret" variable will be inspected. This change makes that meaningful change smaller. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/checkout.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-)

[PATCH v5 1/8] checkout tests: index should be clean after dwim checkout

t;checkout", failed or otherwise. Then if we ever run into this sort of regression, either in the existing code or with a new feature, we'll know. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t2024-checkout-dwim.sh | 29 + 1 file changed, 29 insertions(+) diff -

[PATCH v5 0/8] ambiguous checkout UI & checkout.defaultRemote

uivalent to [...] / -hint: instead of ? +hint: If you meant to check out a remote tracking branch on e.g. 'origin' +hint: you can do so by fully-qualifying the name with the --track option: + hint: +hint: g

[PATCH v5 3/8] checkout.[ch]: introduce an *_INIT macro

Add an *_INIT macro for the tracking_name_data similar to what exists elsewhere in the codebase, e.g. OID_ARRAY_INIT in sha1-array.h. This will make it more idiomatic in later changes to add more fields to the struct & its initialization macro. Signed-off-by: Ævar Arnfjörð Bjarm

[PATCH v5 8/8] checkout & worktree: introduce checkout.defaultRemote

origin/frotz"", 2009-10-18) which introduced this DWIM feature to begin with, and 4e85333197 ("worktree: make add dwim", 2017-11-26) which added it to git-worktree. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/config.txt | 21

[PATCH v5 4/8] checkout.[ch]: change "unique" member to "num_matches"

Internally track how many matches we find in the check_tracking_name() callback. Nothing uses this now, but it will be made use of in a later change. Signed-off-by: Ævar Arnfjörð Bjarmason --- checkout.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checkout.c b

[PATCH v5 7/8] checkout: add advice for ambiguous "checkout "

As the "checkout" documentation describes: If is not found but there does exist a tracking branch in exactly one remote (call it ) with a matching name, treat as equivalent to [...] / Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/config.txt | 7 +++

Re: [PATCH v4 8/9] checkout: add advice for ambiguous "checkout "

On Fri, Jun 01 2018, Eric Sunshine wrote: > On Thu, May 31, 2018 at 3:52 PM, Ævar Arnfjörð Bjarmason > wrote: >> As the "checkout" documentation describes: >> >> If is not found but there does exist a tracking branch in >> exactly one remot

Re: [PATCH v4 1/9] checkout tests: index should be clean after dwim checkout

On Fri, Jun 01 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Assert that whenever there's a DWIM checkout that the index should be >> clean afterwards, in addition to the correct branch being checked-out. >> ... >> So let's amend the test

Re: [PATCH v4 3/9] checkout.[ch]: move struct declaration into *.h

On Fri, Jun 01 2018, Junio C Hamano wrote: > Thomas Gummerer writes: > >> We seem to have plenty of structs defined in '.c' files, if they are >> only needed there. Its use also seems to be single purpose for the >> callback data, so I'm a bit puzzled how having this in a header file >>

Re: [PATCH v4 8/9] checkout: add advice for ambiguous "checkout "

On Fri, Jun 01 2018, Junio C Hamano wrote: > Junio C Hamano writes: > >> Ævar Arnfjörð Bjarmason writes: >> >>> @@ -1269,6 +1270,16 @@ int cmd_checkout(int argc, const char **argv, const >>> char *prefix) >>> if (opts.patch_mode |

Re: [PATCH v4 8/9] checkout: add advice for ambiguous "checkout "

On Fri, Jun 01 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> @@ -1269,6 +1270,16 @@ int cmd_checkout(int argc, const char **argv, const >> char *prefix) >> if (opts.patch_mode || opts.pathspec.nr) { >> int ret = checkou

Re: [PATCH v4 9/9] checkout & worktree: introduce checkout.defaultRemote

On Thu, May 31 2018, Stefan Beller wrote: > Hi Ævar, > > Sorry for chiming in late. I have a couple of thoughts: > >> ( >> cd /tmp && >> rm -rf tbdiff && >> git clone g...@github.com:trast/tbdiff.git && >> cd tbdiff && >> git branch -m topic && >>

[PATCH v4 9/9] checkout & worktree: introduce checkout.defaultRemote

* than have two config settings, and I couldn't come up with a short name under core.* that made sense (core.defaultRemoteForCheckout?). See also 70c9ac2f19 ("DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"", 2009-10-18) which introduced this DWIM featur

[PATCH v4 8/9] checkout: add advice for ambiguous "checkout "

As the "checkout" documentation describes: If is not found but there does exist a tracking branch in exactly one remote (call it ) with a matching name, treat as equivalent to [...] / hint: instead of ? Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/confi

[PATCH v4 3/9] checkout.[ch]: move struct declaration into *.h

f-by: Ævar Arnfjörð Bjarmason --- checkout.c | 7 --- checkout.h | 7 +++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/checkout.c b/checkout.c index bdefc888ba..8d68f75ad1 100644 --- a/checkout.c +++ b/checkout.c @@ -3,13 +3,6 @@ #include "refspec.h" #include &q

[PATCH v4 7/9] builtin/checkout.c: use "ret" variable for return

There is no point in doing this right now, but in later change the "ret" variable will be inspected. This change makes that meaningful change smaller. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/checkout.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-)

[PATCH v4 4/9] checkout.[ch]: introduce an *_INIT macro

Add an *_INIT macro for the tracking_name_data similar to what exists elsewhere in the codebase, e.g. OID_ARRAY_INIT in sha1-array.h. This will make it more idiomatic in later changes to add more fields to the struct & its initialization macro. Signed-off-by: Ævar Arnfjörð Bjarm

[PATCH v4 1/9] checkout tests: index should be clean after dwim checkout

t;checkout", that's being done with "-uno" because there's going to be some untracked files related to the test itself which we don't care about. Then if we ever run into this sort of regression, either in the existing code or with a new feature, we'll know. Signed-off-by: Ævar A

[PATCH v4 0/9] ambiguous checkout UI & checkout.defaultRemote

v4 started as a simple bug-fix for this one-part series, but since it's not going to make 2.18.0 at this point I thought I'd do some more work on it. Comments on patches below: Ævar Arnfjörð Bjarmason (9): checkout tests: index should be clean after dwim checkout Tests that would have revealed

[PATCH v4 6/9] checkout: pass the "num_matches" up to callers

Pass the previously added "num_matches" struct value up to the callers of unique_tracking_name(). This will allow callers to optionally print better error messages in a later change. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/checkout.c | 16 +++- builtin/workt

[PATCH v4 2/9] checkout.h: wrap the arguments to unique_tracking_name()

The line was too long already, and will be longer still when a later change adds another argument. Signed-off-by: Ævar Arnfjörð Bjarmason --- checkout.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checkout.h b/checkout.h index 9980711179..4cd4cd1c23 100644

[PATCH v4 5/9] checkout.[ch]: change "unique" member to "num_matches"

Internally track how many matches we find in the check_tracking_name() callback. Nothing uses this now, but it will be made use of in a later change. Signed-off-by: Ævar Arnfjörð Bjarmason --- checkout.c | 4 ++-- checkout.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git

Re: [PATCH v3] checkout & worktree: introduce checkout.implicitRemote

On Thu, May 24 2018, Ævar Arnfjörð Bjarmason wrote: > struct tracking_name_data { > /* const */ char *src_ref; > char *dst_ref; > struct object_id *dst_oid; > int unique; > + const char *implicit_remote; > + char *implicit_dst_ref; >

Re: Is origin/HEAD only being created on clone a bug? #leftoverbits

On Wed, May 30 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> If you make an initial commit and push to a remote repo "origin", you >> don't get a remote origin/HEAD reference, and a "fetch" won't create it >> ei

Re: [PATCH 3/4] config doc: elaborate on what transfer.fsckObjects does

On Fri, May 25 2018, Junio C Hamano wrote: > Eric Sunshine writes: > >>> +will instead be left unreferenced in the repository. That's considered >>> +a bug, and hopefully future git release will implement a quarantine >>> +for the "fetch" side as well. >> >> If this was a "BUGS" section in a

Re: [PATCH v2 5/5] fetch: implement fetch.fsck.*

On Wed, May 30 2018, Junio C Hamano wrote: > Earlier I mumbled "this 4-patch series generally looks good but I > need to re-read the implementation step"; I meant this 5-patch > series and here is my impression after re-reading the implementation > step. > > Ævar

Re: [PATCH v2 2/5] config doc: unify the description of fsck.* and receive.fsck.*

On Wed, May 30 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> On Mon, May 28, 2018 at 11:45 AM, Junio C Hamano wrote: >>> If the project has some tool constraints and have to accept new >>> "broken" objects on ongoing basis

Re: [RFC PATCH 3/4] color.ui config: don't die on unknown values

On Wed, May 30 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Before this change git will die on any unknown color.ui values: >> >> $ git -c color.ui=doesnotexist show >> fatal: bad numeric config value 'doesnotexist' for 'color.

Re: [PATCH 1/4] config doc: move color.ui documentation to one place

On Thu, May 31 2018, Jeff King wrote: > On Wed, May 30, 2018 at 09:06:38PM +0000, Ævar Arnfjörð Bjarmason wrote: > >> Ever since b982592d66 ("git-status: document colorization config >> options", 2006-09-11) we've slowly been accumulating more and mo

Re: [RFC PATCH 4/4] color.ui config: add "isatty" setting

On Wed, May 30 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> A co-worker of mine who was using UNIX systems when dinosaurs roamed >> the earth was lamenting that kids these days were using tools like >> "git" that thought they knew b

Re: [RFC PATCH 4/4] color.ui config: add "isatty" setting

On Thu, May 31 2018, Jeff King wrote: > On Wed, May 30, 2018 at 09:06:41PM +0000, Ævar Arnfjörð Bjarmason wrote: > >> A co-worker of mine who was using UNIX systems when dinosaurs roamed >> the earth was lamenting that kids these days were using tools like >> "git&q

Re: [PATCH] fsckObjects tests: show how v2.17.1 can exploit downstream

On Thu, May 31 2018, Jeff King wrote: > On Tue, May 29, 2018 at 11:59:07PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> > I'm not sure what testing this buys us. [...] >> >> Half of what I'm trying to do here is clarifying the v2.17.1 release >> notes. The initia

[PATCH 2/4] config doc: clarify "to a terminal" in color.ui

o explicitly disable color output to the pager. Let's change the documentation to reflect this. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/config.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 44735d

[PATCH 1/4] config doc: move color.ui documentation to one place

h variable is for, and then copy/paste a new boilerplate saying that this variable takes the exact same values as color.ui, and if it's unset it'll fallback to whatever color.ui is set to. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/config.txt | 81 ++-- 1 file c

[RFC PATCH 3/4] color.ui config: don't die on unknown values

enough. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/config.txt | 5 + color.c | 13 + t/t7006-pager.sh | 16 3 files changed, 34 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index 476736351

[RFC PATCH 4/4] color.ui config: add "isatty" setting

heuristics for when to turn itself on even if isatty(3) were returning true. At that point the fans of plain isatty(3) will become even more upset at what we're doing, so let's give them a simple future-proof opt-out. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/config.txt | 10 +++

[PATCH 0/4] color.ui docs & add color.ui=isatty

on unknown future values, so I'm leaning towards saying that should be accepted to git. But while I was working towards 4/4 I did some nice fixes in [12]/4. I think those should go in regardless, so they're non-RFC. Ævar Arnfjörð Bjarmason (4): config doc: move color.ui documentation to one place

Re: some (fairly simple) questions about hooks

On Wed, May 30 2018, Robert P. J. Day wrote: > just want to clarify a few things about hooks to make sure i'm not > missing anything when i write my own hooks tutorial. > > first, for any hook to be active, it *must* be marked as executable > -- that much seems clear from the man page.

Re: [RFC PATCH 0/5] format-patch: automate cover letter range-diff

On Wed, May 30 2018, Eric Sunshine wrote: > * The final name for the 'tbdiff' replacement has not yet been nailed > down. The name git-branch-diff is moribund[2]; Dscho favors merging > the functionality into git-branch as a new --diff option[3]; others > prefer a standalone command named

Re: [PATCH] fsckObjects tests: show how v2.17.1 can exploit downstream

On Tue, May 29 2018, Jeff King wrote: > On Tue, May 29, 2018 at 09:19:50PM +0000, Ævar Arnfjörð Bjarmason wrote: > >> Something that's known but not explicitly discussed in the v2.17.1 >> release notes, or tested for, is that v2.17.1 will still happily pass >> on

[PATCH] fsckObjects tests: show how v2.17.1 can exploit downstream

worth testing for this explicitly. So let's amend the tests added in 73c3f0f704 ("index-pack: check .gitmodules files with --strict", 2018-05-04) to show how this can result in a v2.17.1 client passing along the evil objects. Signed-off-by: Ævar Arnfjörð Bjarmason --- I guess

Is origin/HEAD only being created on clone a bug? #leftoverbits

Here's some more #leftoverbits where we have a clone/fetch feature discrepancy and where clone is magical in ways that "fetch" isn't. If you make an initial commit and push to a remote repo "origin", you don't get a remote origin/HEAD reference, and a "fetch" won't create it either. You will get

Re: does a new repo actually *need* default template content?

On Mon, May 28 2018, Robert P. J. Day wrote: > (apologies for more pedantic nitpickery, just little things i'm > running across in my travels. aside: i actually teach git courses, so > it's a bit embarrassing that i don't know some of this stuff. *sigh*.) Aside from maybe the empty branches/

Re: [PATCH v2 2/5] config doc: unify the description of fsck.* and receive.fsck.*

On Mon, May 28, 2018 at 11:45 AM, Junio C Hamano wrote: > Eric Sunshine writes: > >>> @@ -1554,23 +1554,42 @@ filter..smudge:: >>> +Depending on the circumstances it might be better to use >>> +`fsck.skipList` instead to explicitly whitelist those

[PATCH v2 3/5] config doc: elaborate on what transfer.fsckObjects does

. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index af7311e73f..71b3805b4e 100644 --- a/Documentation/config.txt

[PATCH v2 5/5] fetch: implement fetch.fsck.*

specific objects. The use of --git-dir=* instead of -C in the tests could be considered somewhat archaic, but the tests I'm adding here are duplicating the corresponding receive.* tests with as few changes as possible. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documen

[PATCH v2 0/5] fsck: doc fixes & fetch.fsck.* implementation

This should address all the comments to v1. Inter-diff: 1: a9cd795db5 ! 1: 3d61e44cb8 config doc: don't describe *.fetchObjects twice @@ -1,10 +1,6 @@ Author: Ævar Arnfjörð Bjarmason <ava...@gmail.com> config doc: don't describe *.fetchO

[PATCH v2 2/5] config doc: unify the description of fsck.* and receive.fsck.*

was initially added in 2becf00ff7 ("fsck: support demoting errors to warnings", 2015-06-22) and 4b55b9b479 ("fsck: document the new receive.fsck. options", 2015-06-22). Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Doc

[PATCH v2 1/5] config doc: don't describe *.fetchObjects twice

in a later patch. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 84e2891aed..623dffd198 100644 --- a/Documen

[PATCH v2 4/5] config doc: mention future aspirations for transfer.fsckObjects

cal local quarantine patch, so let's we might change this in the future. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 71b

Re: [PATCH v3] checkout & worktree: introduce checkout.implicitRemote

On Fri, May 25 2018, Duy Nguyen wrote: > On Fri, May 25, 2018 at 10:12 AM, Junio C Hamano wrote: >>> +Currently this is used by linkgit:git-checkout[1] when 'git checkout >>> +' will checkout the '' branch on another remote, >>> +and by linkgit:git-worktree[1] when 'git

sb/submodule-move-nested breaks t7411 under GIT_FSMONITOR_TEST

On Thu, May 17 2018, Junio C Hamano wrote: > * sb/submodule-move-nested (2018-03-29) 6 commits > (merged to 'next' on 2018-04-25 at 86b177433a) > + submodule: fixup nested submodules after moving the submodule > + submodule-config: remove submodule_from_cache > + submodule-config: add

Re: "man git-tag" inconsistent about whether you can tag non-commit objects

On Fri, May 25 2018, Junio C Hamano wrote: > "Robert P. J. Day" writes: > >> embarrassed to admit i had no idea that you could tag non-commit >> objects, only realized that when i was reading the man page and saw: >> >> SYNOPSIS >> git tag [-a | -s | -u ] [-f]

Re: BUG: No way to set fsck. when cloning

On Thu, May 24 2018, Thomas Braun wrote: > Am 24.05.2018 um 17:25 schrieb Ævar Arnfjörð Bjarmason: >> When I do: >> >> git -c fetch.fsckObjects=true clone >> g...@github.com:robbyrussell/oh-my-zsh.git >> >> I get: >> >> err

Re: [PATCH v3 00/20] Integrate commit-graph into 'fsck' and 'gc'

On Thu, May 24 2018, Derrick Stolee wrote: > Thanks for all the feedback on v2. I've tried to make this round's > review a bit easier by splitting up the commits into smaller pieces. > Also, the test script now has less boilerplate and uses variables and > clear arithmetic to explain which bytes

Re: [PATCH 2/4] config doc: unify the description of fsck.* and receive.fsck.*

On Thu, May 24 2018, Eric Sunshine wrote: > On Thu, May 24, 2018 at 3:35 PM, Ævar Arnfjörð Bjarmason > <ava...@gmail.com> wrote: >> The documentation for the fsck. and receive.fsck. >> variables was mostly duplicated in two places, with fsck. >> making n

[PATCH v3] checkout & worktree: introduce checkout.implicitRemote

re.* that made sense (core.implicitRemoteForCheckout?). See also 70c9ac2f19 ("DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"", 2009-10-18) which introduced this DWIM feature to begin with, and 4e85333197 ("worktree: make add dwim"

Re: What's cooking in git.git (May 2018, #03; Wed, 23)

On Thu, May 24 2018, Junio C Hamano wrote: > * ab/fetch-tags-noclobber (2018-05-16) 9 commits > - fixup! push tests: assert re-pushing annotated tags > - fetch: stop clobbering existing tags without --force > - fetch tests: add a test clobbering tag behavior > - fetch tests: correct a

[PATCH 4/4] fetch: implement fetch.fsck.*

specific objects. The use of --git-dir=* instead of -C in the tests could be considered somewhat archaic, but the tests I'm adding here are duplicating the corresponding receive.* tests with as few changes as possible. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documen

[PATCH 2/4] config doc: unify the description of fsck.* and receive.fsck.*

was initially added in 2becf00ff7 ("fsck: support demoting errors to warnings", 2015-06-22) and 4b55b9b479 ("fsck: document the new receive.fsck. options", 2015-06-22). Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Doc

[PATCH 1/4] config doc: don't describe *.fetchObjects twice

this description of it makes much sense, but for now I'm just moving the existing documentation around. Making it better will be done in a later patch. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 18 ++ 1 file changed, 10 inse

[PATCH 3/4] config doc: elaborate on what transfer.fsckObjects does

-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 351c541ab8..124f7a187c 100644 --- a/Documentation/config.txt

[PATCH 0/4] fsck: doc fixes & fetch.fsck.* implementation

On Thu, May 24, 2018 at 9:02 PM, Jeff King <p...@peff.net> wrote: > On Thu, May 24, 2018 at 07:04:04PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> That doesn't work, because that's for the server-side, but I need the >> fetch.fsck.* that doesn't exist. This works (

Re: BUG: No way to set fsck. when cloning

On Thu, May 24 2018, Kevin Daudt wrote: > On Thu, May 24, 2018 at 05:25:29PM +0200, Ævar Arnfjörð Bjarmason wrote: >> When I do: >> >> git -c fetch.fsckObjects=true clone >> g...@github.com:robbyrussell/oh-my-zsh.git >>

BUG: No way to set fsck. when cloning

When I do: git -c fetch.fsckObjects=true clone g...@github.com:robbyrussell/oh-my-zsh.git I get: error: object 2b7227859263b6aabcc28355b0b994995b7148b6: zeroPaddedFilemode: contains zero-padded file modes fatal: Error in object fatal: index-pack failed The docs

Why do we have both x*() and *_or_die() for "do or die"?

On Wed, May 16 2018, Stefan Beller wrote: > A common pattern with the repo_read_index function is to die if the return > of repo_read_index is negative. Move this pattern into a function. Just a side-question unrelated to this patch per-se, why do we have both x*() and *_or_die() functions in

Re: should config options be treated as case-sensitive?

On Tue, May 22 2018, Robert P. J. Day wrote: > in my wanderings, more oddities, such as this: > > $ grep -ir blankboundary * > builtin/blame.c: if (!strcmp(var, "blame.blankboundary")) { > Documentation/config.txt:blame.blankBoundary:: > Documentation/blame-options.txt: be controlled

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Tue, May 08 2018, Jeff King wrote: > On Mon, May 07, 2018 at 03:24:59PM -0700, Stefan Beller wrote: > >> Hence I propose "git range-diff", similar to topic-diff, that >> was proposed earlier. >> >> * it "diffs ranges" of commits. >> * it can also deal with out-of-git things like patch series,

Re: jk/branch-l-0-deprecation (was Re: What's cooking in git.git (May 2018, #02; Thu, 17))

On Thu, May 17 2018, Kaartic Sivaraam wrote: > Hi Ævar, > > On Thursday 17 May 2018 03:18 PM, Ævar Arnfjörð Bjarmason wrote: >> I've ended up with that $LESS setting via hackery over the years, so >> maybe I'm doing something retarded, minimal test case: >> >>

Re: jk/branch-l-0-deprecation (was Re: What's cooking in git.git (May 2018, #02; Thu, 17))

On Thu, May 17 2018, Kaartic Sivaraam wrote: > On Thursday 17 May 2018 11:31 AM, Junio C Hamano wrote: >> * jk/branch-l-0-deprecation (2018-03-26) 3 commits >> >> ... >> >> The "-l" option in "git branch -l" is an unfortunate short-hand for >> "--create-reflog", but many users, both old and

Re: worktrees vs. alternates

On Wed, May 16 2018, Konstantin Ryabitsev wrote: > Maybe git-repack can be told to only borrow parent objects if they are > in packs. Anything not in packs should be hardlinked into the child > repo. That's my wishful think for the day. :) Can you elaborate on how this would help? We're just

Re: worktrees vs. alternates

On Wed, May 16 2018, Konstantin Ryabitsev wrote: > On Wed, May 16, 2018 at 05:34:34PM +0200, Ævar Arnfjörð Bjarmason wrote: >>I may have missed some edge case, but I believe this entire workaround >>isn't needed if you guarantee that the parent repo doesn't contain any >>obj

Re: worktrees vs. alternates

On Wed, May 16 2018, Konstantin Ryabitsev wrote: > On 05/16/18 09:02, Derrick Stolee wrote: >> This is the biggest difference. You cannot have the same ref checked out >> in multiple worktrees, as they both may edit that ref. The alternates >> allow you to share data in a "read only" fashion. If

Re: worktrees vs. alternates

On Wed, May 16 2018, Robert P. J. Day wrote: > On Wed, 16 May 2018, Ævar Arnfjörð Bjarmason wrote: > >> >> On Wed, May 16 2018, Lars Schneider wrote: >> >> > I am looking into different options to cache Git repositories on build >> > machines. The two m

Re: worktrees vs. alternates

On Wed, May 16 2018, Lars Schneider wrote: >> On 16 May 2018, at 11:29, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: >> >> >> On Wed, May 16 2018, Lars Schneider wrote: >> >>> I am looking into different options to cache Git repositories on bu

Re: worktrees vs. alternates

On Wed, May 16 2018, Lars Schneider wrote: > I am looking into different options to cache Git repositories on build > machines. The two most promising ways seem to be git-worktree [1] and > git-alternates [2]. > > I wonder if you see an advantage of one over the other? > > My impression is that

Re: [PATCH v1 2/8] Add initial odb remote support

On Sun, May 13 2018, Christian Couder wrote: > "sha1_file.c"[...] sha1-file.c these days :)

Re: [PATCH 00/35] refactoring refspecs

On Mon, May 14 2018, Brandon Williams wrote: > When working on protocol v2 I noticed that working with refspecs was a > little difficult because of the various api's that existed. Some > functions expected an array of "const char *" while others expected an > array of "struct refspec". In all

Re: [PATCH 14/35] remote: convert fetch refspecs to struct refspec

On Mon, May 14 2018, Brandon Williams wrote: > void add_prune_tags_to_fetch_refspec(struct remote *remote) > { > - int nr = remote->fetch_refspec_nr; > - int bufsize = nr + 1; > - int size = sizeof(struct refspec_item); > - > - remote->fetch = xrealloc(remote->fetch, size *

Re: [PATCH 35/35] submodule: convert push_unpushed_submodules to take a struct refspec

On Mon, May 14 2018, Brandon Williams wrote: > Convert 'push_unpushed_submodules()' to take a 'struct refspec' as a > parameter instead of an array of 'const char *'. > [...] > diff --git a/submodule.h b/submodule.h > index e5526f6aa..aae0c9c8f 100644 > --- a/submodule.h > +++ b/submodule.h > @@

Re: could `git merge --no-ff origin/master` be made more useful?

On Mon, May 14 2018, demerphq wrote: > The first time I tried to use --no-ff I tried to do something like this: > > git checkout master > git commit -a -m'whatever' > git commit -a -m'whatever2' > git merge --no-ff origin/master > > and was disappointed when "it didn't work" and git told

Re: [PATCH 00/12] Integrate commit-graph into fsck, gc, and fetch

On Thu, May 10 2018, Derrick Stolee wrote: > The behavior in this patch series does the following: > > 1. Near the end of 'git gc', run 'git commit-graph write'. The location >of this code assumes that a 'git gc --auto' has not terminated early >due to not meeting the auto threshold. > >

Re: bug: SHA1 calculation on PPC machines when built with gcc older than 4.6

On Thu, May 10, 2018 at 8:11 PM, Ken Cunningham wrote: > Some vintage Apple PPC machines build a non-funtional version of git as of > git 13.1 when using the stock gcc compilers that are installed with the OS; > the SHA1 calculations are faulty. This can be

[PATCH v4 2/6] sha1-array.h: align function arguments

The arguments weren't lined up with the opening parenthesis. Fixes up code added in aae0caf19e ("sha1-array.h: align function arguments", 2018-04-30). Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- sha1-array.c | 4 ++-- sha1-array.h | 4 ++-- 2 files changed, 4

[PATCH v4 6/6] get_short_oid: document & warn if we ignore the type selector

no object of the requested type matched the provide short SHA1 06fa Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- sha1-name.c | 11 ++- t/t1512-rev-parse-disambiguation.sh | 5 - 2 files changed, 14 insertions(+), 2 deletions(-) d

[PATCH v4 1/6] sha1-name.c: remove stray newline

This stray newline was accidentally introduced in d2b7d9c7ed ("sha1_name: convert disambiguate_hint_fn to take object_id", 2017-03-26). Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- sha1-name.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sha1-name.c b/s

<    4   5   6   7   8   9   10   11   12   13   >