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

Re: [PATCH] format-patch: dereference tags with --ignore-if-in-upstream

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Jun 1, 2015, 22:34 UTC
Message-ID
<20150601223409.GB140991@vauxhall.crustytoothpaste.net>
In-Reply-To
<xmqq4mmr5fqy.fsf@gitster.dls.corp.google.com>
On Mon, Jun 01, 2015 at 01:35:17PM -0700, Junio C Hamano wrote:
Show 18 quoted lines
> -- >8 --
> From: Junio C Hamano <gitster@pobox.com>
> Date: Mon, 1 Jun 2015 10:44:21 -0700
> Subject: [PATCH] format-patch: do not feed tags to clear_commit_marks()
> 
> "git format-patch --ignore-if-in-upstream A..B", when either A or B
> is a tag, failed miserably.
> 
> This is because the code passes the tips it used for traversal to
> clear_commit_marks(), after running a temporary revision traversal
> to enumerate the commits on both branches to find if they have
> commits that make equivalent changes.  The revision traversal
> machinery knows how to enumerate commits reachable starting from a
> tag, but clear_commit_marks() wants to take nothing but a commit.
> 
> In the longer term, it might be a more correct fix to teach
> clear_commit_marks() to do the same "committish to commit"
> dereferncing that is done in the revision traversal machinery, but

"dereferencing". Otherwise, looks exactly like what I would have written in my reroll had you not gotten to it before me.

-- 
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: Junio C HamanoNext: Junio C Hamano
Message 16 of 21 in “seg fault in "git format-patch"”
  1. Bruce KorbMay 31, 2015
  2. Christian CouderMay 31, 2015
  3. Bruce KorbMay 31, 2015
  4. Bruce KorbMay 31, 2015
  5. Christian CouderMay 31, 2015
  6. Christian CouderMay 31, 2015
  7. Christian CouderJun 1, 2015
  8. format-patch: dereference tags with --ignore-if-in-upstreambrian m. carlson, Jun 1, 2015
  9. Jeff KingJun 1, 2015
  10. brian m. carlsonJun 1, 2015
  11. Jeff KingJun 1, 2015
  12. Junio C HamanoJun 1, 2015
  13. Junio C HamanoJun 1, 2015
  14. Jeff KingJun 1, 2015
  15. Junio C HamanoJun 1, 2015
  16. brian m. carlsonJun 1, 2015
  17. Junio C HamanoJun 1, 2015
  18. Junio C HamanoJun 1, 2015
  19. Christian CouderJun 1, 2015
  20. Christian CouderJun 1, 2015
  21. Bruce KorbJun 1, 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.