tree dbdee30a26b6c7887278413945d2e71ac9a27c6c
parent 1749f47d513a7473a0feb372a3c999281f1700fd
author Rob Mohr <mohrr@google.com> 1642791063 -0800
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> 1642813387 +0000

checkout: Don't rebase merge commits

Detect merge commits based on how many parents they have and don't
rebase them.

Tested with led:

Original build: http://go/bbid/8824406343025130689.

$ led get-build 8824406343025130689 | led edit-recipe-bundle | led launch
https://ci.chromium.org/swarming/task/5896cb4735774d10?server=chrome-swarming.appspot.com

Change-Id: I8b5f29fe6c9b26ba4bd6332e9a009881db342398
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/80788
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>