Git Clone step failing with “not something we can merge” error.
Suddenly builds started failing at Git clone step.
Environment:
linux-docker-android-20.04
If on Bitrise.io: On Bitrise, Android & Docker on Ubuntu 20.04
Git Clone step failed.
Git Clone Step v7.0.3
Reproducibility
- Does a “Rebuild” help? (You can trigger a rebuild from the Build’s page, by clicking the “Rebuild” button in the top right corner of a finished build) : NO
-
Does a rebuild without caches help? (You can remove the
Cache:PullandCache:Pushsteps temporarily to not to use the cache, or you can delete all the caches on theSettingstab of the app. : NO - Does the issue happen sporadically, or every time? : every time.
- Does upgrading the build Step to the latest version help? : NO
- When did the issue start? : 7th Feb 2023
Local reproduction
Tried running all the git commands mentioned in the log. No Errors.
Local reproduction: Linux / Android (docker based) stack builds
Did not try this. I will try this in some time.
Build log
+------------------------------------------------------------------------------+
| (1) Git Clone Repository |
+------------------------------------------------------------------------------+
| id: git-clone |
| version: 7.0.3 |
| collection: https://github.com/bitrise-io/bitrise-steplib.git |
| toolkit: go |
| time: 2023-02-13T18:56:55Z |
+------------------------------------------------------------------------------+
| |
Config:
- RepositoryURL: git@github.com:*****/*****.git
- CloneIntoDir: /bitrise/src
- Commit: ****************a643a7616fa5a778a8141eee
- Tag:
- Branch: develop
- PRDestBranch: develop
- PRID: 923
- PRSourceRepositoryURL: git@github.com:*****/*****.git
- PRMergeBranch: pull/923/merge
- PRHeadBranch: pull/923/head
- ResetRepository: false
- CloneDepth: 0
- FetchTags: false
- SubmoduleUpdateDepth: 0
- ShouldMergePR: true
- SparseDirectories: []
- BuildURL: https://app.bitrise.io/build/01013caf-aa11-439b-b429-a4266c6c4030
- BuildAPIToken: [REDACTED]
- UpdateSubmodules: true
- ManualMerge: true
$ git "init"
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint: git config --global init.defaultBranch <name>
hint:
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint:
hint: git branch -m <name>
Initialized empty Git repository in /bitrise/src/.git/
$ git "remote" "add" "origin" "git@github.com:*****/*****.git"
$ git "fetch" "--jobs=10" "--no-tags" "origin" "refs/heads/develop"
Warning: Permanently added 'github.com,140.82.114.4' (ECDSA) to the list of known hosts.
From github.com:*****/*****
* branch develop -> FETCH_HEAD
* [new branch] develop -> origin/develop
$ git "checkout" "develop"
Switched to a new branch 'develop'
branch 'develop' set up to track 'origin/develop'.
$ git "merge" "origin/develop"
Already up to date.
$ git "log" "-1" "--format=%H" &> out
commit hash: ******************f2621299a66114ba59b6da
$ git "fetch" "--jobs=10" "--no-tags" "origin" "refs/heads/develop"
From github.com:*****/*****
* branch develop -> FETCH_HEAD
$ git "merge" "****************a643a7616fa5a778a8141eee"
merge: ****************a643a7616fa5a778a8141eee - not something we can merge
Checkout strategy used: gitclone.checkoutPRManualMerge
Error: merge failed (****************a643a7616fa5a778a8141eee): merge: ****************a643a7616fa5a778a8141eee - not something we can merge