delta/git.git, branch dk/format-patch-ignore-diff-submodule

format-patch: ignore diff.submodule setting

2015-01-08T03:45:05+00:00

diff.submodule when set to log produces output which git-am cannot
handle. Ignore this setting when generating patch output.

Signed-off-by: Doug Kelly 
Signed-off-by: Junio C Hamano

t4255: test am submodule with diff.submodule

2015-01-08T03:45:05+00:00

git am will break when using diff.submodule=log; add some test cases
to illustrate this breakage as simply as possible.  There are
currently two ways this can fail:

* With errors ("unrecognized input"), if only change
* Silently (no submodule change), if other files change

Test for both conditions and ensure without diff.submodule this works.

Helped-by: Eric Sunshine 
Helped-by: Junio C Hamano 
Signed-off-by: Doug Kelly 
Signed-off-by: Junio C Hamano

Merge branch 'maint-2.1' into maint

2015-01-07T21:28:10+00:00

* maint-2.1:
  is_hfs_dotgit: loosen over-eager match of \u{..47}

Merge branch 'maint-2.0' into maint-2.1

2015-01-07T21:27:56+00:00

* maint-2.0:
  is_hfs_dotgit: loosen over-eager match of \u{..47}

Merge branch 'maint-1.9' into maint-2.0

2015-01-07T21:27:19+00:00

* maint-1.9:
  is_hfs_dotgit: loosen over-eager match of \u{..47}

Merge branch 'maint-1.8.5' into maint-1.9

2015-01-07T21:27:13+00:00

* maint-1.8.5:
  is_hfs_dotgit: loosen over-eager match of \u{..47}

Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5

2015-01-07T21:26:35+00:00

* jk/dotgit-case-maint-1.8.5:
  is_hfs_dotgit: loosen over-eager match of \u{..47}

is_hfs_dotgit: loosen over-eager match of \u{..47}

2014-12-29T20:06:27+00:00

Our is_hfs_dotgit function relies on the hackily-implemented
next_hfs_char to give us the next character that an HFS+
filename comparison would look at. It's hacky because it
doesn't implement the full case-folding table of HFS+; it
gives us just enough to see if the path matches ".git".

At the end of next_hfs_char, we use tolower() to convert our
32-bit code point to lowercase. Our tolower() implementation
only takes an 8-bit char, though; it throws away the upper
24 bits. This means we can't have any false negatives for
is_hfs_dotgit. We only care about matching 7-bit ASCII
characters in ".git", and we will correctly process 'G' or
'g'.

However, we _can_ have false positives. Because we throw
away the upper bits, code point \u{0147} (for example) will
look like 'G' and get downcased to 'g'. It's not known
whether a sequence of code points whose truncation ends up
as ".git" is meaningful in any language, but it does not
hurt to be more accurate here. We can just pass out the full
32-bit code point, and compare it manually to the upper and
lowercase characters we care about.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

Prepare for 2.2.2

2014-12-22T20:20:38+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maint

2014-12-22T20:18:35+00:00

The build procedure did not bother fixing perl and python scripts
when NO_PERL and NO_PYTHON build-time configuration changed.

* jk/rebuild-perl-scripts-with-no-perl-seting-change:
  Makefile: have python scripts depend on NO_PYTHON setting
  Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macros
  Makefile: have perl scripts depend on NO_PERL setting