Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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...
commit 572a7c52bb12e22b3b8471133253b9884643a4e2 1 parent bc9e7dd
authored June 26, 2012 gitster committed June 26, 2012
2  git-rebase--am.sh
@@ -3,8 +3,6 @@
3 3
 # Copyright (c) 2010 Junio C Hamano.
4 4
 #
5 5
 
6  
-. git-sh-setup
7  
-
8 6
 case "$action" in
9 7
 continue)
10 8
 	git am --resolved --resolvemsg="$resolvemsg" &&
4  git-rebase--interactive.sh
@@ -9,9 +9,7 @@
9 9
 #
10 10
 # The original idea comes from Eric W. Biederman, in
11 11
 # http://article.gmane.org/gmane.comp.version-control.git/22407
12  
-
13  
-. git-sh-setup
14  
-
  12
+#
15 13
 # The file containing rebase commands, comments, and empty lines.
16 14
 # This file is created by "git rebase -i" then edited by the user.  As
17 15
 # the lines are processed, they are removed from the front of this
2  git-rebase--merge.sh
@@ -3,8 +3,6 @@
3 3
 # Copyright (c) 2010 Junio C Hamano.
4 4
 #
5 5
 
6  
-. git-sh-setup
7  
-
8 6
 prec=4
9 7
 
10 8
 read_state () {

Git Notes

amlog

Message-Id: <1340722318-24392-2-git-send-email-martin.von.zweigbergk@gmail.com>

0 notes on commit 572a7c5

Please sign in to comment.
Something went wrong with that request. Please try again.