git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Jeremy Huddleston Sequoia <jeremyhu@apple.com>,
	Akilsrin <Akilsrin@apple.com>,
	Christian Couder <christian@gitlab.com>,
	Jonathan Nieder <jrnieder@gmail.com>,
	Tim Triemstra <timt@apple.com>, Eliran Mesika <eliran@gitlab.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: Subscribing Apple people to git-security@googlegroups.com
Date: Tue, 10 Jul 2018 14:27:57 +0200	[thread overview]
Message-ID: <CACBZZX4X05EHd+OpBpLotGuY6H=pnB9dS9Rv5BONfCKjZM3a1A@mail.gmail.com> (raw)
In-Reply-To: <20180703133645.GA20316@sigill.intra.peff.net>

On Tue, Jul 3, 2018 at 3:36 PM, Jeff King <peff@peff.net> wrote:
> On Mon, Jul 02, 2018 at 01:15:19PM -0700, Jeremy Huddleston Sequoia wrote:
>
>> > I hope that maybe they're also interested in reducing the overall
>> > diff between upstream Git and what ships with XCode. Last time I
>> > looked (which was admittedly a while ago), a lot of the changes
>> > seemed like things that could probably be considered upstream.
>>
>> I'm very very interested in having reduced differences between what we
>> ship in Xcode and what is upstream.  I've been maintaining a repo with
>> our patches that I rebase as we move forward, in the hope that these
>> changes might be useful to others and a derivative of them might
>> eventually be accepted upstream.  See
>> https://github.com/jeremyhu/git/commits/master for the current set of
>> changes that are in our shipping git (currently on top of 2.17.1).
>
> Thanks for sharing. Skimming over it, I see:
>
>  - several of the changes look related to run-time relocation. There was
>    a series that shipped in v2.18.0 related to this, so that may reduce
>    your diff once you rebase.
>
>  - The xcode_gitattributes() bits aren't likely to go upstream as-is.
>    But possibly these could ship as a default $sysconfdir/gitattributes?
>
>  - the rest look like assorted little fixes that probably could go
>    upstream

Jeremy, could you elaborate on what
https://github.com/jeremyhu/git/commit/61b42bc5d2 was about? I.e.
where was this discussed & tests for this refused?

Seems sensible to me to have this in some form, but the test as-is
seems to be a general regression test, not Apple-specific, so it would
need to be changed somewhat, or does it only happen with some other
custom patch of yours?

  parent reply	other threads:[~2018-07-10 12:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CAGba+=U4nbxL2uuSxyqyZqiiavJpo_E=GhUkipz6DczLdmnkgQ@mail.gmail.com>
2018-07-02 19:50 ` Subscribing Apple people to git-security@googlegroups.com Jeff King
     [not found]   ` <91A9F3A0-5F3F-4137-9A40-CB42EDE4F243@apple.com>
     [not found]     ` <9AE01C9B-7D10-45F2-8910-1607A19DF722@apple.com>
2018-07-02 21:17       ` Jeff King
2018-07-03 13:36     ` Jeff King
2018-07-03 15:48       ` Jonathan Nieder
2018-07-03 16:01         ` Jeff King
2018-07-09 22:48           ` Jonathan Nieder
2018-07-10 12:27       ` Ævar Arnfjörð Bjarmason [this message]
2018-07-10 18:54         ` Jeremy Huddleston Sequoia
2018-07-10 13:24   ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CACBZZX4X05EHd+OpBpLotGuY6H=pnB9dS9Rv5BONfCKjZM3a1A@mail.gmail.com' \
    --to=avarab@gmail.com \
    --cc=Akilsrin@apple.com \
    --cc=christian@gitlab.com \
    --cc=eliran@gitlab.com \
    --cc=git@vger.kernel.org \
    --cc=jeremyhu@apple.com \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.net \
    --cc=timt@apple.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).