Hi, On Fri, 25 Nov 2016, Johannes Schindelin wrote: > +test_expect_failure 'cherry-pick fails gracefully with dirty renamed file' ' Woops. This title is wrong. It should say instead: 'cherry-pick succeeds with unrelated renamed, dirty file'. > + test_commit to-rename && > + git checkout -b unrelated && > + test_commit unrelated && > + git checkout @{-1} && > + git mv to-rename.t renamed && > + test_tick && > + git commit -m renamed && > + echo modified >renamed && > + git cherry-pick unrelated And this actually warns about an ambiguous refname. Will send out v2 in a moment. Ciao, Dscho