Skip to content

Commit

Permalink
cross ya fingerz
Browse files Browse the repository at this point in the history
  • Loading branch information
ItamarYuran committed Sep 29, 2024
1 parent 065bfe4 commit 2fe7125
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
11 changes: 9 additions & 2 deletions esti/golden/lakectl_log_no_merges.golden
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@

ID: <COMMIT_ID>
Author: esti
Date: <DATE> <TIME> <TZ>
${MESSAGE}

${SECOND_MESSAGE}

ID: <COMMIT_ID>
Author: esti
Date: <DATE> <TIME> <TZ>

${MESSAGE}

ID: <COMMIT_ID>
Date: <DATE> <TIME> <TZ>
Repository created

Repository created

1 change: 1 addition & 0 deletions esti/lakectl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ func TestLakectlLogNoMergesWithCommitsAndMerges(t *testing.T) {
RunCmdAndVerifySuccessWithFile(t, Lakectl()+" fs upload -s files/ro_1k lakefs://"+repoName+"/"+featureBranch+"/"+filePath2, false, "lakectl_fs_upload", branchVars)
commitMessage = "second commit to feature branch"
branchVars["MESSAGE"] = commitMessage
vars["SECOND_MESSAGE"] = commitMessage
RunCmdAndVerifySuccessWithFile(t, Lakectl()+" commit lakefs://"+repoName+"/"+featureBranch+" -m \""+commitMessage+"\"", false, "lakectl_commit", branchVars)

// merge feature into main
Expand Down

0 comments on commit 2fe7125

Please sign in to comment.