motiejus
/
jgit
1
Fork 0
Code Releases Activity

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

This commit is contained in:
Robin Rosenberg 2013-04-11 02:06:54 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent b5cbfa0146 1bede91db2
commit 4955301fac
2 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashCreateCommandTest.java
View File

@ -155,6 +155,18 @@ private List<DiffEntry> diffIndexAgainstHead(final RevCommit commit)
}
}
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 void indexAdd() throws Exception {
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();

22
org.eclipse.jgit/src/org/eclipse/jgit/api/StashCreateCommand.java
View File

@ -248,13 +248,15 @@ public RevCommit call() throws GitAPIException {
DirCacheIterator.class);
WorkingTreeIterator wtIter = treeWalk.getTree(2,
WorkingTreeIterator.class);
if (headIter != null && indexIter != null && wtIter != null) {
if (!indexIter.getDirCacheEntry().isMerged())
throw new UnmergedPathsException(
new UnmergedPathException(
indexIter.getDirCacheEntry()));
if (wtIter.idEqual(indexIter)
|| wtIter.idEqual(headIter))
if (indexIter != null
&& !indexIter.getDirCacheEntry().isMerged())
throw new UnmergedPathsException(
new UnmergedPathException(
indexIter.getDirCacheEntry()));
if (wtIter != null) {
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 RevCommit call() throws GitAPIException {
in.close();
}
wtEdits.add(new PathEdit(entry) {
public void apply(DirCacheEntry ent) {
ent.copyMetaData(entry);
}
});
} else if (indexIter == null)
wtDeletes.add(treeWalk.getPathString());
else if (wtIter == null && headIter != null)
}
if (wtIter == null && headIter != null)
wtDeletes.add(treeWalk.getPathString());
} while (treeWalk.next());