diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2012-06-26 07:51:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-26 13:17:50 -0700 |
| commit | 572a7c52bb12e22b3b8471133253b9884643a4e2 (patch) | |
| tree | a02f63ebd6e335358fa7273aefcc4a9bd96be899 | |
| parent | bc9e7dd41fe8b51cc7f2e79312a2ff777899f930 (diff) | |
| download | git-572a7c52bb12e22b3b8471133253b9884643a4e2.tar.gz git-572a7c52bb12e22b3b8471133253b9884643a4e2.tar.xz | |
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>
| -rw-r--r-- | git-rebase--am.sh | 2 | ||||
| -rw-r--r-- | git-rebase--interactive.sh | 4 | ||||
| -rw-r--r-- | git-rebase--merge.sh | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 04d89415f..392ebc979 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 0c19b7c75..a5b018d4a 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 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 () { |