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

Re: [PATCH] revert.c: Allow to specify -x via git-config

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Feb 18, 2014, 18:38 UTC
Message-ID
<20140218183842.GA163138@vauxhall.crustytoothpaste.net>
In-Reply-To
<20140218174913.GB7855@google.com>
On Tue, Feb 18, 2014 at 09:49:13AM -0800, Jonathan Nieder wrote:
Show 8 quoted lines
> Can you say more about the context?  Why is it important to record the
> original commit id?  Is it a matter of keeping a reminder of the
> commits' similarity (which cherry-pick without '-x' does ok by reusing
> the same message) or are people reviewing the change downstream going
> to be judging the change based on the recorded upstream commit id?
> (Like linux's stable-<version> branches --- but those have other
> requirements so I don't think this configuration would work as is
> there.)

I can provide a use case. At work, we merge into the maintenance and development branches and cherry-pick from the maintenance to the stable branches. We want committers to always use -x -s because we need to know which reviewer backported the change and we want to be able to track which commits have been backported and whether any reverts also need to be cherry-picked. We also have automated tools that want this information.

I usually solve this with an alias (backport = cherry-pick -x -s), but I can see how this might be a useful option.

-- 
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
Previous: Jonathan NiederNext: Jonathan Nieder
Message 4 of 10 in “revert.c: Allow to specify -x via git-config”
  1. revert.c: Allow to specify -x via git-configGuido Günther, Feb 18, 2014
  2. John KeepingFeb 18, 2014
  3. Jonathan NiederFeb 18, 2014
  4. brian m. carlsonFeb 18, 2014
  5. Jonathan NiederFeb 18, 2014
  6. 0/3 Allow to configure cherry-pick's record originGuido Günther, Feb 18, 2014
  7. 1/3 revert.c: Allow to specify -x via git-configGuido Günther, Feb 18, 2014
  8. Junio C HamanoFeb 19, 2014
  9. 2/3 revert.c: Add --record-originGuido Günther, Feb 18, 2014
  10. 3/3 revert.c Allow to override cherrypick.recordOriginGuido Günther, Feb 18, 2014

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.