Use .id+.login when pusher.email is null

check-spelling · Oct 31, 2022 · 6f1a434 · 6f1a434
1 parent a29f375
commit 6f1a434
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/merge b/merge
@@ -16,7 +16,10 @@ gh api "/users/$SENDER" > "$USER_JSON"
 export GIT_AUTHOR_NAME=$(jq -r .name "$USER_JSON")
 export GIT_AUTHOR_EMAIL=$(jq -r '.email // empty' "$USER_JSON")
 if [ -z "$GIT_AUTHOR_EMAIL" ]; then
-    GIT_AUTHOR_EMAIL=$(jq -r '.pusher.email' "$GITHUB_EVENT_PATH")
+    GIT_AUTHOR_EMAIL=$(jq -r '.pusher.email // empty' "$GITHUB_EVENT_PATH")
+    if [ -z "$GIT_AUTHOR_EMAIL" ]; then
+        GIT_AUTHOR_EMAIL=$(jq -r '((.id|tostring + "+") + .login + "@users.noreply.github.com")' "$USER_JSON")
+    fi
 fi
 export GIT_COMMITTER_NAME=GitHub
 export [email protected]