Permalink
Browse files

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>
  • Loading branch information...
1 parent bc9e7dd commit 572a7c52bb12e22b3b8471133253b9884643a4e2 Martin von Zweigbergk committed with gitster Jun 26, 2012
Showing with 1 addition and 7 deletions.
  1. +0 −2 git-rebase--am.sh
  2. +1 −3 git-rebase--interactive.sh
  3. +0 −2 git-rebase--merge.sh
View
@@ -3,8 +3,6 @@
# Copyright (c) 2010 Junio C Hamano.
#
-. git-sh-setup
-
case "$action" in
continue)
git am --resolved --resolvemsg="$resolvemsg" &&
@@ -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
@@ -3,8 +3,6 @@
# Copyright (c) 2010 Junio C Hamano.
#
-. git-sh-setup
-
prec=4
read_state () {

0 comments on commit 572a7c5

Please sign in to comment.