user/sven/git.git, branch v1.5.3.3

GIT 1.5.3.3

2007-09-29T23:07:46Z

Signed-off-by: Junio C Hamano

Fix revision log diff setup, avoid unnecessary diff generation

2007-09-29T22:42:32Z

We used to incorrectly start calculating diffs whenever any argument but '-z' was recognized by the diff options parsing. That was bogus, since not all arguments result in diffs being needed, so we just waste a lot of time and effort on calculating diffs that don't matter. This actually also fixes another bug in "git log". Try this: git log -C and notice how it prints an extra empty line in between log entries, even though it never prints the actual diff (because we didn't ask for any diff format, so the diff machinery never prints anything). With this patch, that bogus empty line is gone, because "revs->diff" is never set. So this isn't just a "wasted time and effort" issue, it's also a slight semantic fix. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

git-bundle: fix commandline examples in the manpage

2007-09-29T22:40:17Z

Multiple commands were displayed in one line, making the manpage hard to read. Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano

Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint

2007-09-29T22:39:39Z

* 'mergetool' of git://repo.or.cz/git/mergetool: mergetool: Fix typo in options passed to kdiff3 mergetool: fix emerge when running in a subdirectory Mergetool generating blank files (1.5.3)

mergetool: Fix typo in options passed to kdiff3

2007-09-29T02:26:05Z

Fix missing double hyphens in "-L1" and "-L2" Signed-off-by: "Theodore Ts'o"

mergetool: fix emerge when running in a subdirectory

2007-09-29T01:23:22Z

Only pass the basename of the output filename when to emerge, since emerge interprets non-absolute pathnames relative to the containing directory of the output buffer. Thanks to Kelvie Wong for pointing this out. Signed-off-by: "Theodore Ts'o"

Mergetool generating blank files (1.5.3)

2007-09-29T00:13:14Z

When mergetool is run from a subdirectory, "ls-files -u" nicely limits the output to conflicted files in that directory, but we need to give the full path to cat-file plumbing to grab the contents of stages. Signed-off-by: Junio C Hamano Signed-off-by: "Theodore Ts'o"

quiltimport: Skip non-existent patches

2007-09-27T23:19:19Z

When quiltimport encounters a non-existent patch in the series file, just skip to the next patch. This matches the behavior of quilt. Signed-off-by: Dan Nicholson Signed-off-by: Junio C Hamano

apply: get rid of --index-info in favor of --build-fake-ancestor

2007-09-26T20:42:10Z

git-am used "git apply -z --index-info" to find the original versions of the files touched by the diff, to be able to do an inexpensive three-way merge. This operation makes only sense in a repository, since the index information in the diff refers to blobs, which have to be present in the current repository. Therefore, teach "git apply" a mode to write out the result as an index file to begin with, obviating the need for scripts to do it themselves. The sole user for --index-info is "git am" is converted to use --build-fake-ancestor in this patch. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Move make_cache_entry() from merge-recursive.c into read-cache.c

2007-09-26T20:42:10Z

The function make_cache_entry() is too useful to be hidden away in merge-recursive. So move it to libgit.a (exposing it via cache.h). Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano