Skip to content

Commit

Permalink
Fix property names, no quotes needed.
Browse files Browse the repository at this point in the history
  • Loading branch information
amolenaar committed Jan 18, 2016
1 parent 5686202 commit d749324
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
@@ -1,3 +1,3 @@
version=1.0.1
group = "org.fitnesse.plugins"
archivesBaseName = "fitnesse-git-plugin"
group = org.fitnesse.plugins
archivesBaseName = fitnesse-git-plugin
12 changes: 8 additions & 4 deletions src/fitnesse/wiki/fs/GitFileVersionsController.java
Expand Up @@ -101,7 +101,11 @@ public Collection<? extends VersionInfo> history(final File... files) {
return history(files[0], new LogCommandSpec() {
public LogCommand specify(LogCommand log, Repository repository) {
for (File file : files) {
log.addPath(getPath(file, repository));
try {
log.addPath(getPath(file, repository));
} catch (IOException e) {
throw new RuntimeException(e);
}
}
return log.setMaxCount(historyDepth);
}
Expand Down Expand Up @@ -191,9 +195,9 @@ private void commit(Git git, String message, String author) throws GitAPIExcepti
}

// Paths we feed to Git should be relative to the git repo. Absolute paths are not appreciated.
private String getPath(File file, Repository repository) {
String workTreePath = repository.getWorkTree().getAbsolutePath();
String pagePath = file.getAbsolutePath();
private String getPath(File file, Repository repository) throws IOException {
String workTreePath = repository.getWorkTree().getCanonicalPath();
String pagePath = file.getCanonicalPath();

assert pagePath.startsWith(workTreePath);

Expand Down

0 comments on commit d749324

Please sign in to comment.