undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: don't source git-sh-setup twice

Browse Source 
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>
This commit is contained in:
Martin von Zweigbergk 2012-06-26 07:51:54 -07:00 committed by Junio C Hamano
parent bc9e7dd41f
commit 572a7c52bb
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase--am.sh
View File

@ -3,8 +3,6 @@
# Copyright (c) 2010 Junio C Hamano. # Copyright (c) 2010 Junio C Hamano.
# #
. git-sh-setup
case "$action" in case "$action" in
continue) continue)
git am --resolved --resolvemsg="$resolvemsg" && git am --resolved --resolvemsg="$resolvemsg" &&

4
git-rebase--interactive.sh
View File

@ -9,9 +9,7 @@
# #
# The original idea comes from Eric W. Biederman, in # The original idea comes from Eric W. Biederman, in
# http://article.gmane.org/gmane.comp.version-control.git/22407 # http://article.gmane.org/gmane.comp.version-control.git/22407
#
. git-sh-setup
# The file containing rebase commands, comments, and empty lines. # The file containing rebase commands, comments, and empty lines.
# This file is created by "git rebase -i" then edited by the user. As # 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 # the lines are processed, they are removed from the front of this

2
git-rebase--merge.sh
View File

@ -3,8 +3,6 @@
# Copyright (c) 2010 Junio C Hamano. # Copyright (c) 2010 Junio C Hamano.
# #
. git-sh-setup
prec=4 prec=4
read_state () { read_state () {