"Shawn O. Pearce" <spearce@xxxxxxxxxxx> writes: > Sverre Rabbelier <srabbelier@xxxxxxxxx> wrote: >> On Thu, Aug 13, 2009 at 10:07, Johannes >> Schindelin<Johannes.Schindelin@xxxxxx> wrote: >> > ... and will import the marks twice? >> >> Ah, you're right :(. What's the best way to do this? Should we dump >> any previous marks when importing new ones? > > Uh, well, yes. We shouldn't define :5 if it was in the file that > appeared in the stream, but isn't in the file on the command line. > > Worse, what happens if we do this: > > echo "option import-marks=/not/found" \ > | git fast-import --import-marks=my.marks > > I want this to work, even though /not/found does not exist, but > my.marks does. So that does complicate things... How about making the option parser get and keep the _name_ of the file until option parsing session (i.e. read the stream until initial run of "option" command runs out and then parse the command line to override), and then finally open the file and read it? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html