trying to duplicate a git cherry issue