Jeff King <peff@xxxxxxxx> writes: > My concerns are: > > - "-f" is kind of vague. Would people expect it to force aspects of > the stash? Should it be "--intent-as-empty"? > > - the error message is still a bit muddled, because you get the "not > yet added" files _first_, then some failure cruft from write-tree, > and _then_ the trying-to-be-helpful message > > I dunno. Honestly I am a bit lukewarm about this whole thing, as it > seems like something that just wouldn't come up that often, and while > the current error message is a bit disorganized, I think a user who has > used "git add -N" can figure out that it is related (the only report we > have is from Yann, who _did_ figure it out, but wanted to know how to > make git handle the situation better). I am not sure if asking for positive confirmation with "-f" is even worth it. As you pointed out in your earlier message, which prompted me to respond with a patch, when this codepath is exercised, the user is in a rush, and I do not see what else the user would want to do other than including it in the stash by rerunning with -f. -- 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