motiejus
/
jgit
1
Fork 0
Code Releases Activity

Enhance RepositoryTestCase.commitFile() to work on empty repository 

Change-Id: Ic64497f0eedf8996ba593ca52dc9a040732a5b24
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2013-10-21 01:22:08 +02:00 committed by Gerrit Code Review @ Eclipse.org
parent 7904060a5a
commit e649287502
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java
View File

@ -463,16 +463,25 @@ protected File writeTrashFiles(boolean ensureDistinctTimestamps,
protected RevCommit commitFile(String filename, String contents, String branch) {
try {
Git git = new Git(db);
String originalBranch = git.getRepository().getFullBranch();
if (git.getRepository().getRef(branch) == null)
git.branchCreate().setName(branch).call();
git.checkout().setName(branch).call();
Repository repo = git.getRepository();
String originalBranch = repo.getFullBranch();
boolean empty = repo.resolve(Constants.HEAD) == null;
if (!empty) {
if (repo.getRef(branch) == null)
git.branchCreate().setName(branch).call();
git.checkout().setName(branch).call();
}
writeTrashFile(filename, contents);
git.add().addFilepattern(filename).call();
RevCommit commit = git.commit()
.setMessage(branch + ": " + filename).call();
if (originalBranch != null)
git.checkout().setName(originalBranch).call();
else if (empty)
git.branchCreate().setName(branch).setStartPoint(commit).call();
return commit;
} catch (IOException e) {
throw new RuntimeException(e);