git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Development strategy

From
SRSverre Rabbelier <alturin@gmail.com>
Date
Jun 2, 2008, 18:30 UTC
Message-ID
<bd6139dc0806021130p2cc442a3qfe9c00681fdb05e3@mail.gmail.com>
In-Reply-To
<48441715.4010507@gmail.com>
On Mon, Jun 2, 2008 at 5:51 PM, Lea Wiemann <lewiemann@gmail.com> wrote:
Show 8 quoted lines
> 2) I should probably also try to squash patches into larger ones.  This will
> make it easier to make changes in older commits, since I don't have to edit
> several commits, and it reduces the probability of merge conflicts.  I'm not
> sure how much squashing is appropriate though: For example, would it be okay
> to squash a fix like "Git.pm: fix documentation of hash_object" into a
> larger "Git.pm: add and fix several methods" commit, where I only mention
> the documentation-fix in the log message?  It would certainly be helpful in
> that it reduces the number of conflicts, but it will make the logs coarser.

Why not go for the win and do both? Keep your commit strategy as is, and create a branch whenever you want review, say review-02-06 or such and in that branch you squash the commits as appropriate (perhaps StGit can help here). These patches are mostly not intended for inclusion just yet (but for review only), right? Instead of sending all the small commits you send a bigger one, perhaps with a link to where the branch can be found for easy checkout. You can keep the branch for the a record or delete it after the review and go on with the next branch.

Cheers,

Sverre, who thinks a few RFC patches are in place soon for git-stats too and is glad you are doing the fine-tuning wrt patch submission.

Previous: Lea WiemannNext: Jakub Narebski
Message 2 of 10 in “Development strategy”
  1. Lea WiemannJun 2, 2008
  2. Sverre RabbelierJun 2, 2008
  3. Jakub NarebskiJun 2, 2008
  4. Sverre RabbelierJun 2, 2008
  5. Johannes SchindelinJun 2, 2008
  6. Stephan BeyerJun 2, 2008
  7. Johannes SchindelinJun 2, 2008
  8. Lea WiemannJun 2, 2008
  9. Sverre RabbelierJun 2, 2008
  10. Junio C HamanoJun 2, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.