From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
To: git@vger.kernel.org
Cc: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Subject: [PATCH 1/5] rebase: don't source git-sh-setup twice
Date: Tue, 26 Jun 2012 07:51:54 -0700 [thread overview]
Message-ID: <1340722318-24392-2-git-send-email-martin.von.zweigbergk@gmail.com> (raw)
In-Reply-To: <1340722318-24392-1-git-send-email-martin.von.zweigbergk@gmail.com>
The git-sh-setup script is already sourced in git-rebase.sh before
calling into git-rebase--(am|interactive|merge).sh. There are no other
callers of these scripts. It is therefore unnecessary to source
git-sh-setup again in them.
---
git-rebase--am.sh | 2 --
git-rebase--interactive.sh | 4 +---
git-rebase--merge.sh | 2 --
3 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 04d8941..392ebc9 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -3,8 +3,6 @@
# Copyright (c) 2010 Junio C Hamano.
#
-. git-sh-setup
-
case "$action" in
continue)
git am --resolved --resolvemsg="$resolvemsg" &&
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 0c19b7c..a5b018d 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -9,9 +9,7 @@
#
# The original idea comes from Eric W. Biederman, in
# http://article.gmane.org/gmane.comp.version-control.git/22407
-
-. git-sh-setup
-
+#
# The file containing rebase commands, comments, and empty lines.
# This file is created by "git rebase -i" then edited by the user. As
# the lines are processed, they are removed from the front of this
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index dc59907..b10f2cf 100644
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -3,8 +3,6 @@
# Copyright (c) 2010 Junio C Hamano.
#
-. git-sh-setup
-
prec=4
read_state () {
--
1.7.9.3.327.g2980b
next prev parent reply other threads:[~2012-06-26 14:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-26 14:51 [PATCH 0/5] rebase: calculate patches in upstream correctly Martin von Zweigbergk
2012-06-26 14:51 ` Martin von Zweigbergk [this message]
2012-06-26 14:51 ` [PATCH 2/5] rebase --root: print usage on too many args Martin von Zweigbergk
2012-06-26 14:51 ` [PATCH 3/5] am --rebasing: get patch body from commit, not from mailbox Martin von Zweigbergk
2012-06-26 14:51 ` [PATCH 4/5] am: don't call mailinfo if $rebasing Martin von Zweigbergk
2012-06-26 14:51 ` [PATCH 5/5] rebase [-m]: calculate patches in upstream correctly Martin von Zweigbergk
2012-06-26 21:13 ` Junio C Hamano
2012-06-27 16:17 ` Martin von Zweigbergk
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340722318-24392-2-git-send-email-martin.von.zweigbergk@gmail.com \
--to=martin.von.zweigbergk@gmail.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).