On Sat, Nov 10, 2018 at 10:23:09PM -0800, Elijah Newren wrote: > If file paths are specified to fast-export and a ref points to a commit > that does not touch any of the relevant paths, then that ref would > sometimes fail to be exported. (This depends on whether any ancestors > of the commit which do touch the relevant paths would be exported with > that same ref name or a different ref name.) To avoid this problem, > put *all* specified refs into extra_refs to start, and then as we export > each commit, remove the refname used in the 'commit $REFNAME' directive > from extra_refs. Then, in handle_tags_and_duplicates() we know which > refs actually do need a manual reset directive in order to be included. > > This means that we do need some special handling for excluded refs; e.g. > if someone runs > git fast-export ^master master > then they've asked for master to be exported, but they have also asked > for the commit which master points to and all of its history to be > excluded. That logically means ref deletion. Previously, such refs > were just silently omitted from being exported despite having been > explicitly requested for export. Hmm. Reading this it makes sense to me, but I remember from discussion long ago that there were a lot of funny corner cases around "which refs to include" and possibly even some ambiguous cases. Maybe that is all sorted these days, with --refspec. > --- > NOTE: I was hoping the strmap API proposal would materialize, but I either > missed it or it hasn't shown up. The usage of string_list in this patch > would be better replaced by what Peff suggested. You didn't miss it. Junio did some manual conversions using hashmap, which weren't too bad. It's not entirely clear to me how often we'd be able to use strmap instead of a full-on hashmap, so I haven't really pursued it. It looks like you generate the list here via append, and then sort at the end. That's at least not quadratic. I think the string_list_remove() is, though. -Peff
