Commit 2d8d9ae
MacroFake
Merge bitcoin#26249: ci: Workaround Windows filesystem executable bit loss
b8d361a ci: Workaround Windows filesystem executable bit loss (Hennadii Stepanov)
Pull request description:
Fixes https://cirrus-ci.com/task/5946581265416192:
```
From https://github.com/bitcoin/bitcoin
* branch refs/pull/26103/merge -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by checkout:
ci/lint/04_install.sh
ci/lint/06_script.sh
contrib/devtools/gen-manpages.py
contrib/devtools/symbol-check.py
contrib/signet/getcoins.py
contrib/signet/miner
test/functional/feature_proxy.py
test/functional/feature_taproot.py
test/functional/interface_rest.py
test/functional/mining_prioritisetransaction.py
test/functional/rpc_blockchain.py
test/functional/rpc_fundrawtransaction.py
test/functional/rpc_help.py
test/functional/rpc_rawtransaction.py
test/functional/test_framework/test_framework.py
test/functional/test_runner.py
test/functional/wallet_basic.py
test/functional/wallet_bumpfee.py
test/functional/wallet_hd.py
test/functional/wallet_importmulti.py
test/functional/wallet_listdescriptors.py
test/functional/wallet_multiwallet.py
test/functional/wallet_resendwallettransactions.py
test/functional/wallet_sendall.py
test/lint/lint-locale-dependence.py
Please commit your changes or stash them before you switch branches.
Aborting
```
Top commit has no ACKs.
Tree-SHA512: 2b33d882a515bb17c7c2ae8cfe73541483cdc15e736909afaf42befc8f648dba5dc83ff58ebd6d38a5650a8eca01907ae6c61537927ac9718bd9582d8501647d1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
117 | | - | |
| 117 | + | |
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
| |||
0 commit comments