git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Chunlin Zhang <zhangchunlin@gmail.com>
To: git@vger.kernel.org
Subject: bugreport: Wrong binary file content after cherry-pick
Date: Wed, 13 May 2020 16:47:56 +0800	[thread overview]
Message-ID: <CAG2rzA=c8bGD6A_8kKCdz+UABjed9W6mSJYjLhYckbsXiFe4CQ@mail.gmail.com> (raw)

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

             reply	other threads:[~2020-05-13  8:48 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-13  8:47 Chunlin Zhang [this message]
2020-05-13 16:15 ` bugreport: Wrong binary file content after cherry-pick Junio C Hamano
2020-05-13 23:21   ` Elijah Newren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAG2rzA=c8bGD6A_8kKCdz+UABjed9W6mSJYjLhYckbsXiFe4CQ@mail.gmail.com' \
    --to=zhangchunlin@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).