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

Re: How to rebase when some commit hashes are in some commit messages

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Oct 15, 2015, 09:41 UTC
Message-ID
<alpine.DEB.1.00.1510151134250.31610@s15462909.onlinehome-server.info>
In-Reply-To
<561F597B.8090102@orange.fr>
Hi Francois-Xavier,
On Thu, 15 Oct 2015, Francois-Xavier Le Bail wrote:
Show 7 quoted lines
> On 13/10/2015 15:29, Philip Oakley wrote:
>
> > Thus the only sha1 numbers that could be used are those that are
> > within the (possibly implied) instruction sheet (which will list the
> > current sha1s that will be converted by rebase to new sha1's).
> 
> Yes.

So what happens for commits that are in the pick list but then end up not being rewritten at all, e.g. when a patch has been applied upstream (and the --cherry logic did not detect that) and then you end up with a "No changes to commit"? And what if a patch ends up in merge conflicts and the user just skips it? And what if the referenced commit is to be picked *afterwards* due to the commits being reordered?

It would appear that the strategy you propose is still too ill-defined to make for a robust feature.

Ciao, Johannes

P.S.: The recommended way to refer to a commit is not only using the SHA-1 but also mentioning the one-line, and even the date. That way, even rebased commits can found most of the time. This is not fool-proof, by far, of course, but still better than trying to rewrite a SHA-1 and failing.

Previous: Francois-Xavier Le BailNext: Philip Oakley
Message 14 of 17 in “How to rebase when some commit hashes are in some commit messages”
  1. Francois-Xavier Le BailOct 12, 2015
  2. Matthieu MoyOct 12, 2015
  3. Francois-Xavier Le BailOct 13, 2015
  4. Konstantin KhomoutovOct 13, 2015
  5. Philip OakleyOct 13, 2015
  6. Jacob KellerOct 13, 2015
  7. Mike RappazzoOct 13, 2015
  8. Philip OakleyOct 13, 2015
  9. Jacob KellerOct 13, 2015
  10. Philip OakleyOct 13, 2015
  11. Francois-Xavier Le BailOct 15, 2015
  12. Francois-Xavier Le BailOct 15, 2015
  13. Francois-Xavier Le BailOct 15, 2015
  14. Johannes SchindelinOct 15, 2015
  15. Philip OakleyOct 16, 2015
  16. Thomas KochOct 18, 2015
  17. Ævar Arnfjörð BjarmasonOct 18, 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.