X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-stupid.sh;h=f612d4729c9ae0ccdebd6b9671da3b5f89bb65f0;hb=686bc52a897abfa2497c8f137f06e44c8e559659;hp=4faecb933df33fd4b72e0968d7ee04e1ccc49aec;hpb=bb95e19c5f1e470d2efe1c0e4e04c291019e4b25;p=git.git

diff --git a/git-merge-stupid.sh b/git-merge-stupid.sh
index 4faecb933..f612d4729 100755
--- a/git-merge-stupid.sh
+++ b/git-merge-stupid.sh
@@ -24,7 +24,7 @@ do
 	esac
 done
 
-# Give up if we are given more than two remotes -- not handling octopus.
+# Give up if we are given two or more remotes -- not handling octopus.
 case "$remotes" in
 ?*' '?*)
 	exit 2 ;;
@@ -40,10 +40,10 @@ case "$bases" in
 	for c in $bases
 	do
 		rm -f $G
-		GIT_INDEX_FILE=$G git-read-tree -m $c $head $remotes \
+		GIT_INDEX_FILE=$G git read-tree -m $c $head $remotes \
 			 2>/dev/null ||	continue
 		# Count the paths that are unmerged.
-		cnt=`GIT_INDEX_FILE=$G git-ls-files --unmerged | wc -l`
+		cnt=`GIT_INDEX_FILE=$G git ls-files --unmerged | wc -l`
 		if test $best_cnt -le 0 -o $cnt -le $best_cnt
 		then
 			best=$c
@@ -63,10 +63,10 @@ case "$bases" in
 	;;
 esac
 
-git-update-index --refresh 2>/dev/null
-git-read-tree -u -m $common $head $remotes || exit 2
+git update-index --refresh 2>/dev/null
+git read-tree -u -m $common $head $remotes || exit 2
 echo "Trying simple merge."
-if result_tree=$(git-write-tree  2>/dev/null)
+if result_tree=$(git write-tree  2>/dev/null)
 then
 	exit 0
 else