[commit 4ecbc178704] Incosistency?

commit 4ecbc178704ca6c1027a38483e98f5fe493b1322
Author: Jeff King <peff@peff.net>
Date:   Thu Jul 9 02:37:35 2009 -0400

diff --git a/Makefile b/Makefile
index 78cc113..311ce7d 100644
--- a/Makefile
+++ b/Makefile
@@ -1641,15 +1641,15 @@ ifneq (,$X)
  endif
         bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
         execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
-       { $(RM) "$$execdir/git-add$X" && \
+       { $(RM) "$$execdir/git$X" && \
                 test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
-               ln "$$bindir/git$X" "$$execdir/git-add$X" 2>/dev/null || \
-               cp "$$bindir/git$X" "$$execdir/git-add$X"; } && \
-       { 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..

Jeff King· Jul 14, 2009, 21:48 UTC · re: Unknown · lore

Re: [commit 4ecbc178704] Incosistency?

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

> 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...

> -       { 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

Johannes Schindelin· Jul 14, 2009, 22:30 UTC · re: Jeff King · lore

Re: [commit 4ecbc178704] Incosistency?

Hi,

On Tue, 14 Jul 2009, Jeff King wrote:

> On Tue, Jul 14, 2009 at 11:41:40PM +0200, Unknown wrote:
> 
> > 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...

See?  No good deed goes unpunished.

Re: [commit 4ecbc178704] Incosistency?

On Tue, 14 Jul 2009, Jeff King wrote:

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

Yes you did :)

> 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.

Indeed. Thanks for clarification.

Jeff King· Jul 15, 2009, 09:42 UTC · re: Unknown · lore

Re: [commit 4ecbc178704] Incosistency?

On Wed, Jul 15, 2009 at 10:32:32AM +0200, Unknown wrote:

> > 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?).
> Right. but git-add now is a link to git. Now we have one more file
> out there.

-Peff

Re: [commit 4ecbc178704] Incosistency?

Sorry for long answer.. my CRT died.. and I had to get temp replacement.

On Wed, 15 Jul 2009, Jeff King wrote:

> Sorry, I don't understand the significance. Is having 'git' in the
> execdir causing some kind of problem?
>
> I agree that it shouldn't be necessary for most sane setups, but sadly
> there are some insane ones, and I don't think this solution should be
> hurting anyone else. Am I wrong?
>
> -Peff
>

Thomas Adam· Jul 14, 2009, 22:42 UTC · re: Unknown · lore

Re: [commit 4ecbc178704] Incosistency?

Dear me --

2009/7/14 Unknown <borg@uu3.net>:

> 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!

-- Thomas Adam