Skip to content

Commit bbf8e1a

Browse files
author
TheSnoozer
committed
The native git implementation should use the dotDirectory we provide with the configuration and not the project root dir, that feels inconsistent
1 parent 89ccd08 commit bbf8e1a

File tree

2 files changed

+14
-32
lines changed

2 files changed

+14
-32
lines changed

src/main/java/pl/project13/maven/git/Externalize.java

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,6 @@ protected interface Callback {
172172
* The root directory of the repository we want to check.
173173
*/
174174
File getDotGitDirectory();
175-
176-
/**
177-
* The project root directory.
178-
*/
179-
@Deprecated
180-
File getProjectBaseDir() throws IOException;
181175
}
182176

183177
protected static void loadBuildData(@Nonnull Callback cb, @Nonnull Properties properties) throws GitCommitIdExecutionException {
@@ -204,27 +198,20 @@ protected static void loadGitData(@Nonnull Callback cb, @Nonnull Properties prop
204198
}
205199

206200
private static void loadGitDataWithNativeGit(@Nonnull Callback cb, @Nonnull Properties properties) throws GitCommitIdExecutionException {
207-
try {
208-
// TODO: Why does this not use dotGitDir.parent or something?
209-
final File basedir = cb.getProjectBaseDir();
210-
211-
GitDataProvider nativeGitProvider = NativeGitProvider
212-
.on(basedir, cb.getNativeGitTimeoutInMs(), cb.getLoggerBridge())
213-
.setPrefixDot(cb.getPrefixDot())
214-
.setAbbrevLength(cb.getAbbrevLength())
215-
.setDateFormat(cb.getDateFormat())
216-
.setDateFormatTimeZone(cb.getDateFormatTimeZone())
217-
.setGitDescribe(cb.getGitDescribe())
218-
.setCommitIdGenerationMode(cb.getCommitIdGenerationMode())
219-
.setUseBranchNameFromBuildEnvironment(cb.getUseBranchNameFromBuildEnvironment())
220-
.setExcludeProperties(cb.getExcludeProperties())
221-
.setIncludeOnlyProperties(cb.getIncludeOnlyProperties())
222-
.setOffline(cb.isOffline());
223-
224-
nativeGitProvider.loadGitData(cb.getEvaluateOnCommit(), properties);
225-
} catch (IOException e) {
226-
throw new GitCommitIdExecutionException(e);
227-
}
201+
GitDataProvider nativeGitProvider = NativeGitProvider
202+
.on(cb.getDotGitDirectory().getParentFile(), cb.getNativeGitTimeoutInMs(), cb.getLoggerBridge())
203+
.setPrefixDot(cb.getPrefixDot())
204+
.setAbbrevLength(cb.getAbbrevLength())
205+
.setDateFormat(cb.getDateFormat())
206+
.setDateFormatTimeZone(cb.getDateFormatTimeZone())
207+
.setGitDescribe(cb.getGitDescribe())
208+
.setCommitIdGenerationMode(cb.getCommitIdGenerationMode())
209+
.setUseBranchNameFromBuildEnvironment(cb.getUseBranchNameFromBuildEnvironment())
210+
.setExcludeProperties(cb.getExcludeProperties())
211+
.setIncludeOnlyProperties(cb.getIncludeOnlyProperties())
212+
.setOffline(cb.isOffline());
213+
214+
nativeGitProvider.loadGitData(cb.getEvaluateOnCommit(), properties);
228215
}
229216

230217
private static void loadGitDataWithJGit(@Nonnull Callback cb, @Nonnull Properties properties) throws GitCommitIdExecutionException {

src/main/java/pl/project13/maven/git/GitCommitIdMojo.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -611,11 +611,6 @@ public String getEvaluateOnCommit() {
611611
public File getDotGitDirectory() {
612612
return dotGitDirectory;
613613
}
614-
615-
@Override
616-
public File getProjectBaseDir() throws IOException {
617-
return project.getBasedir().getCanonicalFile();
618-
}
619614
};
620615

621616
Externalize.loadGitData(cb, properties);

0 commit comments

Comments
 (0)