In a handful places, we use C99 structure and array
initializers, which some compilers do not support.

This can be handy when you are trying to compile GIT on a
Solaris system that has an older C compiler, for example.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

* jc/rename:
  diffcore-rename: try matching up renames without populating filespec first.

* jc/grep:
  git-grep: boolean expression on pattern matching.

* jc/mailinfo:
  mailinfo: assume input is latin-1 on the header as we do for the body

* ew/diff:
  templates/hooks--update: replace diffstat calls with git diff --stat
  diff: do not use configuration magic at the core-level
  Update diff-options and config documentation.
  diff.c: --no-color to defeat diff.color configuration.
  diff.c: respect diff.renames config option

* 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>

Signed-off-by: NEric Wong <normalperson@yhbt.net>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The Porcelainish has become so much usable as the UI that there
is not much reason people should be using the core programs by
hand anymore.  At this point we are better off making the
behaviour of the core programs predictable by keeping them
unaffected by the configuration variables.  Otherwise they will
become very hard to use as reliable building blocks.

For example, "git-commit -a" internally uses git-diff-files to
figure out the set of paths that need to be updated in the
index, and we should never allow diff.renames that happens to be
in the configuration to interfere (or slow down the process).

The UI level configuration such as showing renamed diff and
coloring are still honored by the Porcelainish ("git log" family
and "git diff"), but not by the core anymore.
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: NJunio C Hamano <junkio@cox.net>

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

diff.renames is mentioned several times in the documentation,
but to my surprise it didn't do anything before this patch.

Also add the --no-renames option to override this from the
command-line.
Signed-off-by: NEric Wong <normalperson@yhbt.net>
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>

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>