Programming

17358 readers

254 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Follow the programming.dev instance rules
Keep content related to programming in some way
If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities [email protected]

founded 1 year ago

MODERATORS

[email protected]

How common is it to code review like this? (programming.dev)

submitted 8 months ago* (last edited 8 months ago) by [email protected] to c/[email protected]

40 comments fedilink hide all child comments

For non-trivial reviews, when there are files with several changes, I tend to do the following in Git:

Create local branch for the pr to review
Squash if necessary to get everything in the one commit
Soft reset, so all the changes are modifications in the working tree
Go thru the modificiations "in situ" so to speak, so I get the entire context, with changes marked in the IDE, instead of just a few lines on either side.

Just curious if this is "a bit weird", or something others do as well?

(ed: as others mentioned, a squash-merge and reset, or reset back without squashing, is the same, so step 2 isn't necessary:))

you are viewing a single comment's thread
view the rest of the comments

[–] [email protected] 11 points 8 months ago (2 children)

Squashing seems like you'd potentially lose out on info and have a harder time isolating the changes you're looking through. I guess it depends on how much has been changed and whether some of the commits along the branch were more important than others.

I also don't think the reset is necessary, you should be able to diff the branch head against whatever you want.

[–] [email protected] 3 points 8 months ago

Yeah I had the same thoughts, had no idea people even bothered to do that

[–] [email protected] 2 points 8 months ago (1 children)

Sometimes the info lost is just a typo or a revert. I'd say heavily depends on the workflow of the people involved. Some like long history, some like rebasing, others, something in between. How you review those approaches changes a lot

[–] [email protected] 2 points 8 months ago

Sure, that's fine. I use interactive rebase for "cleaning" a lot. I'm just saying it doesn't make a difference for diffing (as you can diff any commit against any other) and doing it as a matter of routine sounds like it could skip potentially useful history.

I mostly rebase but if a branch has things happen in a sequence that matters, I would merge it instead, for example.