On Mon, Jun 01, 2015 at 01:35:17PM -0700, Junio C Hamano wrote: > -- >8 -- > From: Junio C Hamano <gitster@xxxxxxxxx> > 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
Attachment:
signature.asc
Description: Digital signature