[BUG] Apply patches failed without any changes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Thank you for filling out a Git bug report!
Please answer the following questions to help us understand your issue.

What did you do before the bug happened? (Steps to reproduce your issue)

1. Clone the repo

```bash
git clone https://github.com/Ylarod/frida-core
```

2. Generate patches from 36a8ffbb to ed039c9f

ed039c9f Florida: memfd-name-jit-cache
f5f61669 Florida: pool-frida
7d4ada2d Florida: update python script
bbe4ebb1 Florida: protocol_unexpected_command
bedd2337 Florida: thread_gmain
e251174c Florida: thread_gum_js_loop
357374cf Florida: symbol_frida_agent_main
da9110f5 Florida: frida_agent_so
351d9c1e Florida: string_frida_rpc
36a8ffbb subprojects: Prepare for release

```bash
git format-patch -N 36a8ffbb
```

There will be 9 patches:

0001-Florida-string_frida_rpc.patch
0002-Florida-frida_agent_so.patch
0003-Florida-symbol_frida_agent_main.patch
0004-Florida-thread_gum_js_loop.patch
0005-Florida-thread_gmain.patch
0006-Florida-protocol_unexpected_command.patch
0007-Florida-update-python-script.patch
0008-Florida-pool-frida.patch
0009-Florida-memfd-name-jit-cache.patch

3. Apply these patches to 36a8ffbb

```bash
git reset --hard 36a8ffbb

git am 000*
```

The bug happens:

```
Applying: Florida: string_frida_rpc
Applying: Florida: frida_agent_so
Applying: Florida: symbol_frida_agent_main
.git/rebase-apply/patch:126: trailing whitespace.

error: patch failed: lib/agent/frida-agent.def:1
error: lib/agent/frida-agent.def: patch does not apply
error: patch failed: tests/labrats/agent.def:1
error: tests/labrats/agent.def: patch does not apply
Patch failed at 0003 Florida: symbol_frida_agent_main
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
```

What did you expect to happen? (Expected behavior)

Apply these patches correctly

What happened instead? (Actual behavior)

Apply patch failed

What's different between what you expected and what actually happened?

Anything else you want to add:

Please review the rest of the bug report below.
You can delete any lines you don't wish to share.


[System Info]
git version:
git version 2.47.0
cpu: x86_64
no commit associated with this build
sizeof-long: 8
sizeof-size_t: 8
shell-path: /bin/sh
libcurl: 8.10.1
OpenSSL: OpenSSL 3.3.2 3 Sep 2024
zlib: 1.3.1
uname: Linux 6.11.6-arch1-1 #1 SMP PREEMPT_DYNAMIC Fri, 01 Nov 2024
03:30:41 +0000 x86_64
compiler info: gnuc: 14.2
libc info: glibc: 2.40
$SHELL (typically, interactive shell): /usr/bin/zsh


[Enabled Hooks]




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux