Unoffical empeg BBS

Quick Links: Empeg FAQ | RioCar.Org | Hijack | BigDisk Builder | jEmplode | emphatic
Repairs: Repairs

Topic Options
#372490 - 17/12/2019 18:34 If you cherry pick, whose name is on the code?
tfabris
carpal tunnel

Registered: 20/12/1999
Posts: 31597
Loc: Seattle, WA
DeveloperPerson put a bugfix into the development branch. They're on Singapore time so they're asleep now. I want that bugfix into the release candidate and master branches too, without waiting for the gitflow merges to happen. I need the bugfix in those branches now to unblock continuous test runs on those branches.

Normally I'd just ask DeveloperPerson to cherry pick those fixes into the desired branches, but they're asleep.

If I cherry pick those fixes in myself (either using git cherry-pick at the command line, or pressing the "cherry pick" button on the Visualstudio.com user interface), who is the code owner of those code lines, as seen by "git blame"? Is the code considered to be from DeveloperPerson, or from me? I'm afraid to do it because I don't want my name on that bugfix.

I've googled and looked at the docs but I can't really find a clear answer.
_________________________
Tony Fabris

Top
#372493 - 17/12/2019 20:17 Re: If you cherry pick, whose name is on the code? [Re: tfabris]
peter
carpal tunnel

Registered: 13/07/2000
Posts: 4180
Loc: Cambridge, England
Cherry-pick to master locally, run git blame, reset HEAD if it doesn't look how you like. Resetting HEAD locally on master is fine as long as you haven't pushed it.

But I suspect the output will be as you like: the documentation carefully draws a distinction between the "author" and "committer" of a patch.

Peter

Top
#372499 - 18/12/2019 20:28 Re: If you cherry pick, whose name is on the code? [Re: peter]
tfabris
carpal tunnel

Registered: 20/12/1999
Posts: 31597
Loc: Seattle, WA
Thanks! I'll give that a shot.
_________________________
Tony Fabris

Top