From 8f7e6f1f69a59a8ada4880db5f1680efd5eb91fd Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Tue, 15 Jun 2010 09:04:29 +0200 Subject: [PATCH] for some reason "git notes" syntax changed. Support new syntax. --- all | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/all b/all index 15a6a150..964233c0 100755 --- a/all +++ b/all @@ -670,7 +670,7 @@ case "$cmd" in ;; esac reportecho " Branch $ref:" - note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true` + note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true` if [ -n "$note" ]; then reportdo4 echo "$note" reportecho4 "--> not merging, already had this one rejected before" @@ -679,18 +679,18 @@ case "$cmd" in org=`git rev-parse HEAD` if ! git merge "$ref" 2>&1 | tee "$t"; then git reset --hard "$org" - git notes --ref "refs/notes/admin-merge" add -m "Merge failed:$LF`cat "$t"`" "$ref" + GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref" reportdo4 cat "$t" reportecho4 "--> merge failed" elif ! "$SELF" compile 2>&1 | tee "$t"; then git reset --hard "$org" - git notes --ref "refs/notes/admin-merge" add -m "Compile failed:$LF`cat "$t"`" "$ref" + GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref" reportdo4 cat "$t" reportecho4 "--> compile failed" elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then git reset --hard "$org" - git notes --ref "refs/notes/admin-merge" add "$ref" - note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true` + git notes edit "$ref" + note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true` reportdo4 echo "$note" reportecho4 "--> test failed" else @@ -714,7 +714,7 @@ case "$cmd" in fi else git notes --ref "refs/notes/admin-merge" add "$ref" - note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true` + note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true` if [ -n "$note" ]; then reportdo4 echo "$note" reportecho4 "--> rejected" -- 2.39.2