rebase: don't source git-sh-setup twice
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. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin von Zweigbergk committed
Jun 26, 2012 at 07:51 UTC
572a7c52bb12e22b3b8471133253b9884643a4e2
3 files changed
+1
-7
git-rebase--am.sh
-2
@@ -3,8 +3,6 @@
3
# Copyright (c) 2010 Junio C Hamano.
4
#
5
6
-. git-sh-setup
7
-
6
case "$action" in
7
continue)
8
git am --resolved --resolvemsg="$resolvemsg" &&
git-rebase--interactive.sh
+1
-3
@@ -9,9 +9,7 @@
9
#
10
# The original idea comes from Eric W. Biederman, in
11
# http://article.gmane.org/gmane.comp.version-control.git/22407
12
-
13
-. git-sh-setup
14
-
12
+#
13
# The file containing rebase commands, comments, and empty lines.
14
# This file is created by "git rebase -i" then edited by the user. As
15
# the lines are processed, they are removed from the front of this
git-rebase--merge.sh
-2
@@ -3,8 +3,6 @@
3
# Copyright (c) 2010 Junio C Hamano.
4
#
5
6
-. git-sh-setup
7
-
6
prec=4
7
8
read_state () {