From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Christian Couder <christian.couder@gmail.com>
Cc: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>,
Jeff King <peff@peff.net>, git <git@vger.kernel.org>,
Christian Couder <chriscool@tuxfamily.org>
Subject: Re: Git in Outreachy?
Date: Sun, 20 Sep 2020 17:06:39 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2009201705060.5061@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <CAP8UFD1BxnOk4-gaUQb9bY5zhAtD8Jy-x0RC=pNMSQvUaVxRmg@mail.gmail.com>
Hi Christian,
On Sat, 19 Sep 2020, Christian Couder wrote:
> On Wed, Sep 16, 2020 at 10:27 PM Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
>
> > On Wed, 16 Sep 2020, Christian Couder wrote:
>
> > > To summarize more, it seems to me that only the following scripts
> > > could be worth converting:
> > >
> > > git-difftool--helper.sh
> > > git-mergetool--lib.sh
> > > git-mergetool.sh
> > >
> > > I wonder if they are really worth converting though, as they should
> > > probably all be converted together and we would likely also need to
> > > convert the scripts in mergetools/ at the same time. And then there
> > > should be a way to still easily configure things for users. So perhaps
> > > a better way to approach this would be first to convert the scripts in
> > > mergetools/ into config files.
> >
> > The biggest problem is that they're all entangled.
> > `git-difftool--helper.sh` sources `git-mergetool--lib.sh` and uses quite a
> > bit of its machinery.
>
> Yeah, I agree this is an issue.
>
> > As to converting the scripts to config files, I'd rather have them
> > hard-coded in the source code.
>
> I am not sure what are the pros and cons of hardcoding vs config files
> in this case.
The thing is: `make install` does not install a Git config. That's why I
want the defaults hard-coded.
Of course, it should be possible to override those hard-coded defaults via
the config. That should go without saying.
Ciao,
Dscho
> My opinion is that config files would make it easier for people to
> contribute what's needed for new tools, while hardcoding might make it
> more easily extensible for us and might reduce backward compatibility
> issues.
>
> > I would then probably try to implement the bare minimum for the
> > `difftool--helper` command to work (re-implementing in C only the parts of
> > `mergetool--lib` that are necessary), and only in a next patch series work
> > on `mergetool`.
>
> Thanks for your opinion on this. For now I think it needs to be
> discussed more before we could suggest it as a project.
>
> Best,
> Christian.
>
next prev parent reply other threads:[~2020-09-21 20:21 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-28 6:56 Git in Outreachy? Jeff King
2020-08-31 6:55 ` Christian Couder
2020-09-03 6:00 ` Jonathan Nieder
2020-09-04 14:14 ` Philip Oakley
2020-09-07 18:49 ` Johannes Schindelin
2020-09-16 15:16 ` Philip Oakley
2020-09-16 18:43 ` Johannes Schindelin
2020-09-17 14:42 ` Philip Oakley
2020-09-09 18:26 ` Taylor Blau
2020-09-10 1:39 ` Jonathan Nieder
2020-09-10 2:19 ` Taylor Blau
2020-09-16 9:12 ` Christian Couder
2020-09-16 6:42 ` Christian Couder
2020-08-31 17:41 ` Junio C Hamano
2020-08-31 18:05 ` Emily Shaffer
2020-09-01 12:51 ` Jeff King
2020-09-03 5:41 ` Jeff King
2020-09-15 17:35 ` Jeff King
2020-09-15 17:55 ` Kaartic Sivaraam
2020-09-15 18:02 ` Jeff King
2020-09-19 8:12 ` Christian Couder
2020-09-19 15:10 ` Phillip Wood
2020-09-16 8:45 ` Christian Couder
2020-09-02 4:00 ` Johannes Schindelin
2020-09-16 9:01 ` Christian Couder
2020-09-16 9:45 ` Phillip Wood
2020-09-17 9:43 ` Christian Couder
2020-09-17 10:14 ` Phillip Wood
2020-09-18 8:37 ` Christian Couder
2020-09-17 15:34 ` Elijah Newren
2020-09-18 8:42 ` Christian Couder
2020-09-27 16:59 ` Kaartic Sivaraam
2020-09-27 21:16 ` Christian Couder
2020-10-29 10:13 ` Christian Couder
2020-09-06 18:56 ` Kaartic Sivaraam
2020-09-07 18:55 ` Johannes Schindelin
2020-09-16 9:35 ` Christian Couder
2020-09-16 20:27 ` Johannes Schindelin
2020-09-19 7:40 ` Christian Couder
2020-09-20 15:06 ` Johannes Schindelin [this message]
2020-09-20 16:31 ` Kaartic Sivaraam
2020-09-21 4:22 ` Christian Couder
2020-09-21 7:59 ` Kaartic Sivaraam
2020-09-21 20:56 ` Shourya Shukla
-- strict thread matches above, loose matches on Subject: below --
2021-09-03 2:40 Taylor Blau
2021-09-03 18:33 ` Emily Shaffer
2021-09-04 4:30 ` Christian Couder
2021-09-04 7:40 ` ZheNing Hu
2021-09-04 12:50 ` Jeff King
2021-09-05 8:58 ` ZheNing Hu
2021-09-06 12:36 ` Matheus Tavares Bernardino
2021-09-07 5:50 ` ZheNing Hu
2021-09-04 17:51 ` Taylor Blau
2021-09-18 16:10 ` Taylor Blau
2021-09-20 7:45 ` ZheNing Hu
2021-09-20 14:52 ` Christian Couder
2021-09-20 15:15 ` Christian Couder
2021-09-21 5:41 ` ZheNing Hu
2021-09-21 15:39 ` Christian Couder
2021-09-22 15:01 ` ZheNing Hu
2021-09-21 5:39 ` ZheNing Hu
2021-09-21 15:35 ` Christian Couder
2021-09-22 14:58 ` ZheNing Hu
2021-09-21 21:25 ` Taylor Blau
2021-09-29 14:18 ` Christian Couder
2021-09-29 17:34 ` Taylor Blau
2021-09-29 20:30 ` Taylor Blau
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=nycvar.QRO.7.76.6.2009201705060.5061@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=kaartic.sivaraam@gmail.com \
--cc=peff@peff.net \
/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).