Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1665,6 +1665,33 @@ public void testUnknownHashesOnValidNamedRefs()
"Could not find commit '%s' in reference '%s'.", invalidHash, b.getName()));
}

/** Assigning a branch/tag to a fresh main without any commits didn't work in 0.9.2 */
@Test
public void testAssignRefToFreshMain() throws NessieNotFoundException, NessieConflictException {
Reference main = api.getReference().refName("main").get();
// make sure main doesn't have any commits
LogResponse log = api.getCommitLog().refName(main.getName()).get();
assertThat(log.getOperations()).isEmpty();

String testBranch = "testBranch";
api.createReference()
.sourceRefName(main.getName())
.reference(Branch.of(testBranch, null))
.create();
Reference testBranchRef = api.getReference().refName(testBranch).get();
api.assignBranch().hash(testBranchRef.getHash()).branchName(testBranch).assignTo(main).assign();
assertThat(testBranchRef.getHash()).isEqualTo(main.getHash());

String testTag = "testTag";
api.createReference()
.sourceRefName(main.getName())
.reference(Branch.of(testTag, null))
.create();
Reference testTagRef = api.getReference().refName(testTag).get();
api.assignTag().hash(testTagRef.getHash()).tagName(testTag).assignTo(main).assign();
assertThat(testTagRef.getHash()).isEqualTo(main.getHash());
}

void unwrap(Executable exec) throws Throwable {
try {
exec.execute();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
import org.projectnessie.versioned.Key;
import org.projectnessie.versioned.Operation;
import org.projectnessie.versioned.Put;
import org.projectnessie.versioned.Ref;
import org.projectnessie.versioned.ReferenceAlreadyExistsException;
import org.projectnessie.versioned.ReferenceConflictException;
import org.projectnessie.versioned.ReferenceNotFoundException;
import org.projectnessie.versioned.StringStoreWorker;
Expand Down Expand Up @@ -577,4 +579,27 @@ void referenceNotFound(ReferenceNotFoundFunction f) throws Exception {
.isInstanceOf(ReferenceNotFoundException.class)
.hasMessage(f.msg);
}

/** Assigning a branch/tag to a fresh main without any commits didn't work in 0.9.2 */
@Test
public void assignReferenceToFreshMain()
throws ReferenceNotFoundException, ReferenceAlreadyExistsException,
ReferenceConflictException {
BranchName main = BranchName.of("main");
WithHash<Ref> mainRef = store.toRef(main.getName());
assertThat(store().getCommits(main)).isEmpty();
assertThat(store.getNamedRefs())
.extracting(r -> r.getValue().getName())
.containsExactly(main.getName());

BranchName testBranch = BranchName.of("testBranch");
Hash testBranchHash = store.create(testBranch, Optional.empty());
store.assign(testBranch, Optional.of(testBranchHash), mainRef.getHash());
assertThat(store.toRef(testBranch.getName()).getHash()).isEqualTo(mainRef.getHash());

TagName testTag = TagName.of("testTag");
Hash testTagHash = store.create(testTag, Optional.empty());
store.assign(testTag, Optional.of(testTagHash), mainRef.getHash());
assertThat(store.toRef(testTag.getName()).getHash()).isEqualTo(mainRef.getHash());
}
}