Merge branch 'master' into stable-3.2

* master:
  Implement rebase.autostash
  CLI status should support --porcelain
  More helpful InvalidPathException messages (include reason)
  Fix IgnoreRule#isMatch returning wrong result due to missing reset
  Fix exception on conflicts with recursive merge
  Add pgm test for checkout of existing branch with checkout conflict
  Fix broken symbolic links on Cygwin.
  Do not allow non-ff-rebase if there are uncommitted changes
  Manage CheckoutConflictException in pgm
  Fix handling of file/folder conflicts during a checkout
  Mention null return in Javadoc of Config#getString
  Fix applying stash on other commit
  Use static factory methods instead of overloaded constructors
  Break up GCTest to run in parallel
  Modify T0004_PackReaderTest to use existing pack
  Move SampleDataRepositoryTestCase to org.eclipse.jgit.test
  Support running from JARs in JGitTestUtil
  Cache SimpleDateFormat in GitDateParser per locale
  Fix FIXUP error for blank lines in interactive rebase
  Fix parsing Rebase todo lines when commit message is missing
  Add close() method to API
  Update Jetty to 7.6.14.v20131031
  Document that path parameters should use '/' as separator
  Improve Javadoc for typeHint parameter
  Do not update the ref hot bit when checking isIndexLoaded
  Don't delete .idx file if .pack file can't be deleted

Change-Id: I02abfc09000d0fe9bdf4331c65bec7046f586179
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

2 files changed, 30 insertions, 15 deletions

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateParserBadlyFormattedTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateParserBadlyFormattedTest.java
index e0e99a14c2..a6af3a5143 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateParserBadlyFormattedTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateParserBadlyFormattedTest.java
@@ -92,7 +92,8 @@ public class GitDateParserBadlyFormattedTest {
 		Calendar ref = new GregorianCalendar(SystemReader.getInstance()
 				.getTimeZone(), SystemReader.getInstance().getLocale());
 		try {
-			GitDateParser.parse(dateStr, ref);
+			GitDateParser.parse(dateStr, ref, SystemReader.getInstance()
+					.getLocale());
 			fail("The expected ParseException while parsing '" + dateStr
 					+ "' did not occur.");
 		} catch (ParseException e) {
@@ -103,7 +104,8 @@ public class GitDateParserBadlyFormattedTest {
 	@Theory
 	public void badlyFormattedWithoutRef() {
 		try {
-			GitDateParser.parse(dateStr, null);
+			GitDateParser.parse(dateStr, null, SystemReader.getInstance()
+					.getLocale());
 			fail("The expected ParseException while parsing '" + dateStr
 					+ "' did not occur.");
 		} catch (ParseException e) {
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateParserTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateParserTest.java
index 570f4999dd..518ed53fde 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateParserTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateParserTest.java
@@ -72,7 +72,8 @@ public class GitDateParserTest {
 		GregorianCalendar cal = new GregorianCalendar(SystemReader
 				.getInstance().getTimeZone(), SystemReader.getInstance()
 				.getLocale());
-		Date parse = GitDateParser.parse("yesterday", cal);
+		Date parse = GitDateParser.parse("yesterday", cal, SystemReader
+				.getInstance().getLocale());
 		cal.add(Calendar.DATE, -1);
 		cal.set(Calendar.HOUR_OF_DAY, 0);
 		cal.set(Calendar.MINUTE, 0);
@@ -87,7 +88,8 @@ public class GitDateParserTest {
 		GregorianCalendar cal = new GregorianCalendar(SystemReader
 				.getInstance().getTimeZone(), SystemReader.getInstance()
 				.getLocale());
-		Date parse = GitDateParser.parse("never", cal);
+		Date parse = GitDateParser.parse("never", cal, SystemReader
+				.getInstance().getLocale());
 		Assert.assertEquals(GitDateParser.NEVER, parse);
 		parse = GitDateParser.parse("never", null);
 		Assert.assertEquals(GitDateParser.NEVER, parse);
@@ -104,7 +106,8 @@ public class GitDateParserTest {
 				.getLocale());
 		cal.setTime(refDate);
 
-		Date parse = GitDateParser.parse("now", cal);
+		Date parse = GitDateParser.parse("now", cal, SystemReader.getInstance()
+				.getLocale());
 		Assert.assertEquals(refDate, parse);
 		long t1 = SystemReader.getInstance().getCurrentTime();
 		parse = GitDateParser.parse("now", null);
@@ -123,7 +126,8 @@ public class GitDateParserTest {
 				.getLocale());
 		cal.setTime(refDate);
 
-		Date parse = GitDateParser.parse("2 weeks ago", cal);
+		Date parse = GitDateParser.parse("2 weeks ago", cal, SystemReader
+				.getInstance().getLocale());
 		Assert.assertEquals(df.parse("2007-02-07 15:35:00 +0100"), parse);
 	}
 
@@ -138,7 +142,8 @@ public class GitDateParserTest {
 				.getLocale());
 		cal.setTime(refDate);
 
-		Date parse = GitDateParser.parse("2 weeks ago", cal);
+		Date parse = GitDateParser.parse("2 weeks ago", cal, SystemReader.getInstance()
+				.getLocale());
 		Assert.assertEquals(df.parse("2007-02-07 15:35:00 +0100"), parse);
 		parse = GitDateParser.parse("3 days 2 weeks ago", cal);
 		Assert.assertEquals(df.parse("2007-02-04 15:35:00 +0100"), parse);
@@ -151,7 +156,8 @@ public class GitDateParserTest {
 		String dateStr = "2007-02-21 15:35:00 +0100";
 		Date exp = SystemReader.getInstance()
 				.getSimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(dateStr);
-		Date parse = GitDateParser.parse(dateStr, null);
+		Date parse = GitDateParser.parse(dateStr, null, SystemReader
+				.getInstance().getLocale());
 		Assert.assertEquals(exp, parse);
 	}
 
@@ -161,7 +167,8 @@ public class GitDateParserTest {
 		Date exp = SystemReader.getInstance()
 				.getSimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z")
 				.parse(dateStr);
-		Date parse = GitDateParser.parse(dateStr, null);
+		Date parse = GitDateParser.parse(dateStr, null, SystemReader
+				.getInstance().getLocale());
 		Assert.assertEquals(exp, parse);
 	}
 
@@ -170,7 +177,8 @@ public class GitDateParserTest {
 		String dateStr = "2007-02-21";
 		Date exp = SystemReader.getInstance().getSimpleDateFormat("yyyy-MM-dd")
 				.parse(dateStr);
-		Date parse = GitDateParser.parse(dateStr, null);
+		Date parse = GitDateParser.parse(dateStr, null, SystemReader
+				.getInstance().getLocale());
 		Assert.assertEquals(exp, parse);
 	}
 
@@ -179,7 +187,8 @@ public class GitDateParserTest {
 		String dateStr = "2007.02.21";
 		Date exp = SystemReader.getInstance().getSimpleDateFormat("yyyy.MM.dd")
 				.parse(dateStr);
-		Date parse = GitDateParser.parse(dateStr, null);
+		Date parse = GitDateParser.parse(dateStr, null, SystemReader
+				.getInstance().getLocale());
 		Assert.assertEquals(exp, parse);
 	}
 
@@ -188,7 +197,8 @@ public class GitDateParserTest {
 		String dateStr = "02/21/2007";
 		Date exp = SystemReader.getInstance().getSimpleDateFormat("MM/dd/yyyy")
 				.parse(dateStr);
-		Date parse = GitDateParser.parse(dateStr, null);
+		Date parse = GitDateParser.parse(dateStr, null, SystemReader
+				.getInstance().getLocale());
 		Assert.assertEquals(exp, parse);
 	}
 
@@ -197,7 +207,8 @@ public class GitDateParserTest {
 		String dateStr = "21.02.2007";
 		Date exp = SystemReader.getInstance().getSimpleDateFormat("dd.MM.yyyy")
 				.parse(dateStr);
-		Date parse = GitDateParser.parse(dateStr, null);
+		Date parse = GitDateParser.parse(dateStr, null, SystemReader
+				.getInstance().getLocale());
 		Assert.assertEquals(exp, parse);
 	}
 
@@ -207,7 +218,8 @@ public class GitDateParserTest {
 		Date exp = SystemReader.getInstance()
 				.getSimpleDateFormat("EEE MMM dd HH:mm:ss yyyy Z")
 				.parse(dateStr);
-		Date parse = GitDateParser.parse(dateStr, null);
+		Date parse = GitDateParser.parse(dateStr, null, SystemReader
+				.getInstance().getLocale());
 		Assert.assertEquals(exp, parse);
 	}
 
@@ -216,7 +228,8 @@ public class GitDateParserTest {
 		String dateStr = "Wed Feb 21 15:35:00 2007";
 		Date exp = SystemReader.getInstance()
 				.getSimpleDateFormat("EEE MMM dd HH:mm:ss yyyy").parse(dateStr);
-		Date parse = GitDateParser.parse(dateStr, null);
+		Date parse = GitDateParser.parse(dateStr, null, SystemReader
+				.getInstance().getLocale());
 		Assert.assertEquals(exp, parse);
 	}
 }