On Sun, Aug 5, 2018 at 7:23 PM Thomas Gummerer wrote:
Late reply since I just saw this in next.
> Currently rerere can't handle nested conflicts and will error out when
> it encounters such conflicts. Do that by recursively calling the
> 'handle_conflict' function to normalize the conflict.
>
On Wed, Aug 22, 2018 at 8:20 AM Jeff King wrote:
>
> On Wed, Aug 22, 2018 at 05:36:26AM +, brian m. carlson wrote:
>
> > On Tue, Aug 21, 2018 at 11:03:44PM -0400, Jeff King wrote:
> > > So I wonder if there's some other way to tell the compiler that we'll
> > > only have a few values. An enum
On Mon, Aug 20 2018, Ulrich Windl wrote:
>>>> Jeff King schrieb am 16.08.2018 um 22:55 in Nachricht
> <20180816205556.ga8...@sigill.intra.peff.net>:
>> On Thu, Aug 16, 2018 at 10:35:53PM +0200, Ævar Arnfjörð Bjarmason wrote:
>>
>>> This is all interes
On Mon, Aug 20 2018, Christian Couder wrote:
> Hi,
>
> A draft of a new Git Rev News edition is available here:
>
>
> https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-42.md
>
> Everyone is welcome to contribute in any section either by editing the
> above page on
On Thu, Aug 16 2018, Jeff King wrote:
> - Christian Couder
> - Ævar Arnfjörð Bjarmason
Thanks for the nomination. I'm happy to help the project by serving on
the leadership committee if you'll have me.
> Both are active, have been around a long time, and have taken part in
&
On Sat, Aug 18 2018, Jonathan Nieder wrote:
> Ævar Arnfjörð Bjarmason wrote:
>
>> The reason I can drop a "git-whatever" in my $PATH and invoke it as "git
>> whatever" is just a historical accident of how git was implemented.
>
> No. This is a very
On Sat, Aug 18 2018, Jonathan Nieder wrote:
> Hi,
>
> Ævar Arnfjörð Bjarmason wrote:
>> On Sat, Aug 18 2018, Jonathan Nieder wrote:
>>> Michael Muré wrote:
>
>>>> I released today git-bug, a distributed bug tracker
> [...]
>>> I am a bit u
On Sat, Aug 18 2018, Jonathan Nieder wrote:
> Hi,
>
> Michael Muré wrote:
>
>> I released today git-bug, a distributed bug tracker that embeds in
>> git. It use git's internal storage to store bugs information in a way
>> that can be merged without conflict. You can push/pull to the normal
>>
On Sat, Aug 18 2018, Christian Couder wrote:
> On Sat, Aug 18, 2018 at 12:44 AM Junio C Hamano wrote:
>
>> * cc/delta-islands (2018-08-16) 7 commits
>> - pack-objects: move 'layer' into 'struct packing_data'
>> - pack-objects: move tree_depth into 'struct packing_data'
>> - t5320: tests for
On Fri, Aug 17 2018, Junio C Hamano wrote:
> Usually, I refrain from merging larger topics in 'next' down to
> 'master' when we get close to -rc0, but I am wondering if it is
> better to merge all of them to 'master', even the ones on the larger
> and possibly undercooked side, expecting that
Reported-by: CB Bailey
Signed-off-by: CB Bailey
Signed-off-by: Ævar Arnfjörð Bjarmason
---
On Sat, Aug 18, 2018 at 6:43 AM, CB Bailey wrote:
> checkout with the -p switch uses the "add interactive" framework which
> is written in Perl. Add a PERL prerequisite to skip this
On Fri, Aug 17 2018, Samuel Maftoul wrote:
> I recently contributed for the first time patches on this maillist and
> used for the first time `git format-patch` and `git send-email`.
> I had hard times making `git send-email` work on my mac, because the
> OSX bundled perl was missing the
Change the few conditional uses of FREE_AND_NULL(x) to be
unconditional. As noted in the standard[1] free(NULL) is perfectly
valid, so we might as well leave this check up to the C library.
1. http://pubs.opengroup.org/onlinepubs/9699919799/functions/free.html
Signed-off-by: Ævar Arnfjörð
On Thu, Aug 16 2018, Jeff King wrote:
> On Thu, Aug 16, 2018 at 08:54:25AM +0200, Ulrich Windl wrote:
>
>> I'd like to point out some minor issue observed while processing some
>> 5-object repository with many binary objects, but most are rather
>> small:
>>
>> Between the two phases of
On Thu, Aug 16 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> On Thu, Aug 16, 2018 at 12:54 PM, Shani Fridman
>> wrote:
>>>
>>> Hi everybody,
>>>
>>> I've got a question regarding submodules -
>>
On Thu, Aug 16, 2018 at 12:54 PM, Shani Fridman
wrote:
>
> Hi everybody,
>
> I've got a question regarding submodules -
>
> I'm working on a git project with submodules connected to it, and pulling
> changes from them every month (more or less).
> Sometimes I need to checkout older versions of
f that "o->flags |= PARSE_OPT_HIDDEN" line in
cmd_parseopt() in builtin/rev-parse.c should also be setting
PARSE_OPT_NOCOMPLETE.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
On Thu, Aug 16, 2018 at 9:46 AM, Hadi Safari wrote:
>
> Hi!
>
> I'm wondering why there isn't --allow
On Wed, Aug 15 2018, Linus Torvalds wrote:
> On Wed, Aug 15, 2018 at 2:29 PM Ævar Arnfjörð Bjarmason
> wrote:
>>
>> Downloading & trying versions of it locally reveals that it's as of
>> version 520, not 530. The last version before 520 is 487. Presumably
On Wed, Aug 15 2018, Linus Torvalds wrote:
> Sadly, as of less-530, the behavior of "less -F" is broken enough that
> I think git needs to potentially think about changing the defaults for
> the pager, or people should at least be aware of it.
Downloading & trying versions of it locally
On Wed, Aug 15 2018, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>>> # Guard against environment variables
>>> MAN1_TXT =
>>> +MAN1_TXT_WIP =
>>> +TCLTK_FILES =
>>
>> The latter name loses the fact that it is to hold candidates to be
>> on MAN1_TXT that happen to be conditionally
Extend the NO_TCLTK=NoThanks flag to be understood by the
Documentation Makefile.
Before this change compiling and installing with NO_TCLTK would result
in no git-gui, gitk or git-citool being installed, but their
respective manual pages would still be installed.
Signed-off-by: Ævar Arnfjörð
On Tue, Aug 14 2018, Christian Couder wrote:
> Hi,
>
> When cloning with --mirror, the clone gets its HEAD initialized with
> the value HEAD has in its origin remote. After that if HEAD changes in
> origin there is no simple way to sync HEAD at the same time as the
> refs are synced.
>
> It
On Tue, Aug 14 2018, Stefan Beller wrote:
> On Tue, Aug 14, 2018 at 2:05 PM Ævar Arnfjörð Bjarmason
> wrote:
>
>> > So ideally we'd also error out as soon as the host name is touched?
>>
>> Do we have some utility function that'll take whatever we have
On Tue, Aug 14 2018, Stefan Beller wrote:
> On Tue, Aug 14, 2018 at 11:59 AM Ævar Arnfjörð Bjarmason
> wrote:
>>
>> The tests added in 63e95beb08 ("submodule: port resolve_relative_url
>> from shell to C", 2016-04-15) didn't do a good job of testing various
&
On Tue, Aug 14 2018, Eric Wong wrote:
> Ævar Arnfjörð Bjarmason wrote:
>> Add a --send-delay option with a corresponding sendemail.smtpSendDelay
>> configuration variable. When set to e.g. 2, this causes send-email to
>> sleep 2 seconds before sending the next E-M
it's worth exhaustively testing
them before fixing any of this code, so we can see which of these
cases were changed.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
The reason I started to poke at this was because I wanted to add
support for relative URLs like //group/project.
This solves t
d, which getopt would corrupt in cases of e.g. float
values before we could show a sensible error message.
1.
https://public-inbox.org/git/20180325210132.ge74...@genre.crustytoothpaste.net/
2. https://public-inbox.org/git/xmqqpo3rehe4@gitster-ct.c.googlers.com/
Signed-off-by: Ævar Arnfjörð Bjar
On Tue, Aug 14 2018, Randall S. Becker wrote:
> On August 14, 2018 2:53 AM, Elijah Newren wrote:
>> On Mon, Aug 13, 2018 at 10:27 AM Jeff King wrote:
>> >
>> > For the past several years, we've held a Git Contributor Summit as
>> > part of the Git Merge conference. I'd like to get opinions
On Mon, Aug 13 2018, Jeff King wrote:
> On Mon, Aug 13, 2018 at 11:22:10PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> > O_APPEND is POSIX and means race-free append. If you mark some call
>> > sites with O_APPEND, then that must be the ones that need race-free
>> &
On Mon, Aug 13 2018, Johannes Sixt wrote:
> Am 13.08.2018 um 22:20 schrieb Junio C Hamano:
>> Johannes Sixt writes:
>>
>>> The Windows CRT implements O_APPEND "manually": on write() calls, the
>>> file pointer is set to EOF before the data is written. Clearly, this is
>>> not atomic. And in
On Mon, Aug 13 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> This is unchanged from what's been cooking in pu for months now, so
>> hopefully it can be merged down faster than most, and then I can later
>> submit the actual meat of this series on
There was no reason to
suspect that the receive machinery wouldn't behave the same way with
annotated tags, but now we know for sure.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5516-fetch-push.sh | 82 ---
1 file changed, 45 insertions(+), 37 deletions(
2-11-29).
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5516-fetch-push.sh | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index bd8f23e430..2cbe459ee6 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fe
f-by: Ævar Arnfjörð Bjarmason
---
t/t5510-fetch.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 62308be499..fdb73b3971 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -613,7 +613,7 @@ test_configured_
It should be "is not an empty string" not "is not empty string". This
fixes wording originally introduced in ab9b31386b ("Documentation:
multi-head fetch.", 2005-08-24).
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/pull-fetch-param.txt | 2 +-
1 f
or "--force" will enable clobbering, with neither taking priority
over the other.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5516-fetch-push.sh | 22 --
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
ind
as there was nothing new to push.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5516-fetch-push.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 2cbe459ee6..59d7ea689a 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push
, the code was not creating a new tag at all, and then failing
to push the previous tag for the unrelated reason of providing a
refspec that doesn't make any sense.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5516-fetch-push.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
the actual meat of this series once I fix the (mostly doc)
issues with it.
Ævar Arnfjörð Bjarmason (7):
fetch tests: change "Tag" test tag to "testTag"
push tests: remove redundant 'git push' invocation
push tests: fix logic error in "push" test assertion
pus
On Mon, Aug 13 2018, Jeff King wrote:
> For the past several years, we've held a Git Contributor Summit as part
> of the Git Merge conference. I'd like to get opinions from the community
> to help plan future installments. Any feedback or opinion is welcome,
> but some obvious things to think
On Sat, Aug 11 2018, René Scharfe wrote:
> Object IDs to skip are stored in a shared static oid_array. Lookups do
> a binary search on the sorted array. The code checks if the object IDs
> are already in the correct order while loading and skips sorting in that
> case.
I think this change
On Sat, Aug 11 2018, Elijah Newren wrote:
[CC'd sha1dc maintainers, for context the relevent patch is
https://public-inbox.org/git/20180811043218.31456-8-new...@gmail.com/T/#u]
> * Patches 6-8: These patches might need to be submitted to separate
> projects elsewhere. Let me know if so.
On Sat, Aug 04 2018, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin
>
> Git for Windows' original 4aa8b8c8283 (Teach 'git pull' to handle
> --rebase=interactive, 2011-10-21) had support for the very convenient
> abbreviation
>
> git pull --rebase=i
>
> which was
On Mon, Aug 06 2018, Junio C Hamano wrote:
> * ab/newhash-is-sha256 (2018-08-06) 2 commits
> - doc hash-function-transition: pick SHA-256 as NewHash
> - doc hash-function-transition: note the lack of a changelog
>
> Documentation update.
>
> Will Merge to 'next'.
The tip of
On Mon, Aug 06 2018, Randall S. Becker wrote:
> On August 6, 2018 12:40 PM, Ævar Arnfjörð Bjarmason wrote:
>> On Sat, Aug 04 2018, Junio C Hamano wrote:
>>
>> > Duy Nguyen writes:
>> >
>> >> On Sat, Aug 4, 2018 at 8:11 AM Jonathan Nieder
>&
On Mon, Aug 06 2018, Jeff King wrote:
> On Mon, Aug 06, 2018 at 06:40:14PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> Responding to the thread in general, perhaps people would like this more
>> if we turned DEVELOPER=1 DEVOPTS=no-error on by default?
>>
>>
On Sat, Aug 04 2018, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Sat, Aug 4, 2018 at 8:11 AM Jonathan Nieder wrote:
>>> My main concern is not about them but about other
>>> people building from source in order to run (instead of to develop)
>>> Git, and by extension, the people they
On Fri, Aug 03 2018, Phillip Wood wrote:
[snip (all made sense)]
> It seems clear for your comment and Junio's that I need to improve the
> documentation, I'm not sure if that will be enough though or do we need
> to change the behavior? [I'm beginning to see why all the other programs
> I
l mainly be search-replace by me.
Perhaps it's better for readability if those search-replace changes go
into their own change, i.e. make it a three-part where 2/3 does the
search-replace, and promises that 3/3 has the full rationale etc.
> Ævar Arnfjörð Bjarmason wrote:
>
>> From a se
On Fri, Aug 03 2018, Jeff King wrote:
> On Fri, Aug 03, 2018 at 02:56:11PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> > Any Git commands you run should therefore find objects from either
>> > location, but any writes would go to the quarantine (most notably, Git's
&g
On Thu, Aug 02 2018, Jeff King wrote:
> On Thu, Aug 02, 2018 at 12:58:52PM -0500, Liam Decker wrote:
>
>> I've been working on a git hook in golang recently. However, the library I
>> was using did not support a possible quarantine directory, which I would
>> use for my hook.
>>
>> I have been
On Fri, Aug 03 2018, Martin Mosegaard Amdisen wrote:
> The documentation for the "git describe --abbrev" flag says that the
> default value is 7 hexadecimal digits:
> https://github.com/git/git/blob/master/Documentation/git-describe.txt#L63
> and
> https://git-scm.com/docs/git-describe
>
> I
On Thu, Aug 02 2018, Jeff King wrote:
> On Thu, Aug 02, 2018 at 01:55:22PM +0200, SZEDER Gábor wrote:
>
>> Let's add a bit of Makefile metaprogramming to generate finer-grained
>> make targets applying one semantic patch to only a single source file,
>> and specify these as dependencies of the
hpaste.net/
Signed-off-by: Ævar Arnfjörð Bjarmason
---
On Wed, Aug 01 2018, Ævar Arnfjörð Bjarmason wrote:
> https://github.com/cr-marcstevens/sha1collisiondetection/pull/45
>[...]
> It should work, but as noted in the MR please test it so we can make
> sure, and then (if you have a G
On Thu, Aug 02 2018, René Scharfe wrote:
> Don't translate the argument specification for --chmod; "+x" and "-x"
> are the literal strings that the commands accept.
>
> Separate alternatives using a pipe character instead of a slash, for
> consistency.
>
> Use the flag PARSE_OPT_LITERAL_ARGHELP
On Thu, Aug 02 2018, Junio C Hamano wrote:
> René Scharfe writes:
>
>> Am 02.08.2018 um 17:44 schrieb Junio C Hamano:
>>> Subject: [PATCH] push: use PARSE_OPT_LITERAL_ARGHELP instead of unbalanced
>>> brackets
>>> From: Ævar Arnfjörð Bjarmason
&g
On Thu, Aug 02 2018, René Scharfe wrote:
> Am 02.08.2018 um 00:31 schrieb Ævar Arnfjörð Bjarmason:
>> But looking at this again it looks like this whole thing should just be
>> replaced by:
>>
>> diff --git a/builtin/push.c b/builtin/push.c
>> in
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
&
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
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, , N_("refname>:
2018-07-02).
Change the documentation for those two to reference one another to
point readers in the right direction.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config.txt| 2 ++
Documentation/fetch-options.txt | 3 +++
2 files changed, 5 insertions(+)
diff --git a/Docume
up and pretend to be fetching from a repo that has
just one commit.
It would be better if I could somehow say that I don't mind that the
ref doesn't exist, but currently you either error out with this, or
ignore the glob, depending on the mode.
So I want this, but can't think of a less s
ew git version on that particular machine.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config.txt | 3 ++-
fetch-negotiator.c | 12 +---
t/t5552-skipping-fetch-negotiator.sh | 23 +++
3 files changed, 34 insertions(+), 4 del
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 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 stu
On Mon, Jul 16 2018, Jonathan Tan wrote:
Didn't catch this until this was in next, sorry.
Re-arranged the diff a bit:
> -void fetch_negotiator_init(struct fetch_negotiator *negotiator)
> +void fetch_negotiator_init(struct fetch_negotiator *negotiator,
> +const char
On Tue, Jul 31 2018, Michael Felt wrote:
> I hope a I have a "leap forward"
>
>
> On 7/30/2018 11:39 AM, Ævar Arnfjörð Bjarmason wrote:
>> Perhaps it's worth taking a step back here and thinking about whether
>> this whole thing is unworkable. It w
2-11-29).
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5516-fetch-push.sh | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index a5077d8b7c..08b9cf581d 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fe
in "push" test
assertion
@@ -1,17 +1,13 @@
Author: Ævar Arnfjörð Bjarmason
-push tests: fix logic error in "push" test assertion
+fetch tests: change "Tag" test tag to "testTag"
-Fix a logic error th
or "--force" will enable clobbering, with neither taking priority
over the other.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5516-fetch-push.sh | 22 --
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
ind
e behavior
used by "push", but that's a topic for another change.
One of the tests added in 31b808a032 ("clone --single: limit the fetch
refspec to fetched branch", 2012-09-20) is being changed to use
--force where a clone would clobber a tag. This changes nothing about
the
The test suite only incidentally (and unintentionally) tested for the
current behavior of eager tag clobbering on "fetch". This follow-up to
the previous "push tests: assert re-pushing annotated tags" change
tests for it explicitly.
Signed-off-by: Ævar Arnfjörð Bjarmason
There was no reason to
suspect that the receive machinery wouldn't behave the same way with
annotated tags, but now we know for sure.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5516-fetch-push.sh | 82 ---
1 file changed, 45 insertions(+), 37 deletions(
f-by: Ævar Arnfjörð Bjarmason
---
t/t5510-fetch.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index e402aee6a2..6ab093207a 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -613,7 +613,7 @@ test_configured_
t all), and that could be covered separately as an advanced
topic.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/git-push.txt | 30 ++
Documentation/gitrevisions.txt | 7 ---
2 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/Documentation/git
It should be "is not an empty string" not "is not empty string". This
fixes wording originally introduced in ab9b31386b ("Documentation:
multi-head fetch.", 2005-08-24).
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/pull-fetch-param.txt | 2 +-
1 f
, the code was not creating a new tag at all, and then failing
to push the previous tag for the unrelated reason of providing a
refspec that doesn't make any sense.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5516-fetch-push.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
as there was nothing new to push.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5516-fetch-push.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 08b9cf581d..4d487d6875 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push
On Mon, Jul 30 2018, Han-Wen Nienhuys wrote:
> + if (sideband_use_color < 0) {
> + const char *key = "color.remote";
> + char *value = NULL;
> + if (!git_config_get_string(key, ))
> + sideband_use_color = git_config_colorbool(key,
On Mon, Jul 30 2018, Duy Nguyen wrote:
> On Fri, Jul 27, 2018 at 02:37:17PM +0000, Ævar Arnfjörð Bjarmason wrote:
>> diff --git a/Documentation/config.txt b/Documentation/config.txt
>> index 7ff453c53b..8dace49daa 100644
>> --- a/Documentation/config.txt
>> +++
On Sun, Jul 29 2018, Michael wrote:
> On 29/07/2018 22:06, brian m. carlson wrote:
>> On Sun, Jul 29, 2018 at 09:48:43PM +0200, Michael wrote:
>>> On 29/07/2018 21:27, brian m. carlson wrote:
Well, that explains it. I would recommend submitting a patch to
4fca04f937df3e75f7498ac66] sha1dc: update from upstream
>
>
> michael@x071:[/data/prj/aixtools/git/github/git-master]git bisect bad
> 9936c1b52a39fa14fca04f937df3e75f7498ac66 is the first bad commit
> commit 9936c1b52a39fa14fca04f937df3e75f7498ac66
> Author: Ævar Arnfjörð Bjarmason
> Date: Sat
On Fri, Jul 27 2018, Junio C Hamano wrote:
> Æ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 ment
On Fri, Jul 27 2018, Junio C Hamano wrote:
> Æ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
On Thu, Jul 26 2018, Phillip Wood wrote:
> 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 feedback on v3 (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.
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 complete
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
have been
added after that time. This was mostly found with, and manually pruned
from:
git grep '^\s+>.*expect.* &&$' t
Signed-off-by: Ævar Arnfjörð Bjarmason
---
As promised in
https://public-inbox.org/git/cacbzzx4yg5h5kk4nfqz_nzawema+nh3h-39ohtch4xwsa6f...@mail.gmail.com/
her
alid input.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5504-fetch-receive-strict.sh | 28
1 file changed, 28 insertions(+)
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index 771a94b4b6..7f06b537d3 100755
--- a/t/t5504-fetch-receive
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/t550
't explicitly stated that there was no fallback, and if you'd
e.g. like to configure the skipList you need to do that for all three.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config.txt| 12
t/t5504-fetch-receive-strict.sh | 26 --
2 files ch
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
---
Documentation/config.txt
/git/20180531060259.ge17...@sigill.intra.peff.net/
for further details.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config.txt | 21 +
1 file changed, 21 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 291b4f3c57..7ff453c53b
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
---
Documentation/config.txt | 62 +++-
none of the fsck. tests relied on this.
So let's not confuse the two and repair the corrupt repository before
we run the fsck. tests.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5504-fetch-receive-strict.sh | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/t/t55
mention that the fsck checks for security issues, which was my
initial motivation for writing this fetch.fsck.* series.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config.txt | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b
in a later patch.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config.txt | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 43b2de7b5f..6b99cf8d71 100644
--- a/Documentation/config.txt
+++ b
quot;fetch.fsck.*" implementation, not
because they rely on that new feature, but because now fetch.fsck.* is
one of the three modes (along with fsck and receive) that we'd like to
test.
Ævar Arnfjörð Bjarmason (10):
receive.fsck. tests: remove dead code
config doc: don't describe *.fetchOb
into git.git.
None of these tests will emit the "invalid author/committer line - bad
date" warning. The dates on the commit objects we're setting up are
not invalid.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5504-fetch-receive-strict.sh | 2 --
1 file changed, 2 deletions(-)
diff
601 - 700 of 2740 matches
Mail list logo
