summaryrefslogtreecommitdiff
path: root/git-rebase--am.sh
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>2012-06-26 14:51:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-06-26 20:17:50 (GMT)
commit572a7c52bb12e22b3b8471133253b9884643a4e2 (patch)
treea02f63ebd6e335358fa7273aefcc4a9bd96be899 /git-rebase--am.sh
parentbc9e7dd41fe8b51cc7f2e79312a2ff777899f930 (diff)
downloadgit-572a7c52bb12e22b3b8471133253b9884643a4e2.zip
git-572a7c52bb12e22b3b8471133253b9884643a4e2.tar.gz
git-572a7c52bb12e22b3b8471133253b9884643a4e2.tar.bz2
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>
Diffstat (limited to 'git-rebase--am.sh')
-rw-r--r--git-rebase--am.sh2
1 files changed, 0 insertions, 2 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" &&