Skip to content

Commit a3d3bae

Browse files
authored
Merge pull request #143 from evakhoni/quickfix-import_pr
import_pr fix "Script failed" after successful apply
2 parents 2136542 + ea7cc3d commit a3d3bae

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

import_pr.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,10 @@ apply_patches() {
337337
patch_name=$(basename "$patch")
338338
if git am --directory="${subdir}" "$patch" 2>/dev/null; then
339339
log_info "Applied: ${patch_name}"
340-
((applied++))
340+
((applied++)) || true
341341
else
342342
log_error "Failed to apply: ${patch_name}"
343-
((failed++))
343+
((failed++)) || true
344344
# Abort the am session
345345
git am --abort 2>/dev/null || true
346346
break

0 commit comments

Comments
 (0)