delta/git.git, branch ss/userdiff-update-csharp-java

userdiff: support Java try keyword

2014-06-02T19:31:38+00:00

try keyword is enhanced in Java 7, see try-with-resources Statement
try (XX yy = new XX()) {
} catch (Exception e){
}

Signed-off-by: Sup Yut Sum 
Signed-off-by: Junio C Hamano

userdiff: support C# async methods and correct C# keywords

2014-06-02T19:09:39+00:00

 - async is in C# 5.0
 - foreach is in C# 1.0
 - instanceof is not a C# keyword (it is in Java). Similar keywords
   are typeof, is, as in C# 1.0
 - default, try are in C# 1.0

Signed-off-by: Sup Yut Sum 
Signed-off-by: Junio C Hamano

Sync with 1.9.4

2014-05-30T17:57:52+00:00

Git 1.9.4

2014-05-30T17:13:41+00:00

This is expected to be the final maintenance release for 1.9 series,
merging the remaining fixes that are relevant and are already in 2.0.

Signed-off-by: Junio C Hamano

t5537: re-drop http tests

2014-05-30T16:46:19+00:00

These were originally removed by 0232852 (t5537: move
http tests out to t5539, 2014-02-13). However, they were
accidentally re-added in 1ddb4d7 (Merge branch
'nd/upload-pack-shallow', 2014-03-21).

This looks like an error in manual conflict resolution.
Here's what happened:

  1. v1.9.0 shipped with the http tests in t5537.

  2. We realized that this caused problems, and built
     0232852 on top to move the tests to their own file.
     This fix made it into v1.9.1.

  3. We later had another fix in nd/upload-pack-shallow that
     also touched t5537. It was built directly on v1.9.0.

When we merged nd/upload-pack-shallow to master, we got a
conflict; it was built on a version with the http tests, but
we had since removed them. The correct resolution was to
drop the http tests and keep the new ones, but instead we
kept everything.

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

Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint

2014-05-28T22:46:36+00:00

* rh/prompt-pcmode-avoid-eval-on-refname:
  git-prompt.sh: don't assume the shell expands the value of PS1

Merge branch 'mw/symlinks' into maint

2014-05-28T22:45:57+00:00

* mw/symlinks:
  setup: fix windows path buffer over-stepping
  setup: don't dereference in-tree symlinks for absolute paths
  setup: add abspath_part_inside_repo() function
  t0060: add tests for prefix_path when path begins with work tree
  t0060: add test for prefix_path when path == work tree
  t0060: add test for prefix_path on symlinks via absolute paths
  t3004: add test for ls-files on symlinks via absolute paths

Git 2.0

2014-05-28T18:04:19+00:00

Update draft release notes to 2.0

2014-05-21T18:50:35+00:00

Hopefully for the last time ;-)

Signed-off-by: Junio C Hamano

Git 2.0-rc4

2014-05-20T21:51:11+00:00

Signed-off-by: Junio C Hamano