ooo-build r13114 - in trunk: . bin

[jannieuw svn gnome org]

Author: jannieuw
Date: Tue Jul  8 10:08:59 2008
New Revision: 13114
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13114&view=rev

Log:
2008-07-08  Jan Nieuwenhuizen  <janneke gnu org>

	* bin/gob-update: Remove debugging -x and call actually distributed
	git-merge-BASES.

	* bin/git-merge-bases: Remove $ from assignment variable.  Fixes
	git-merge-bases: line 344: ...: command not found, error as well
	as basic functionality.


Modified:
   trunk/ChangeLog
   trunk/bin/git-merge-bases
   trunk/bin/gob-update

Modified: trunk/bin/git-merge-bases
==============================================================================
--- trunk/bin/git-merge-bases	(original)
+++ trunk/bin/git-merge-bases	Tue Jul  8 10:08:59 2008
@@ -341,7 +341,7 @@
 
 if test "$have_restricted_bases" = t
 then
-	$restrict=$(git rev-parse $restrict_to_bases)
+	restrict=$(git rev-parse $restrict_to_bases)
 	old_common=$common
 	common=
 	for b in $old_common

Modified: trunk/bin/gob-update
==============================================================================
--- trunk/bin/gob-update	(original)
+++ trunk/bin/gob-update	Tue Jul  8 10:08:59 2008
@@ -2,8 +2,6 @@
 
 set -e
 
-set -x
-
 if test $# -lt 1
 then
 	echo "gob-update <branch>"
@@ -20,4 +18,4 @@
     exit 1
 fi
 
-git-merge --bases="$gob_bases" $master_branch
+git-merge-bases --bases="$gob_bases" $master_branch