Skip to content

Commit 3ee988b

Browse files
committed
fixed "unknown HEAD hash id" on viewing the Git working copy from tortoiseGit
1 parent 62d611d commit 3ee988b

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/main/java/org/scm4j/vcs/GitVCS.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -285,12 +285,14 @@ public String getFileContent(String branchName, String fileRelativePath, String
285285
TreeWalk treeWalk = new TreeWalk(gitRepo)) {
286286

287287
git
288-
.fetch()
289-
.setRefSpecs(new RefSpec("+refs/heads/*:refs/heads/*"))
288+
.pull()
290289
.setCredentialsProvider(credentials)
291290
.call();
291+
292+
// if executed first then version is considered as modified. So have uncommited change: 19.5-SNAPSHOT -> 18.5-SNAPSHOT
292293
git
293-
.pull()
294+
.fetch()
295+
.setRefSpecs(new RefSpec("+refs/heads/*:refs/heads/*"))
294296
.setCredentialsProvider(credentials)
295297
.call();
296298

@@ -754,16 +756,18 @@ public VCSTag createTag(String branchName, String tagName, String tagMessage, St
754756

755757
private void updateLocalTags(Git git) throws Exception {
756758
// need to remove tags from local repo which are removed in origin
759+
757760
git
758-
.fetch()
759-
.setRefSpecs(new RefSpec("+refs/tags/*:refs/tags/*"))
760-
.setRemoveDeletedRefs(true)
761+
.pull()
761762
.setCredentialsProvider(credentials)
762763
.call();
763764
git
764-
.pull()
765+
.fetch()
766+
.setRefSpecs(new RefSpec("+refs/tags/*:refs/tags/*"))
767+
.setRemoveDeletedRefs(true)
765768
.setCredentialsProvider(credentials)
766769
.call();
770+
767771
}
768772

769773

0 commit comments

Comments
 (0)