git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	"Eric Wong" <e@80x24.org>,
	"Prathamesh Chavan" <pc44800@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 7/9] git-sh-setup: move peel_committish() function to git-subtree.sh
Date: Thu,  2 Sep 2021 18:01:14 +0200	[thread overview]
Message-ID: <patch-7.9-a3047b93f7d-20210902T155758Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.9-00000000000-20210902T155758Z-avarab@gmail.com>

Move the peel_committish() function out of git-sh-setup to its only
user, contrib/subtree/git-subtree.sh. Since d03ebd411c6 (rebase:
remove the rebase.useBuiltin setting, 2019-03-18) when
git-legacy-rebase.sh was removed, it has only been used in
git-subtree.sh.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 contrib/subtree/git-subtree.sh | 12 ++++++++++++
 git-sh-setup.sh                | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 7f767b5c38f..a6deb57bcae 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -818,6 +818,18 @@ cmd_add_repository () {
 	cmd_add_commit FETCH_HEAD
 }
 
+peel_committish () {
+	case "$1" in
+	:/*)
+		peeltmp=$(git rev-parse --verify "$1") &&
+		git rev-parse --verify "${peeltmp}^0"
+		;;
+	*)
+		git rev-parse --verify "${1}^0"
+		;;
+	esac
+}
+
 # Usage: cmd_add_commit REV
 cmd_add_commit () {
 	# The rev has already been validated by cmd_add(), we just
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 6a21238dc0e..9243353bc21 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -294,15 +294,3 @@ if test -z "$NONGIT_OK"
 then
 	git_dir_init
 fi
-
-peel_committish () {
-	case "$1" in
-	:/*)
-		peeltmp=$(git rev-parse --verify "$1") &&
-		git rev-parse --verify "${peeltmp}^0"
-		;;
-	*)
-		git rev-parse --verify "${1}^0"
-		;;
-	esac
-}
-- 
2.33.0.814.gb82868f05f3


  parent reply	other threads:[~2021-09-02 16:02 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-02 16:01 [PATCH 0/9] remove dead shell code Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 1/9] git-sh-setup: remove unused set_reflog_action() function Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 2/9] git-sh-setup: remove unused git_editor() function Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 3/9] git-sh-setup: remove unused git_pager() function Ævar Arnfjörð Bjarmason
2021-09-02 16:34   ` Philippe Blain
2021-09-02 21:13     ` Andrei Rybak
2021-09-02 16:01 ` [PATCH 4/9] git-sh-setup: remove unused sane_egrep() function Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 5/9] git-sh-setup: remove unused require_work_tree_exists() function Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 6/9] git-sh-setup: move create_virtual_base() to mergetools/p4merge Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` Ævar Arnfjörð Bjarmason [this message]
2021-09-02 16:01 ` [PATCH 8/9] git-bisect: remove unused SHA-1 $x40 shell variable Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 9/9] test-lib: remove unused $_x40 and $_z40 variables Ævar Arnfjörð Bjarmason
2021-09-02 16:53 ` [PATCH 0/9] remove dead shell code Peter Baumann
2021-09-02 20:56   ` Junio C Hamano
2021-09-02 20:53 ` Junio C Hamano
2021-09-02 21:29   ` Carlo Arenas
2021-09-02 22:42     ` Junio C Hamano
2021-09-02 22:17   ` Ævar Arnfjörð Bjarmason
2021-09-02 22:36     ` Junio C Hamano
2021-09-06  7:05 ` [PATCH v2 0/7] remove dead & undocumented " Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 1/7] git-sh-setup: remove unused git_pager() function Ævar Arnfjörð Bjarmason
2021-09-06  9:49     ` Phillip Wood
2021-09-06 22:27       ` Ævar Arnfjörð Bjarmason
2021-09-07  9:41         ` Phillip Wood
2021-09-07 10:22           ` Ævar Arnfjörð Bjarmason
2021-09-07 18:37             ` Junio C Hamano
2021-09-07 19:58               ` Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 2/7] git-sh-setup: remove unused sane_egrep() function Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 3/7] git-sh-setup: move peel_committish() function to git-subtree.sh Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 4/7] git-sh-setup: clear_local_git_env() function to git-submodule.sh Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 5/7] git-sh-setup: remove unused "pull with rebase" message Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 6/7] git-bisect: remove unused SHA-1 $x40 shell variable Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 7/7] test-lib: remove unused $_x40 and $_z40 variables Ævar Arnfjörð Bjarmason
2021-09-11 11:17   ` [PATCH v3 0/4] remove dead & internal-only shell code Ævar Arnfjörð Bjarmason
2021-09-11 11:17     ` [PATCH v3 1/4] git-submodule: remove unused is_zero_oid() function Ævar Arnfjörð Bjarmason
2021-09-13  3:28       ` Junio C Hamano
2021-09-11 11:17     ` [PATCH v3 2/4] git-sh-setup: remove unused "pull with rebase" message Ævar Arnfjörð Bjarmason
2021-09-11 11:17     ` [PATCH v3 3/4] git-bisect: remove unused SHA-1 $x40 shell variable Ævar Arnfjörð Bjarmason
2021-09-11 11:17     ` [PATCH v3 4/4] test-lib: remove unused $_x40 and $_z40 variables Ævar Arnfjörð Bjarmason

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=patch-7.9-a3047b93f7d-20210902T155758Z-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=e@80x24.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pc44800@gmail.com \
    --cc=peff@peff.net \
    /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).