sequencer: remove unnecessary "or" in pick_one_commit()
If error_with_patch(..., res, ...) succeeds then it returns "res", if it fails then it returns -1. This means that or-ing the return value with "res" is pointless as the result is the same as the return value. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Jul 15, 2026 at 16:21 UTC
6bb740dffb908a670e52b88f309f521f6d29a912
1 file changed
+2
-3
sequencer.c
+2
-3
@@ -5007,9 +5007,8 @@ static int pick_one_commit(struct repository *r,
5007
oideq(&opts->squash_onto, &oid))))
5008
to_amend = 1;
5009
5010
- return res | error_with_patch(r, item->commit,
5011
- arg, item->arg_len, opts,
5012
- res, to_amend);
5010
+ return error_with_patch(r, item->commit, arg, item->arg_len,
5011
+ opts, res, to_amend);
5012
}
5013
return res;
5014
}