git-synchronizer: make it work on MacOSX, too

dscho · dscho · commit da2772afe6dd · 2014-01-25T11:37:40.000-06:00
MacOSX' sed does not understand \t...

We cannot use "case ... $key) ... esac" if inside a "$(...)" clause
because MacOSX' shell gets hopelessly confused by the closing parenthesis
in the case block.

Also, the 1970s called MacOSX that they want their uniq back that does not
even understand the -D option (show all duplicate lines; useful if some
fields are skipped when testing for uniqueness).

As of time of writing, MacOSX has not responded yet.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/git-synchronizer.sh b/git-synchronizer.sh
@@ -53,7 +53,7 @@ get_remote_branches () {
 	name="$1"
 
 	git for-each-ref refs/remotes/$name/\* |
-	sed "s|\trefs/remotes/$name/|\t|"
+	sed "s|	refs/remotes/$name/|	|"
 }
 
 fetch_from () {
@@ -148,7 +148,7 @@ do
 	has_spaces $url && continue
 	name=$(url2remotename $url)
 	git for-each-ref refs/remotes/$name/\* |
-	sed "s|^\(.*\)\trefs/remotes/\($name\)/|\2 \1 |"
+	sed "s|^\(.*\)	refs/remotes/\($name\)/|\2 \1 |"
 done)"
 
 for ref in $(echo "$remote_branches" |
@@ -210,15 +210,24 @@ do
 		uniq)"
 done
 
-disagreeing="$(echo "$todo" |
-	sort -k 3 |
-	uniq -D -f 2)"
+disagreeing=$(echo "$todo" |
+	cut -f 2 |
+	sort |
+	uniq -d)
 
 if test -n "$disagreeing"
 then
-	add_error "$(printf "Incompatible updates:\n%s\n\n" "$disagreeing")"
+	message="$(for name in $disagreeing
+		do
+			echo "$todo" | grep "	$name$"
+		done)"
+	add_error "$(printf "Incompatible updates:\n%s\n\n" "$message")"
 fi
 
+# make it easier to test whether a name is in $disagreeing via:
+# test "$disagreeing" != "${disagreeing#* $name }"
+disagreeing=" $disagreeing "
+
 # Push
 
 test -z "$todo" ||
@@ -231,10 +240,7 @@ do
 		while read sha1 type ref
 		do
 			test -z "$sha1" && continue
-			if echo "$disagreeing" | grep "	$ref$" > /dev/null 2>&1
-			then
-				continue
-			fi
+			test "$disagreeing" = "${disagreeing#* $name }" || continue
 			remoteref=refs/remotes/$name/$ref
 			if test $sha1 = $nullsha1
 			then
