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

Re: [PATCH/RFC 2/2] git rebase -i: Warn removed or dupplicated commits

From
Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Date
May 27, 2015, 13:23 UTC
Message-ID
<1660192861.39291.1432732981552.JavaMail.zimbra@ensimag.grenoble-inp.fr>
In-Reply-To
<CAPig+cQJMSjS=fiwMHE93efSsa2QYQ8TphyyfcLg7kAXRi_+cw@mail.gmail.com>
Eric Sunshine<sunshine@sunshineco.com> writes:
> Shouldn't this case also 'die' when rebase.checkLevel is "error"? And,
> why doesn't the user get advice about configuring rebase.checkLevel in
> this case?
Stephen Kelly<steveire@gmail.com> writes:
> I sometimes duplicate commits deliberately if I want to split a commit in
> two.
Matthieu Moy<Matthieu.Moy@grenoble-inp.fr> writes:
> The more I think about it, the more I think we should either not warn at
> all on duplicate commits, or have a separate config variable.

Put in common because two config variables would have an effect on the 'die' and advise part.

In this patch we didn't put the 'die' in the duplicate commit part since there was only one config variable and there are cases where the user might want to duplicate commits.

After the code reviewing of Eric Sunshine and Stephen Kelly, we also came to the conclusion that we should use two config variables, one about missing commits and the other about duplicate commits.

This way if you deliberately want to use duplicate commits, you can just set the value to 'ignore' for duplicate commits and still have 'warn'/'error' for missing commits. Moreover, each part would have its 'die' depending on the value of the corresponding config variable.

Previous: Junio C HamanoNext: Stephen Kelly
Message 9 of 24 in “git-rebase -i: Add key word "drop" to remove a commit”
  1. 1/2 git-rebase -i: Add key word "drop" to remove a commitGalan Rémi, May 26, 2015
  2. 2/2 git rebase -i: Warn removed or dupplicated commitsGalan Rémi, May 26, 2015
  3. Eric SunshineMay 26, 2015
  4. Remi Galan AlfonsoMay 27, 2015
  5. Eric SunshineMay 27, 2015
  6. Junio C HamanoMay 27, 2015
  7. Remi Galan AlfonsoMay 28, 2015
  8. Junio C HamanoMay 28, 2015
  9. Remi Galan AlfonsoMay 27, 2015
  10. Stephen KellyMay 27, 2015
  11. Matthieu MoyMay 27, 2015
  12. Junio C HamanoMay 27, 2015
  13. Eric SunshineMay 26, 2015
  14. Johannes SchindelinMay 27, 2015
  15. Remi Galan AlfonsoMay 27, 2015
  16. Matthieu MoyMay 27, 2015
  17. Junio C HamanoMay 27, 2015
  18. Matthieu MoyMay 27, 2015
  19. Junio C HamanoMay 27, 2015
  20. Stefan BellerMay 27, 2015
  21. Johannes SchindelinMay 28, 2015
  22. Stefan BellerMay 28, 2015
  23. Matthieu MoyMay 28, 2015
  24. Philip OakleyMay 27, 2015

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.