Merge "Consider working tree changes when stashing newly added files"

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashCreateCommandTest.java

@@ -155,6 +155,18 @@ public class StashCreateCommandTest extends RepositoryTestCase {
 		}
 	}
 
+	private List<DiffEntry> diffIndexAgainstWorking(final RevCommit commit)
+			throws IOException {
+		TreeWalk walk = createTreeWalk();
+		try {
+			walk.addTree(commit.getParent(1).getTree());
+			walk.addTree(commit.getTree());
+			return DiffEntry.scan(walk);
+		} finally {
+			walk.release();
+		}
+	}
+
 	@Test
 	public void noLocalChanges() throws Exception {
 		assertNull(git.stashCreate().call());
@@ -194,6 +206,26 @@ public class StashCreateCommandTest extends RepositoryTestCase {
 		assertEquals("file2.txt", diffs.get(0).getNewPath());
 	}
 
+	@Test
+	public void newFileInIndexThenModifiedInWorkTree() throws Exception {
+		writeTrashFile("file", "content");
+		git.add().addFilepattern("file").call();
+		writeTrashFile("file", "content2");
+		RevCommit stashedWorkTree = Git.wrap(db).stashCreate().call();
+		validateStashedCommit(stashedWorkTree);
+		RevWalk walk = new RevWalk(db);
+		RevCommit stashedIndex = stashedWorkTree.getParent(1);
+		walk.parseBody(stashedIndex);
+		walk.parseBody(stashedIndex.getTree());
+		walk.parseBody(stashedIndex.getParent(0));
+		List<DiffEntry> workTreeStashAgainstWorkTree = diffWorkingAgainstHead(stashedWorkTree);
+		assertEquals(1, workTreeStashAgainstWorkTree.size());
+		List<DiffEntry> workIndexAgainstWorkTree = diffIndexAgainstHead(stashedWorkTree);
+		assertEquals(1, workIndexAgainstWorkTree.size());
+		List<DiffEntry> indexStashAgainstWorkTree = diffIndexAgainstWorking(stashedWorkTree);
+		assertEquals(1, indexStashAgainstWorkTree.size());
+	}
+
 	@Test
 	public void indexDelete() throws Exception {
 		git.rm().addFilepattern("file.txt").call();

org.eclipse.jgit/src/org/eclipse/jgit/api/StashCreateCommand.java

@@ -248,13 +248,15 @@ public class StashCreateCommand extends GitCommand<RevCommit> {
 							DirCacheIterator.class);
 					WorkingTreeIterator wtIter = treeWalk.getTree(2,
 							WorkingTreeIterator.class);
-					if (headIter != null && indexIter != null && wtIter != null) {
+					if (indexIter != null
-						if (!indexIter.getDirCacheEntry().isMerged())
+							&& !indexIter.getDirCacheEntry().isMerged())
-							throw new UnmergedPathsException(
+						throw new UnmergedPathsException(
-									new UnmergedPathException(
+								new UnmergedPathException(
-											indexIter.getDirCacheEntry()));
+										indexIter.getDirCacheEntry()));
-						if (wtIter.idEqual(indexIter)
+					if (wtIter != null) {
-								|| wtIter.idEqual(headIter))
+						if (indexIter != null && wtIter.idEqual(indexIter)
+								|| headIter != null
+								&& wtIter.idEqual(headIter))
 							continue;
 						treeWalk.getObjectId(id, 0);
 						final DirCacheEntry entry = new DirCacheEntry(
@@ -271,14 +273,12 @@ public class StashCreateCommand extends GitCommand<RevCommit> {
 							in.close();
 						}
 						wtEdits.add(new PathEdit(entry) {
-
 							public void apply(DirCacheEntry ent) {
 								ent.copyMetaData(entry);
 							}
 						});
-					} else if (indexIter == null)
+					}
-						wtDeletes.add(treeWalk.getPathString());
+					if (wtIter == null && headIter != null)
-					else if (wtIter == null && headIter != null)
 						wtDeletes.add(treeWalk.getPathString());
 				} while (treeWalk.next());