From 572a7c52bb12e22b3b8471133253b9884643a4e2 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Tue, 26 Jun 2012 07:51:54 -0700 Subject: 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 --- git-rebase--merge.sh | 2 -- 1 file changed, 2 deletions(-) (limited to 'git-rebase--merge.sh') diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index dc599077f..b10f2cf21 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 () { -- cgit v1.2.1