wip

pbo-linaro · Oct 15, 2024 · 2386f20 · 2386f20
1 parent 1e27ef8
commit 2386f20
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/push_new_series.sh b/push_new_series.sh
@@ -77,9 +77,14 @@ do
     base_git_revision=$(git log -n1 --format=format:%H --before="$date" --first-parent upstream/master)
     echo $base_git_revision
 
-    git checkout $base_git_revision
-    b4 shazam $msg_id
+    git checkout "$base_git_revision"
     git branch -D $msg_id || true
-    git checkout -b $msg_id
-    git push -f --set-upstream origin $msg_id
+    if git checkout -b $msg_id; then
+        if ! b4 shazam $msg_id |& tee apply.log; then
+            git am --abort
+            git add apply.log
+            git commit -m 'am failed'
+        fi
+        git push --set-upstream origin $msg_id
+    fi
 done