Hacker News Board Hacker News, browsed like a classic message board
Live data from Hacker News

Using Git add -p for fun (and profit)

techne98.com

Post reply on HN
Print view View original

31–40 of 80 posts

Re: Using Git add -p for fun (and profit)

#31

Post by throwaway613745 »

Someone wrote: post #24

A disadvantage of git add -p is that it allows you to create a commit that never existed on the development system, and, hence, cannot have been tested. How do people handle that? One way would be to follow it up with git stash , running tests, and, if necessary, git amend , but that can get cumbersome soon.

It hasn't been an issue in my experience at $DAY_JOB, but for us all commits must pass CI and not just the tip of whatever branch was just pushed. So branches with partial commits that fail CI cannot be merged. So if you commit an incorrect partial commit, you either squash it into a commit that does pass CI (usually the next one forward) or you rebase and edit the failed commit and fix it and force push your branch and run CI on the whole changeset again.

Re: Using Git add -p for fun (and profit)

#32

Post by idoubtit »

pseufaux wrote: post #12

This is one place jj really shines. Using jj new to quickly switch to a new change makes it easier to not drop flow but still break up work. You can come back later and add descriptions or reorder and squash. That way, you don't get into as many situations where splitting a commit is necessary. For those that remain, jj split works well.

Your mileage may vary, because the workflow you described does not suit me. I rarely want to put on hold my commit, work on a new one, then go back later to the former commit.

Most of the time, when working on a new commit I have a few changes related to recent commits. So _when I'm done with all that_, I commit selectively the new work, then dispatch the rest among the other commits:

  git add -p ; git commit
  git add -u ; git absorb
Sometimes, I use `commit --fixup` instead of the automatic `absorb`. Anyway, I tried Jujutsu for a few weeks, some was good and some was bad; it didn't "shine" enough and I went back to pure Git.

Re: Using Git add -p for fun (and profit)

#34

Post by gary_0 »

ellisv wrote: post #13
poly2it wrote: post #8

FYI: your website is barely readble with light mode.

also barely readable with dark mode

I'm in a daylit room on a laptop screen in dark mode. Some of the text was literally invisible. If the site's owner is reading this, you should fix that.

Re: Using Git add -p for fun (and profit)

#36

Post by t0mas88 »

throwaway613745 wrote: post #31
Someone wrote: post #24

A disadvantage of git add -p is that it allows you to create a commit that never existed on the development system, and, hence, cannot have been tested. How do people handle that? One way would be to follow it up with git stash , running tests, and, if necessary, git amend , but that can get cumbersome soon.

It hasn't been an issue in my experience at $DAY_JOB, but for us all commits must pass CI and not just the tip of whatever branch was just pushed. So branches with partial commits that fail CI cannot be merged. So if you commit an incorrect partial commit, you either squash it into a commit that does pass CI (usually the next one forward) or you rebase and edit the failed commit and fix it and force push your branch…

If you push a branch with many commits, does it run CI on each commit? In sequence or with some parallelism?

Re: Using Git add -p for fun (and profit)

#37

Post by GuB-42 »

ktpsns wrote: post #5

What's wrong with a big end of day commit? Sure, a well crafted git history can be very valuable. But then comes somebody and decides to just flush your well curated history down the toilet (=delete it and start somewhere else from scratch) and then all the valuable metadata stored in the history is lost. Maybe consider putting your energy into a good documentation inside the repository. I would love to have more pro…

For me the point of splitting commit is not for documentation (though it can be an added benefit). It is so that you can easily rollback a feature, or cherry pick, it also makes the use of blame and bisect more natural. Anyways, that's git, it gives you a lot of options, do what you want with them. If a big end-of-day commit is fine for you, great, but some people prefer to work differently.

But that's not actually the reason I use "git add -p" the most. The way I use it is to exclude temporary code like traces and overrides from my commits while still keeping them in my working copy.

Re: Using Git add -p for fun (and profit)

#39

Post by kaelwd »

fainpul wrote: post #28
ellisv wrote: post #13

Earlier quoted context omitted.

also barely readable with dark mode

Dark mode looks fine to me: light gray on black. Light mode is terrible: dark gray on black.

You get light grey? The headings are #101828 and body text #364153 on #0a0a0a for me.

Re: Using Git add -p for fun (and profit)

#40

Post by gary_0 »

I've been using lazygit [https://github.com/jesseduffield/lazygit] which is a friendly TUI that makes selecting which lines to commit relatively painless. As a heavy user of hunk-by-hunk or line-by-line commits, I used to use tortoisehg, but on my current distro its showing some bitrot, so I decided to try something else.
Post reply on HN