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

cherry-pick strangeness

From
VLVincent Legoll <vincent.legoll@gmail.com>
Date
Jun 13, 2019, 22:40 UTC
Message-ID
<CAEwRq=ohKw8o0R3mtcr5E0fAeEX_OMo5qCiVx3EWwp5B3BKU9Q@mail.gmail.com>
Hello,

I stumbled upon a strange behavior of cherry-pick, running the attached script yields different results from running the same command lines manually in an interactive shell, one after the other.

I searched the man page and found no indications that that should act in this way. It looks like the CLI args "--ff" & "--no-ff" or the absence of it are not doing the same in a script as in an interactive shell.

I asked in the IRC channel, and was asked to report it here.

I tried to reproduce it in various environments, I ran it in Centos 7, debian 9, ubuntu bionic & cosmic, alpine & fedora, in docker containers, all giving the same results. The git versions tested range from 1.8.3.1 to 2.21.0.

Trying to reproduce, I created the attached script, which reports 3 times "SAME", whereas the case using "--no-ff" should print "DIFF", if I'm not wrong in reading its manpage description.

What am I missing ?
-- 
Vincent Legoll
Next: Elijah Newren
Message 1 of 4 in “cherry-pick strangeness”
  1. Vincent LegollJun 13, 2019
  2. Elijah NewrenJun 13, 2019
  3. Vincent LegollJun 14, 2019
  4. Phil HordJun 15, 2019

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.