News for hackers. Stuff that matters.
Re:Stay away from rebase by lmm on Tuesday April 30, 2013 @09:28AM (#5632019)
>If you're consistently writing buggy code and rebasing to fix it, then you're coding badly. Don't fix the symptom by rebasing endlessly, figure out your problem. And you do have a problem, because not only are you writing crap code, but you're committing it as well!

>Look closer at your diffs. Write more unit tests. Run them more often. Whatever, figure out what you need to do to avoid routinely making bad commits.

I disagree with this. Git is fast enough that you can commit early and often - more often than you can afford to run unit tests, even. I find it very useful to be able to commit each minor change of direction; half my commits don't even compile (I also believe in using strong type systems and the "compile error tells me what I need to change next" approach). If I need a "clean" history for review or similar (though honestly I don't see why you would - just review the differences between the branch head and branch base) I can always squash those commits thanks to git's nice history-rewriting features.

Re:Stay away from rebase by khasinski on Tuesday April 30, 2013 @10:35AM (#5632385)
Exactly. Keep remote history clean, keep local history dirty. Commit broken code, commit experimental features, do whatever it takes for you to write your code.

Squash, rebase interactively, rearrange, amend, merge, --no-ff before you push so other can read only a good, maintainable code served in meaningful and ordered commits.

Also rebase onto origin master often so you won't get lost in milion pages long diffs and conflicts.

Re:Stay away from rebase by edem on Tuesday April 30, 2013 @10:24AM (#5632328)
> half my commits don't even compile

This sounds awful to me. This does not work especially if you are working in a continuous integration environment like Hudson or Jenkins.

Re:Stay away from rebase by npsimons on Tuesday April 30, 2013 @10:45AM (#5632437)
Considering my project uses Jenkins and I commit on a sometimes minute basis (including code that won't build) I'd have to say committing broken code works just fine with Jenkins. Now if you're talking about pushing broken code to something like gerrit, that's another story, and that's just one of many reasons why the article is flat out wrong, because you have to rebase to squash commits into a single patch set before you can push them to something like gerrit, which then runs them by Jenkins.
Re:Stay away from rebase by lmm on Tuesday April 30, 2013 @10:30AM (#5632352)
I suspect I push working commits as often as anyone else - I just make a lot more local commits in between.
Re:Stay away from rebase by lucian1900 on Tuesday April 30, 2013 @10:47AM (#5632453)
It'll still mess up CI, sadly.
Re:Stay away from rebase by khasinski on Tuesday April 30, 2013 @10:56AM (#5632500)
No, it does not. CI never builds those broken commits because they never go outside of authors personal computer. Commit often, push when it's done and only push commits that work.
Re:Stay away from rebase by twic on Tuesday April 30, 2013 @11:06AM (#5632571)
The only way they never go outside of the author's personal computer is if the author squashes (or discards!) them before pushing. Otherwise, they will go outside of the author's personal computer.

However, they will never be a head outside of the author's personal computer, because they are pushed along with later commits that fix the brokenness. CI only ever builds heads, so the existence of the broken commits doesn't matter.

Re:Stay away from rebase by khasinski on Tuesday April 30, 2013 @11:14AM (#5632628)
You're right. What I had on my mind writing the previous post - don't push broken commits. :)
Re:Stay away from rebase by lucian1900 on Tuesday April 30, 2013 @02:01PM (#5633850)
Not all CI only builds heads. Some build and test all commits.
Re:Stay away from rebase by gte910h on Tuesday April 30, 2013 @02:58PM (#5634181)
Well, then it will mark them fixed in HEAD then
Re:Stay away from rebase by lmm on Tuesday April 30, 2013 @12:06PM (#5633003)
Why would CI ever run a build of more than one commit sent in the same push? Isn't the push atomic? (Certainly it's worked that way for me in practice).
Re:Stay away from rebase by drewcrawford on Wednesday May 01, 2013 @02:47AM (#5636808)
Suppose you want to know, not just the fact that dev is failing, but why it's failing. The particular commit that caused it to fail.