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
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
May 27, 2015, 11:38 UTC
Message-ID
<vpqy4ka5jyp.fsf@anie.imag.fr>
In-Reply-To
<loom.20150527T105315-517@post.gmane.org>
Stephen Kelly <steveire@gmail.com> writes:
Show 12 quoted lines
> Galan Rémi <remi.galan-alfonso <at> ensimag.grenoble-inp.fr> writes:
>
>> 
>> Check if commits were removed (i.e. a line was deleted) or dupplicated
>> (e.g. the same commit is picked twice), can print warnings or abort
>> git rebase according to the value of the configuration variable
>> rebase.checkLevel.
>
> I sometimes duplicate commits deliberately if I want to split a commit in
> two. I move a copy up and fix the conflict, and I know that I'll still get
> the right thing later even if I make a mistake with the conflict
> resolution.

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.

It's rare to duplicate by mistake, and when you do so, it's already easy to notice: you get conflicts, and you can git rebase --skip the second occurence. Accidentally dropped commits are another story: it's rather easy to cut-and-forget-to-paste, and the consequence currently is silent data loss ...

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Previous: Stephen KellyNext: Junio C Hamano
Message 11 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.