From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=aMvBmoG7; spf=pass (domain: linaro.org, ip: 209.85.221.46, mailfrom: leif.lindholm@linaro.org) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by groups.io with SMTP; Thu, 06 Jun 2019 02:14:07 -0700 Received: by mail-wr1-f46.google.com with SMTP id x4so1584438wrt.6 for ; Thu, 06 Jun 2019 02:14:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=EqKiQRq1fvZZDZ5ot8Pbu3sDTGsXzKi9ygbiGKZYDWk=; b=aMvBmoG7FNNL3fHqrEfldc0pXznZ6AKne/1YBrn0hCLgyN0I68uX7u8tWdhPVH8QNz z/d/ZTYX1XVnxQGX+8vsq+1o2KtqmNj7kWs/mL9EMDoZSnSQ9dKIzE/YLjWCxinJVZmH D44jy1w5HM7dwcQDtojFgi/IcRFRTOal2/erSAiIlKiIaRDlR/O/w7T5dmr8RlGizbIn xd62YfiUopE+EF7dZvbN1TD/t4Iy6i+0HuFSSHcMaeCvWt64vczKpnAt25P0QXXlSXum Ny76zeOk3W4novdAhOPFcL+dkp/FIUTzuUvNCGikArAQ57x8ZQ+Xfy2Blu1rpcu2tezX 5WHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=EqKiQRq1fvZZDZ5ot8Pbu3sDTGsXzKi9ygbiGKZYDWk=; b=ihLJk3i6Eoz1iYyw8cdxMgWLaP4O+SLAABvUmGRryvgFQ8mcCBnELWpyuSvU4uJquW C3nXmSTCc7OlCxLS9TjEBNPzM1z6ZodEcLm7Ug4cx8b3TnxxTo6JbTmBJO0ghwpqN9fM 30HesyVPuHHfEocRESUZs2mYk7pcYItgji6NTWuE+C22Lg8QJwz2bVFYd50v2/0edA4K IAnI3IrErelN6972E4HgAYJrHGmHZ0/GnPTZvmFlU656XhiMc88omsULazSnqvoeAthi QXYWX/fMESORY8brlTZrht4vYkGO19xE3yMBDOn4KCH+k+vfkZXqK44V87ve29JQBZzx ZQmw== X-Gm-Message-State: APjAAAUqbTg0rqXp/rxmex1Ey5ag5JPjvy8hSPZXssAe9BTZCWjX0CWC kMrdi0mHlP76/M9tb8PRIVKv8Q== X-Google-Smtp-Source: APXvYqzjWqFAoiT4l6wOyL+KUmzwR9K/8a4QI/54xf9+DP8/HtIBq6PvJeKD4494hwHG0nFrEjhz7g== X-Received: by 2002:a5d:6207:: with SMTP id y7mr10347786wru.265.1559812445430; Thu, 06 Jun 2019 02:14:05 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id 128sm1046832wme.12.2019.06.06.02.14.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 06 Jun 2019 02:14:04 -0700 (PDT) Date: Thu, 6 Jun 2019 10:14:03 +0100 From: "Leif Lindholm" To: "Feng, Bob C" Cc: "devel@edk2.groups.io" , "Gao, Liming" , "Zhu, Yonghong" , Andrew Fish , Laszlo Ersek , "Kinney, Michael D" Subject: Re: [RFC PATCH 0/2] BaseTools: add script to set up git environment Message-ID: <20190606091402.3h6evbmh6alsrjsp@bivouac.eciton.net> References: <20190530155933.25588-1-leif.lindholm@linaro.org> <08650203BA1BD64D8AD9B6D5D74A85D16013285D@SHSMSX101.ccr.corp.intel.com> MIME-Version: 1.0 In-Reply-To: <08650203BA1BD64D8AD9B6D5D74A85D16013285D@SHSMSX101.ccr.corp.intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Bob, Ah, that is a very good point. Yes, I will do that for v2. Thanks!, Leif On Wed, Jun 05, 2019 at 10:37:31AM +0000, Feng, Bob C wrote: > Hi Leif, > > https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git-guide-for-edk2-contributors-and-maintainers is a great resource. It's very useful. > > I tested this scripts. I found a minor issue that I have a local edk2 repo which was cloned by the command: "git clone https://github.com/tianocore/edk2" not "git clone https://github.com/tianocore/edk2.git" and when I run this script, it reported "Unknown upstream ....". > > The script works well if the git url is https://github.com/tianocore/edk2.git > > So would you update the script to support the url with or without the ".git" suffix? > > > Thanks, > Bob > > -----Original Message----- > From: Leif Lindholm [mailto:leif.lindholm@linaro.org] > Sent: Friday, May 31, 2019 12:00 AM > To: devel@edk2.groups.io > Cc: Feng, Bob C ; Gao, Liming ; Zhu, Yonghong ; Andrew Fish ; Laszlo Ersek ; Kinney, Michael D > Subject: [RFC PATCH 0/2] BaseTools: add script to set up git environment > > https://github.com/tianocore/tianocore.github.io/wiki/Laszlo's-unkempt-git-guide-for-edk2-contributors-and-maintainers > is a great resource, but it's a lot of manual steps to go through for each repository (especially as the number seems to grow). > > Script works with python2/3 under both Posix and Windows. > > Note: the script does require the 'gitpython' module to be installed. > Under Linux, this can be achieved with your distribution package manager. > Under Windows, you can install this from the Visual Studio python environment->packages (pypi), and searching for 'gitpython'. > > Note2: for simplicity's sake, the script uses a single copy of the configuration files for each repository - pointing all of them to the copies in edk2 BaseTools. > > Note3: we're hardcoding absolute paths here, so if you move repositories around, you need to re-run the script. > > Note4: all of the settings are done only on a per-repository basis, so as not to mess with environments for unlelated projects. This also means many settings that are common across all repositories are set in each of them. > > Note4: the script identifies repositories based on their 'origin' URL, so if someone had a good use-case for something cute, there may be more work required. > > > Future plans: > It would be useful to also add common git-hook scripts to install. > I already have some for my own maintainer use. > > Even though we only modify settings for the current repository, it would also make sense to add some sanity checking for global settings (name, email, mail server config...). > > Leif Lindholm (2): > BaseTools: add centralized location for git config files > BaseTools: add script to configure local git options > > BaseTools/Conf/diff.order | 8 ++ > BaseTools/Conf/gitattributes | 14 ++++ BaseTools/Scripts/SetupGit.py | 187 ++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 209 insertions(+) > create mode 100644 BaseTools/Conf/diff.order create mode 100644 BaseTools/Conf/gitattributes create mode 100644 BaseTools/Scripts/SetupGit.py > > -- > 2.11.0 >