Am 04.06.2009, 07:18 Uhr, schrieb Junio C Hamano <gitster@xxxxxxxxx>:
Johannes Sixt <j6t@xxxxxxxx> writes:
On Dienstag, 2. Juni 2009, Junio C Hamano wrote:
Nanako Shiraishi <nanako3@xxxxxxxxxxx> writes:
> Junio, I think you forgot to take a follow-up action on this thread
after
> sending this message. The patch favors the git program in the
current
> directory.
Indeed, I did, and I think I am Ok with the patch. Thanks for a
reminder.
I thought there was an "simplicity" issue raised by J6t that was not
addressed, but after re-reading the thread I do not think it applies
(J6t?)
Sorry, I don't recall anymore what I said; but since the thread petered
out, I
use this patch in the repository where I share Matthias' 'sudo make
install'
problem:
Subject: [PATCH] version-gen: Use just built git if no other git is in
PATH
Signed-off-by: Johannes Sixt <j6t@xxxxxxxx>
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 39cde78..4779313 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -3,6 +3,9 @@
GVF=GIT-VERSION-FILE
DEF_VER=v1.6.3.GIT
+# use git that was just compiled if there is no git elsewhere in PATH
+PATH=$PATH:.
+
LF='
'
I actually think this is much saner and cleaner (it certainly is
smaller),
especially having seen Matthias's v4, which feels a tad overengineered.
It's nothing more than
(a) followed your suggestion to look in $(prefix) first for cross-building
support
(b) ported to git-gui as well (copy & paste-style)
Also, we certainly do not want to stuff "." in root's PATH, not even for
simple scripts like GIT-VERSION-GEN.
I honestly do not understand why we need to bend backwards to cater to
"sudo". Real men, when needing to do things as root, have always done
"su", and _if_ the environment is unsuited for the job, they can do:
$ su
# PATH=$PATH:/usr/local/bin make prefix=/usr/local install
sudo caches passwords for a couple of minutes, su does not, and su isn't
available everywhere ("wheel" group on BSD and stuff); particularly, sudo
is *the* get-root-tool on Ubuntu.
If you argue "real men", then break that damn rebuild cycle and either fix
dependencies properly, rather than second-guessing in shell scripts at
"make install" time, or add post-update hooks (or whatever) to update the
GIT-VERSION-FILE...
"." doesn't belong in root's $PATH, period.
--
Matthias Andree
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html