why is git-cherrypick saying nothing to commit

git github gerrit git-cherry-pick
user1934146 picture user1934146 · Dec 31, 2012 · Viewed 36.7k times · Source

I googled a lot for the below issue but couldn't get any substantial info...please help me out,created a temporary branch 202116 and am trying to do a cherrypick of gerrit 202116 and I get the below message,why am I not able to cherry-pick this gerrit and why am I getting this error?please provide your inputs

<>git fetch ssh://[email protected]:29418/platform/vendor/company-proprietary/radio refs/changes/25/202116/1 && git cherry-pick FETCH_HEAD
From ssh://company.com:29418/platform/vendor/company-proprietary/radio
 * branch            refs/changes/25/206025/1 -> FETCH_HEAD
# On branch 202116
# You are currently cherry-picking.
#   (all conflicts fixed: run "git commit")
#
nothing to commit, working directory clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Answer

Ryan Stewart picture Ryan Stewart · Dec 31, 2012

It's exactly what it says: the changes you're trying to cherry-pick are already wholly contained in the branch you're on. I.e. the result of the cherry-pick is no changes. You can create an empty commit with the --allow-empty flag to indicate that you attempted to cherry-pick, but there were no changes to pull in.

Related questions

not valid: is this a git repository?

My question is NOT this question. On performing a git clone I am getting this error. Command than I am using is: $ git clone "https://gdt.test.com/gitblit/log/?r=mytest.git&h=refs/heads/branch_development" On …

Read More
Gerrit push not working. Remote rejected, prohibited by gerrit

I am trying to add an existing repo to gerrit. I create an empty project and have tried pushing it (git push ssh://admin@localhost:29418/project *:*). I get this error message in return: Counting objects: 14, done. Delta compression using up …

Read More
Gerrit with Github

I am using github and I am willing to start using Gerrit with it. Since Gerrit uses JGit, I am scared of the following text from this link: EGit/JGit is a reimplementation of git in java, due to this …

Read More