commit ace9e4305af2ef5a26f3da86d45377e4b33982c4
author Andrey Loskutov <loskutov@gmx.de> Wed Apr 05 07:53:24 2017 -0400
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Wed Apr 05 07:53:26 2017 -0400
tree ce21b2fad3f1aecebbe7f06f342d733ba8676aeb
parent db8b2c4288458769c71226b11479940b6723c72d
parent 7476baebfc457e75c984de61dc8ae08a359b52e8

Merge "Fixed NP dereference error reported by ecj in UploadPack.stopBuffering()"

org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java

diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java
index c7e2583..7b7fbcd 100644
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java
@@ -59,6 +59,8 @@
 import org.eclipse.jgit.lib.FileMode;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectLoader;
+import org.eclipse.jgit.revwalk.RevCommit;
+
 
 /**
  * Unix TAR format (ustar + some PAX extensions).
@@ -121,6 +123,12 @@
 			path = path + "/"; //$NON-NLS-1$
 
 		final TarArchiveEntry entry = new TarArchiveEntry(path);
+
+		if (tree instanceof RevCommit) {
+			long t = ((RevCommit) tree).getCommitTime() * 1000L;
+			entry.setModTime(t);
+		}
+
 		if (mode == FileMode.TREE) {
 			out.putArchiveEntry(entry);
 			out.closeArchiveEntry();