git log shows an unmerged changeset

The following should not be possible, right? How can a branch contain a changeset, but a cherry-pick of that actually do something? I checked, there are no merges or changes that reverted this changeset…

➜  SourceRoot git:(release-HOTFIX-7) git branch --contains ade53bfdd9d5fae7b16ccfa5feaba451fc229565
develop
* release-HOTFIX-7
release-13
release-14

➜  SourceRoot git:(release-HOTFIX-7) git cherry-pick ade53bfdd9d5fae7b16ccfa5feaba451fc229565
[release-HOTFIX-7 aa060d4] JIRA-1427
Author: some-poor-developer's name
6 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 JavaJars/jzlib-1.1.2.jar

What are some of the things that I should do to prevent a dropped changeset in the future? I must have done something wrong?

  • GitHub: Apply master commits to another branch
  • Can you stage a file (or at least, a section of a file) DURING a git diff?
  • How can you add commits to a github pull request of another person to your repo if you can't commit to their branch?
  • ssh connection failing when pushing on a Gitlab repo
  • How to ignore file until next modification or temprorarily?
  • Using git over sshfs is too slow
  • edit – reply to Antak’s comment below

    commit d5855051fa2c779df553a4a388928e80f822bb36
    Author: <some_poor_dev's_name>
    Date:   Wed Jul 17 15:26:21 2013 -0700
    
        #comment redacted
    
    A       AntJavaJars/jzlib-1.1.2.jar
    

    and that’s it. the file itself claims to be added by the cherry-pick.

  • git ignores $GIT_AUTHOR_DATE — is this a bug?
  • Options for Copying Git Repo
  • How to commit the files which were pushed before and abandoned in gerrit
  • Unstaging changed file from commit in PR
  • Want to download a Git repository, what do I need (windows machine)?
  • What problems might I face keeping a directory under git and svn control?
  • One Solution collect form web for “git log shows an unmerged changeset”

    git branch --contains won’t lie. That commit is most definitely merged into that branch somewhere. It looks like you’re just adding the same changes that it introduced twice. Have you looked at the result of the cherry-pick? What happened to the files that it touched?

    Git Baby is a git and github fan, let's start git clone.