From: benoit.person@ensimag.fr
To: git@vger.kernel.org
Cc: Celestin Matte <celestin.matte@ensimag.fr>,
Matthieu Moy <matthieu.moy@grenoble-inp.fr>,
Junio C Hamano <gitster@pobox.com>,
Benoit Person <benoit.person@ensimag.fr>
Subject: [PATCH v8 2/7] wrap-for-bin: Make bin-wrappers chainable
Date: Thu, 4 Jul 2013 22:38:55 +0200 [thread overview]
Message-ID: <1372970340-6545-3-git-send-email-benoit.person@ensimag.fr> (raw)
In-Reply-To: <1372970340-6545-1-git-send-email-benoit.person@ensimag.fr>
From: Benoit Person <benoit.person@ensimag.fr>
For now, bin-wrappers overwrites GITPERLLIB. If we want to chain to
those scripts and define GITPERLLIB before, our changes will be
discarded.
This patch makes the bin-wrappers prepend their modifications to
GITPERLLIB rather than redefining it. It also unset GITPERLLIB in the
test-suite to prevent broken $GITPERLLIB in the user's configuration
from interfering with the testsuite.
The codes using GIT_TEMPLATE_DIR and GIT_TEXTDOMAINDIR handle only one
path in each of this variable so this new behavior would be useless on
those variables.
Signed-off-by: Benoit Person <benoit.person@ensimag.fr>
Signed-off-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
---
t/test-lib.sh | 1 +
wrap-for-bin.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index eff3a65..43e2a39 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -92,6 +92,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
print join("\n", @vars);
')
unset XDG_CONFIG_HOME
+unset GITPERLLIB
GIT_AUTHOR_EMAIL=author@example.com
GIT_AUTHOR_NAME='A U Thor'
GIT_COMMITTER_EMAIL=committer@example.com
diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh
index 53a8dd0..35b394a 100644
--- a/wrap-for-bin.sh
+++ b/wrap-for-bin.sh
@@ -14,7 +14,7 @@ else
GIT_TEMPLATE_DIR='@@BUILD_DIR@@/templates/blt'
export GIT_TEMPLATE_DIR
fi
-GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib'
+GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib:'"${GITPERLLIB:+:$GITPERLLIB}"
GIT_TEXTDOMAINDIR='@@BUILD_DIR@@/po/build/locale'
PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH"
export GIT_EXEC_PATH GITPERLLIB PATH GIT_TEXTDOMAINDIR
--
1.8.3.1.590.gc07d91b
next prev parent reply other threads:[~2013-07-04 20:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-04 20:38 [PATCH v8 0/7] git-remote-mediawiki: new tool to preview local changes without pushing benoit.person
2013-07-04 20:38 ` [PATCH v8 1/7] git-remote-mediawiki: Introduction of Git::Mediawiki.pm benoit.person
2013-07-04 20:38 ` benoit.person [this message]
2013-07-04 20:38 ` [PATCH v8 3/7] git-remote-mediawiki: New git bin-wrapper for developement benoit.person
2013-07-05 7:04 ` Matthieu Moy
2013-07-06 9:45 ` Benoît Person
2013-07-08 13:30 ` [PATCH] fixup! " Matthieu Moy
2013-07-08 15:56 ` Junio C Hamano
2013-07-04 20:38 ` [PATCH v8 4/7] git-remote-mediawiki: Update tests to run with the new bin-wrapper benoit.person
2013-07-04 20:38 ` [PATCH v8 5/7] git-remote-mediawiki: Factoring code between git-remote-mediawiki and Git::Mediawiki benoit.person
2013-07-04 20:38 ` [PATCH v8 6/7] git-remote-mediawiki: Adding git-mw command benoit.person
2013-07-04 20:39 ` [PATCH v8 7/7] git-remote-mediawiki: Add preview subcommand into git mw benoit.person
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=1372970340-6545-3-git-send-email-benoit.person@ensimag.fr \
--to=benoit.person@ensimag.fr \
--cc=celestin.matte@ensimag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=matthieu.moy@grenoble-inp.fr \
/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).