Re: [commit 4ecbc178704] Incosistency?

From: Jeff King <peff@peff.net>
Date: Jul 14, 2009, 21:48 UTC
Message-ID: <20090714214852.GA2786@coredump.intra.peff.net>
In-Reply-To: <Pine.LNX.4.64.0907142335210.31779@cube>

On Tue, Jul 14, 2009 at 11:41:40PM +0200, Unknown wrote:

Show 6 quoted lines

> commit 4ecbc178704ca6c1027a38483e98f5fe493b1322
> Author: Jeff King <peff@peff.net>
> Date:   Thu Jul 9 02:37:35 2009 -0400
> 
> bla bla.. some strange SUDO fix (who the hell uses git that way?)
> I dont like it.. git-add in libexecdir was good!

Hmm. I think I wrote a better commit message than that...

Show 16 quoted lines

> -       { for p in $(filter-out git-add$X,$(BUILT_INS)); do \
> +               ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
> +               cp "$$bindir/git$X" "$$execdir/git$X"; } && \
> +       { for p in $(BUILT_INS); do \
>                 $(RM) "$$execdir/$$p" && \
> -               ln "$$execdir/git-add$X" "$$execdir/$$p" 2>/dev/null || \
> -               ln -s "git-add$X" "$$execdir/$$p" 2>/dev/null || \
> -               cp "$$execdir/git-add$X" "$$execdir/$$p" || exit; \
> +               ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
> +               ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
> +               cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
>           done; } && \
>         ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
> 
> Isnt check_bindir is broken now?
> git-add is no more..

No. Two things you are missing:

  1. "git-add" still goes in exec-dir. It's just not the magic one we do
     separately (see how we no longer need to use filter-out?).

  2. check_bindir is actually about looking for dashed-form commands in
     the $bindir, which would indicate cruft from an older installed
     version of git. We can't use "git" for this, because that is the
     command that is _supposed_ to be in $bindir.

-Peff