delta/git.git, branch jc/diff-filter-negation

diff: deprecate -q option to diff-files

2013-07-19T22:20:47+00:00

This reimplements the ancient "-q" option to "git diff-files" that
was inherited from "show-diff -q" in terms of "--diff-filter=d".  We
will be deprecating the "-q" option, so let's issue a warning when
we do so.

Incidentally this also tentatively fixes "git diff --no-index" to
honor "-q" and hide deletions; the use will get the same warning.

We should remove the support for "-q" in a future version but it is
not that urgent.

Signed-off-by: Junio C Hamano

diff: allow lowercase letter to specify what change class to exclude

2013-07-18T00:17:39+00:00

In order to express "we do not care about deletions", we had to say
"--diff-filter=ACMRTXUB", giving all the possible change class
except for the one we do not want, "D".

This is cumbersome.  As all the change classes are in uppercase,
allow their lowercase counterpart to selectively exclude the class
from the output.  When such a negated change class is in the input,
start the filter option with the full bits set.

This would allow us to express the old "show-diff -q" with
"git diff-files --diff-filter=d".

Signed-off-by: Junio C Hamano

diff: reject unknown change class given to --diff-filter

2013-07-17T23:24:14+00:00

We used to accept "git diff --diff-filter=Q" (note that there is no
such change class 'Q') silently and showed no output (because there
is no such change class 'Q').

Error out when such an input is given.

Signed-off-by: Junio C Hamano

diff: preparse --diff-filter string argument

2013-07-17T23:23:34+00:00

Instead of running strchr() on the list of status characters over
and over again, parse the --diff-filter option into bitfields and
use the bits to see if the change to the filepair matches the status
requested.

Signed-off-by: Junio C Hamano

diff: factor out match_filter()

2013-07-17T22:09:34+00:00

diffcore_apply_filter() checks if a filepair matches the filter
given with the "--diff-filter" option for each input filepairs with
a fairly complex expression in two places.

Create a helper function and call it.

Signed-off-by: Junio C Hamano

diff: pass the whole diff_options to diffcore_apply_filter()

2013-07-17T21:19:24+00:00

The --diff-filter= option given by the user is kept as a
string, and passed to the underlying diffcore_apply_filter()
function as a string for each resulting path we run number of
strchr() to see if each class of change among ACDMRTXUB is meant to
be given.

Change the function signature to pass the whole diff_options, so
that we can pre-parse this string in the next patch.

Signed-off-by: Junio C Hamano

Merge branch 'maint-1.8.1' into maint-1.8.2

2013-07-03T22:26:53+00:00

* maint-1.8.1:
  git-config: update doc for --get with multiple values

git-config: update doc for --get with multiple values

2013-07-03T18:48:15+00:00

Since commit 00b347d (git-config: do not complain about duplicate
entries, 2012-10-23), "git config --get" does not exit with an error if
there are multiple values for the specified key but instead returns the
last value.  Update the documentation to reflect this.

Signed-off-by: John Keeping 
Signed-off-by: Junio C Hamano

t0070 "mktemp to unwritable directory" needs SANITY

2013-06-11T21:23:31+00:00

Use the SANITY prerequisite when testing if a temp file can
be created in a read only directory.
Skip the test under CYGWIN, or skip it under Unix/Linux when
it is run as root.

Signed-off-by: Torsten Bögershausen 
Signed-off-by: Junio C Hamano

pre-push.sample: Make the script executable

2013-06-11T18:22:00+00:00

githooks(5) says that "[...]the .sample files are executable by default"
which was not true.

Signed-off-by: Wieland Hoffmann 
Signed-off-by: Junio C Hamano