user/sven/git.git/builtin-diff.c, branch v1.6.5.4

Show usage string for 'git log -h', 'git show -h' and 'git diff -h'

2009-08-07T21:40:29Z

Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Convert existing die(..., strerror(errno)) to die_errno()

2009-06-27T18:14:53Z

Change calls to die(..., strerror(errno)) to use the new die_errno(). In the process, also make slight style adjustments: at least state _something_ about the function that failed (instead of just printing the pathname), and put paths in single quotes. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

reorder ALLOW_TEXTCONV option setting

2008-12-08T03:59:25Z

Right now for the diff porcelain and the log family, we call: init_revisions(); setup_revisions(); DIFF_OPT_SET(ALLOW_TEXTCONV); However, that means textconv will _always_ be on, instead of being a default that can be manipulated with setup_revisions. Instead, we want: init_revisions(); DIFF_OPT_SET(ALLOW_TEXTCONV); setup_revisions(); which is what this patch does. We'll go ahead and move the callsite in wt-status, also; even though the user can't pass any options here, it is a cleanup that will help avoid any surprise later if the setup_revisions line is changed. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'lt/preload-lstat'

2008-11-28T03:24:13Z

* lt/preload-lstat: Fix index preloading for racy dirty case Add cache preload facility

Merge branch 'maint'

2008-11-26T19:57:31Z

* maint: Teach "git diff" to honour --[no-]ext-diff

Teach "git diff" to honour --[no-]ext-diff

2008-11-26T17:58:41Z

The original intention of 72909be (Add diff-option --ext-diff, 2007-06-30) was to optionally allow the use of external diff viewer in "git log" family (while keeping them disabled by default). It exposed the "allow external diff" bit to the UI, but forgot to adjust the "git diff" codepath that was set up to always allow use of the external diff viewer. Noticed by Nazri Ramliy; tests by René Scharfe squashed in. Signed-off-by: Junio C Hamano

Add cache preload facility

2008-11-15T03:11:49Z

This can do the lstat() storm in parallel, giving potentially much improved performance for cold-cache cases or things like NFS that have weak metadata caching. Just use "read_cache_preload()" instead of "read_cache()" to force an optimistic preload of the index stat data. The function takes a pathspec as its argument, allowing us to preload only the relevant portion of the index. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

Merge branch 'jk/diff-convfilter'

2008-11-13T05:50:58Z

* jk/diff-convfilter: enable textconv for diff in verbose status/commit wt-status: load diff ui config only textconv regular files userdiff: require explicitly allowing textconv refactor userdiff textconv code Conflicts: t/t4030-diff-textconv.sh

git-diff: Add --staged as a synonym for --cached.

2008-11-11T22:55:43Z

Signed-off-by: Junio C Hamano

userdiff: require explicitly allowing textconv

2008-10-26T21:09:48Z

Diffs that have been produced with textconv almost certainly cannot be applied, so we want to be careful not to generate them in things like format-patch. This introduces a new diff options, ALLOW_TEXTCONV, which controls this behavior. It is off by default, but is explicitly turned on for the "log" family of commands, as well as the "diff" porcelain (but not diff-* plumbing). Because both text conversion and external diffing are controlled by these diff options, we can get rid of the "plumbing versus porcelain" distinction when reading the config. This was an attempt to control the same thing, but suffered from being too coarse-grained. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano