From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v3 12/25] *.sh: avoid hardcoding $GIT_DIR/hooks/... Date: Tue, 18 Feb 2014 20:40:01 +0700 Message-ID: <1392730814-19656-13-git-send-email-pclouds@gmail.com> References: <1392730814-19656-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Feb 18 14:41:53 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WFkvl-0007tj-2E for gcvg-git-2@plane.gmane.org; Tue, 18 Feb 2014 14:41:49 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755698AbaBRNld convert rfc822-to-quoted-printable (ORCPT ); Tue, 18 Feb 2014 08:41:33 -0500 Received: from mail-pb0-f44.google.com ([209.85.160.44]:43743 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755691AbaBRNlb (ORCPT ); Tue, 18 Feb 2014 08:41:31 -0500 Received: by mail-pb0-f44.google.com with SMTP id rq2so16728710pbb.17 for ; Tue, 18 Feb 2014 05:41:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=Mn1J42cTKlYOVH8XvtSi48OV9PmBgZrcR7nl9s6fHF8=; b=pit4Tv3e4a0SwPQ2oF/JTNFGClzDcTbIQD7caLtvRn/eQKVf/TmE3DY9Uw45Ymauia ctr2/0aCmBfF5fIXeIjAu/fQafMTU8F0cIieWM4/BL0fupt4VUwVsNhjDJgYE6/DyCLd RZnNk5Ez+YfW3NtYyxROz6HsinFnAvmeoHeidgatyer0/dsCIIKxga5fWv0YgcyIYViq 7uu3rCGgxSbtjXaBqrIHQwftPu71sZOWdWT30s538aoHR64rs5g80IR5Dz429XQtxFFv f4w/hflELBgctLe0+NzJIuVA9RO6qLazfIX5nkOOtzSGopcSxzI6CaCTmLMZmEI5Pxeu N3cA== X-Received: by 10.66.162.74 with SMTP id xy10mr33369721pab.4.1392730886467; Tue, 18 Feb 2014 05:41:26 -0800 (PST) Received: from lanh ([115.73.228.211]) by mx.google.com with ESMTPSA id yo9sm142630771pab.16.2014.02.18.05.41.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Feb 2014 05:41:24 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Tue, 18 Feb 2014 20:41:38 +0700 X-Mailer: git-send-email 1.8.5.2.240.g8478abd In-Reply-To: <1392730814-19656-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: If $GIT_COMMON_DIR is set, it should be $GIT_COMMON_DIR/hooks/, not $GIT_DIR/hooks/. Just let rev-parse --git-path handle it. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- git-am.sh | 22 +++++++++++----------- git-rebase--interactive.sh | 6 +++--- git-rebase--merge.sh | 6 ++---- git-rebase.sh | 4 ++-- templates/hooks--applypatch-msg.sample | 4 ++-- templates/hooks--pre-applypatch.sample | 4 ++-- 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/git-am.sh b/git-am.sh index bbea430..dfa0618 100755 --- a/git-am.sh +++ b/git-am.sh @@ -803,10 +803,10 @@ To restore the original branch and stop patching = run \"\$cmdline --abort\"." continue fi =20 - if test -x "$GIT_DIR"/hooks/applypatch-msg + hook=3D"`git rev-parse --git-path hooks/applypatch-msg`" + if test -x "$hook" then - "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" || - stop_here $this + "$hook" "$dotest/final-commit" || stop_here $this fi =20 if test -f "$dotest/final-commit" @@ -880,9 +880,10 @@ did you forget to use 'git add'?" stop_here_user_resolve $this fi =20 - if test -x "$GIT_DIR"/hooks/pre-applypatch + hook=3D"`git rev-parse --git-path hooks/pre-applypatch`" + if test -x "$hook" then - "$GIT_DIR"/hooks/pre-applypatch || stop_here $this + "$hook" || stop_here $this fi =20 tree=3D$(git write-tree) && @@ -908,18 +909,17 @@ did you forget to use 'git add'?" echo "$(cat "$dotest/original-commit") $commit" >> "$dotest/rewritte= n" fi =20 - if test -x "$GIT_DIR"/hooks/post-applypatch - then - "$GIT_DIR"/hooks/post-applypatch - fi + hook=3D"`git rev-parse --git-path hooks/post-applypatch`" + test -x "$hook" && "$hook" =20 go_next done =20 if test -s "$dotest"/rewritten; then git notes copy --for-rewrite=3Drebase < "$dotest"/rewritten - if test -x "$GIT_DIR"/hooks/post-rewrite; then - "$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten + hook=3D"`git rev-parse --git-path hooks/post-rewrite`" + if test -x "$hook"; then + "$hook" rebase < "$dotest"/rewritten fi fi =20 diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 43c19e0..d741b04 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -632,9 +632,9 @@ do_next () { git notes copy --for-rewrite=3Drebase < "$rewritten_list" || true # we don't care if this copying failed } && - if test -x "$GIT_DIR"/hooks/post-rewrite && - test -s "$rewritten_list"; then - "$GIT_DIR"/hooks/post-rewrite rebase < "$rewritten_list" + hook=3D"`git rev-parse --git-path hooks/post-rewrite`" + if test -x "$hook" && test -s "$rewritten_list"; then + "$hook" rebase < "$rewritten_list" true # we don't care if this hook failed fi && warn "Successfully rebased and updated $head_name." diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index e7d96de..68f5d09 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -93,10 +93,8 @@ finish_rb_merge () { if test -s "$state_dir"/rewritten then git notes copy --for-rewrite=3Drebase <"$state_dir"/rewritten - if test -x "$GIT_DIR"/hooks/post-rewrite - then - "$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten - fi + hook=3D"`git rev-parse --git-path hooks/post-rewrite`" + test -x "$hook" && "$hook" rebase <"$state_dir"/rewritten fi say All done. } diff --git a/git-rebase.sh b/git-rebase.sh index 8a3efa2..1cf8dba 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -195,9 +195,9 @@ run_specific_rebase () { =20 run_pre_rebase_hook () { if test -z "$ok_to_skip_pre_rebase" && - test -x "$GIT_DIR/hooks/pre-rebase" + test -x "`git rev-parse --git-path hooks/pre-rebase`" then - "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || + "`git rev-parse --git-path hooks/pre-rebase`" ${1+"$@"} || die "$(gettext "The pre-rebase hook refused to rebase.")" fi } diff --git a/templates/hooks--applypatch-msg.sample b/templates/hooks--= applypatch-msg.sample index 8b2a2fe..28b843b 100755 --- a/templates/hooks--applypatch-msg.sample +++ b/templates/hooks--applypatch-msg.sample @@ -10,6 +10,6 @@ # To enable this hook, rename this file to "applypatch-msg". =20 . git-sh-setup -test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +commitmsg=3D"`git rev-parse --git-path hooks/commit-msg`" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} : diff --git a/templates/hooks--pre-applypatch.sample b/templates/hooks--= pre-applypatch.sample index b1f187c..51aa244 100755 --- a/templates/hooks--pre-applypatch.sample +++ b/templates/hooks--pre-applypatch.sample @@ -9,6 +9,6 @@ # To enable this hook, rename this file to "pre-applypatch". =20 . git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +precommit=3D"`git rev-parse --git-path hooks/pre-commit`" +test -x "$precommit" && exec "$precommit" ${1+"$@"} : --=20 1.8.5.2.240.g8478abd