git/list[1] front-page[2] threads[3] people[4] search[5] about
 

bugreport: Wrong binary file content after cherry-pick

From
Chunlin Zhang <zhangchunlin@gmail.com>
Date
May 13, 2020, 08:47 UTC
Message-ID
<CAG2rzA=c8bGD6A_8kKCdz+UABjed9W6mSJYjLhYckbsXiFe4CQ@mail.gmail.com>
git version: after v2.21.0 can reproduce this bug

reproduce steps: git clone https://github.com/zhangchunlin/gitbug cd gitbug git cherry-pick dev

Then there will be a conflict with the cherry-pick, but if you run "md5sum *", will get: 6f96c8bc9e3df2f6fef1ecbb09f218f6 ICS_usc_any_any_9.1.5_8871.uscc_261_130664_2048-release.apk 6f96c8bc9e3df2f6fef1ecbb09f218f6 ICS_usc_any_any_9.8.0_b2cbd84d94.b2cbd84_297_131010_2048-release.apk

The second file get a wrong file content. 3 related files md5: 6f96c8bc9e3df2f6fef1ecbb09f218f6 ICS_usc_any_any_9.1.5_8871.uscc_261_130664_2048-release.apk d1bdd852b32c09ec93a5494afb3c67e7 ICS_usc_any_any_9.1.5_8871.uscc_266_130703_2048-release.apk b2c50a9d7d488aa0b62ec7e68706ea85 ICS_usc_any_any_9.8.0_b2cbd84d94.b2cbd84_297_131010_2048-release.apk

I use git bisect to found the commit which cause this problem: https://github.com/git/git/commit/48c9cb9d6d058bcf18e931a1ed0d88792bb506c9

Next: Junio C Hamano
Message 1 of 3 in “bugreport: Wrong binary file content after cherry-pick”
  1. Chunlin ZhangMay 13, 2020
  2. Junio C HamanoMay 13, 2020
  3. Elijah NewrenMay 13, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.