On Wed, Jan 20, 2016 at 03:35:23PM +0900, Mike Hommey wrote: > When doing git add -p, the default of 3 context lines is used, ignoring > the diff.context. > > git add -p is using git-diff-files, and diff.context is being read in > git_diff_ui_config, so the comment above that function applies: > /* > * These are to give UI layer defaults. > * The core-level commands such as git-diff-files should > * never be affected by the setting of diff.renames > * the user happens to have in the configuration file. > */ > > I guess the question is whether it's diff-files or add -p that should > honor diff.context. Or should it have its own separate config?
I think it must be "add -p", as otherwise we risk breaking scripts which try to build on diff-tree but can't handle extra context (though I have to admit that unlike something like diff.color, it would be a pretty poor consumer of a diff that couldn't handle varying context). We already do something similar with diff.algorithm. I think you could probably just cargo-cult the handling of $diff_algorithm in git-add--interactive.perl. It might also make a nice GSoC microproject. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
