* ew/svn:
  Fix some doubled word typos
  Typofix in Makefile comment.
  Makefile: export NO_SVN_TESTS
  git-svn: migrate out of contrib (follow-up)
  git-svn: migrate out of contrib

Signed-off-by: NAlp Toker <alp@atoker.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NAlp Toker <alp@atoker.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NAlp Toker <alp@atoker.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This allows you to say:

	git -p diff v2.6.16-rc5..

and the command pipes the output of any git command to your pager.

[jc: this resurrects a month old RFC patch with improvement
 suggested by Linus to call it --paginate instead of --less.]
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NRyan Anderson <ryan@michonline.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

git-cvsexportcommit should check if the parent (supplied on the cmdline) to use
for a merge commit is one of the real parents of the merge.

But it errors out if the _first_ parent doesn't match and never checks
the other parents.
Signed-off-by: NPeter Baumann <siprbaum@stud.informatik.uni-erlangen.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Some GIT's shell script are using bare 'perl' for perl invocation.
Use @@PERL@@ symbol and replace it with PERL_PATH_SQ everywhere.
Signed-off-by: NMichal Rokos <michal.rokos@nextsoft.cz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Some implementations of sed (like HP-UX one) mandate a space between 'r'
and 'rfile'.
Signed-off-by: NMichal Rokos <michal.rokos@nextsoft.cz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Even if the standard output is connected to a tty, do not
colorize the diff if we are talking to a dumb terminal when
diff.color configuration variable is set to "auto".
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Without this patch, it really is not sufficient to define NO_SVN_TESTS
in config.mak or the Makefile.
Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NStephan Feder <sf@b-i-t.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NStephan Feder <sf@b-i-t.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NStephan Feder <sf@b-i-t.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Add new item text to struct diff_options.
If set then do not try to detect binary files.
Signed-off-by: NStephan Feder <sf@b-i-t.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

It is not worth trying to force C locale (and failing) just to
format the 2822 datestring.

This code was borrowed from /usr/bin/822-date (Ian Jackson and
Klee Dienes, both in public domain), per suggestion by Eric Wong.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
Acked-by: NJakub Narebski <jnareb@gmail.com>

The binary file detection is just a heuristic which can well fail.
Do not produce garbage patches in these cases.
Signed-off-by: NStephan Feder <sf@b-i-t.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The log commands are all capable of generating diffs, so we
should respect those configuration options for diffs here.
Signed-off-by: NEric Wong <normalperson@yhbt.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Check for SVN::Core so test 910[45] don't fail if the user
doesn't have those installed.
Signed-off-by: NEric Wong <normalperson@yhbt.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJunio C Hamano <junkio@cox.net>

Allow NO_SVN_TESTS to be defined to skip git-svn tests.  These
tests are time-consuming due to SVN being slow, and even more so
if SVN Perl libraries are not available.
Signed-off-by: NEric Wong <normalperson@yhbt.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

* ew/instaweb:
  instaweb: fix unportable ';' usage in sed
  Makefile: replace ugly and unportable sed invocation
  Add git-instaweb, instantly browse the working repo with gitweb
  gitweb: Declare global variables with "our"
  gitweb: Enable tree (directory) history display
  gitweb: optimize per-file history generation

I didn't notice earlier that two colons are required for the
asciidoc entry.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The check to use "rev-parse --verify" was defeated by the use of
"--default HEAD".  "git reset --hard bogus-committish" just
defaulted to reset to the HEAD without complaining.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

* lt/gitweb:
  gitweb: Declare global variables with "our"
  gitweb: Enable tree (directory) history display
  gitweb: optimize per-file history generation

* jc/fmt-merge-msg-test:
  t6200: fmt-merge-msg test.

* jc/sha1:
  A better-scheduled PPC SHA-1 implementation.
  test-sha1: test hashing large buffer
  Makefile: add framework to verify and bench sha1 implementations.

* jc/diff-test:
  t4013: add "diff" UI program tests.

* th/diff:
  builtin-diff: turn recursive on when defaulting to --patch format.
  t4013: note improvements brought by the new output code.
  t4013: add format-patch tests.
  format-patch: fix diff format option implementation
  combine-diff.c: type sanity.
  t4013 test updates for new output code.
  Fix some more diff options changes.
  Fix diff-tree -s
  log --raw: Don't descend into subdirectories by default
  diff-tree: Use ---\n as a message separator
  Print empty line between raw, stat, summary and patch
  t4013: add more tests around -c and --cc
  whatchanged: Default to DIFF_FORMAT_RAW
  Don't xcalloc() struct diffstat_t
  Add msg_sep to diff_options
  DIFF_FORMAT_RAW is not default anymore
  Set default diff output format after parsing command line
  Make --raw option available for all diff commands
  Merge with_raw, with_stat and summary variables to output_format
  t4013: add tests for diff/log family output options.

* jc/grepfix:
  git-grep: use a bit more specific error messages.
  git-grep: fix exit code when we use external grep.
  git-grep: fix parsing of pathspec separator '--'

* js/fmt-merge-msg:
  Make git-fmt-merge-msg a builtin

Here's a patch that fixes print-log and diff compatibility with recent
vc versions, such as current GNU Emacs CVS.
Signed-off-by: NVille Skytt,Ad(B <scop@xemacs.org>