wip

push_new_series.sh

@@ -74,17 +74,18 @@ do
     date=$(echo "$s" | cut -f 2 -d '|')
     echo $msg_id
     echo $date
-    base_git_revision=$(git log -n1 --format=format:%H --before="$date" --first-parent upstream/master)
-    echo $base_git_revision
-
-    git checkout "$base_git_revision"
-    git branch -D $msg_id || true
-    if git checkout -b $msg_id; then
-        if ! b4 shazam $msg_id |& tee apply.log; then
+    if ! git rev-parse "remotes/origin/$msg_id"; then
+        base_git_revision=$(git log -n1 --format=format:%H --before="$date" --first-parent upstream/master)
+        git checkout "$base_git_revision"
+        git branch -D new_series > /dev/null || true
+        git checkout -b new_series
+        if ! b4 shazam $msg_id |& tee shazam.log; then
             git am --abort
-            git add apply.log
-            git commit -m 'am failed'
+            git add shazam.log
+            git commit -m 'b4 shazam failed'
         fi
-        git push --set-upstream origin $msg_id
+        git push --set-upstream origin new_series:$msg_id
+        git checkout master
+        git branch -D new_series
     fi
 done