From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Apr 2012 19:46:30 +0000 (-0700)
Subject: contrib/rerere-train: use installed git-sh-setup
X-Git-Tag: v1.7.10.2~19^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=53876fcf3fdc1c46c26fc3a191e74a06e633d5b2;p=git.git

contrib/rerere-train: use installed git-sh-setup

Instead of sourcing git-sh-setup from random place that is on the $PATH,
explicitly source $(git --exec-path)/git-sh-setup.  As I do not personally
have any libexec/git-core directory on my $PATH like many other people, the
script will fail without this update.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
index 2cfe1b936..36b6feebe 100755
--- a/contrib/rerere-train.sh
+++ b/contrib/rerere-train.sh
@@ -7,7 +7,7 @@ USAGE="$me rev-list-args"
 
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
-. git-sh-setup
+. $(git --exec-path)/git-sh-setup
 require_work_tree
 cd_to_toplevel