nessie: Merging branches doesn't show any author name

While trying to merge a branch “branchdemo” into “main”, it seems there is no default author name added (not being sent as response)

What happened: Tried to merge a branch into main using the below API and request payload: POST trees/main%4058346f07f41dd2033082cec7be5311010b1644febb19c016777a44c4752cac25/history/merge

{"fromRefName":"branchdemo","fromHash":"621f99726e4263a32eedf80c2270c739054407adf0e4759518fb61670465b3f7"}

Response:

{
    "wasApplied": true,
    "wasSuccessful": true,
    "resultantTargetHash": "521c292e2b39a032fdd57c421d488120b90741c6560e9cebf470fbbb73d13ad2",
    "commonAncestor": "1b91af97348ae86e388e355c144409279bca48698454d8fcda4e197e09aac251",
    "targetBranch": "main",
    "effectiveTargetHash": "58346f07f41dd2033082cec7be5311010b1644febb19c016777a44c4752cac25",
    "expectedHash": "58346f07f41dd2033082cec7be5311010b1644febb19c016777a44c4752cac25",
    "details": []
}

What you expected to happen: Response should contain the author name (defaulted to original user probably)

How to reproduce it (as minimally and precisely as possible):

Create a common commit before creating a branch from main
Create a branch from main
Create a commit in branch (make sure that it has authorname passed to API)
Merge the branch into main

Details:

Nessie server type (docker/built from source) and version: 0.60.1
Client type (Ex: UI/Spark/pynessie …) and version:

About this issue

Original URL
State: closed
Created a year ago
Comments: 23 (12 by maintainers)

Commits related to this issue

Move commit-meta-updater to separate class ... and add some tests Fixes #6956 — committed to snazy/nessie by snazy a year ago
Extract `CommitMetaUpdater` class, fix "set authors on merge" (#7039) Move commit-meta-updater to separate class ... and add some tests Fixes #6956 — committed to projectnessie/nessie by snazy a year ago

Most upvoted comments

Confirmed. Author data appears to be lost on merge:

$ curl http://localhost:19120/api/v2/trees/-/history
{
  "token" : null,
  "logEntries" : [ {
    "commitMeta" : {
      "hash" : "08ab3f436883ced3301b2dc5152547f50f2a3125f42340ae5304a11769f513b3",
      "committer" : "",
      "authors" : [ "" ],
      "allSignedOffBy" : [ ],
      "message" : "Merged 1 commits from dev at d144e6a7f491245101647555d88f7f3a9b705930eaadbae6c817bb7596395d0e into main at 2004873d170e66f3f20da2fdcc8c7f9b50937f021d2fa925095da71c1dec76c5",
      "commitTime" : "2023-06-13T14:33:26.672258Z",
      "authorTime" : "2023-06-13T14:33:26.672258Z",
      "allProperties" : {
        "_merge_parent" : [ "d144e6a7f491245101647555d88f7f3a9b705930eaadbae6c817bb7596395d0e" ]
      },
      "parentCommitHashes" : [ "2004873d170e66f3f20da2fdcc8c7f9b50937f021d2fa925095da71c1dec76c5", "d144e6a7f491245101647555d88f7f3a9b705930eaadbae6c817bb7596395d0e" ]
    },
    "parentCommitHash" : "2004873d170e66f3f20da2fdcc8c7f9b50937f021d2fa925095da71c1dec76c5",
    "operations" : null
  }, {
    "commitMeta" : {
      "hash" : "2004873d170e66f3f20da2fdcc8c7f9b50937f021d2fa925095da71c1dec76c5",
      "committer" : "",
      "authors" : [ "test" ],
      "allSignedOffBy" : [ ],
      "message" : "Create namespace key: f1",
      "commitTime" : "2023-06-13T14:30:23.379376Z",
      "authorTime" : "2023-06-13T14:30:23.379376Z",
      "parentCommitHashes" : [ "2e1cfa82b035c26cbbbdae632cea070514eb8b773f616aaeaf668e2f0be8f10d" ]
    },
    "parentCommitHash" : "2e1cfa82b035c26cbbbdae632cea070514eb8b773f616aaeaf668e2f0be8f10d",
    "operations" : null
  } ],
  "hasMore" : false
}

$ curl http://localhost:19120/api/v2/trees/dev/history
{
  "token" : null,
  "logEntries" : [ {
    "commitMeta" : {
      "hash" : "d144e6a7f491245101647555d88f7f3a9b705930eaadbae6c817bb7596395d0e",
      "committer" : "",
      "authors" : [ "test" ],
      "allSignedOffBy" : [ ],
      "message" : "Create namespace key: f2",
      "commitTime" : "2023-06-13T14:32:17.837472Z",
      "authorTime" : "2023-06-13T14:32:17.837472Z",
      "parentCommitHashes" : [ "2004873d170e66f3f20da2fdcc8c7f9b50937f021d2fa925095da71c1dec76c5" ]
    },
    "parentCommitHash" : "2004873d170e66f3f20da2fdcc8c7f9b50937f021d2fa925095da71c1dec76c5",
    "operations" : null
  }, {
    "commitMeta" : {
      "hash" : "2004873d170e66f3f20da2fdcc8c7f9b50937f021d2fa925095da71c1dec76c5",
      "committer" : "",
      "authors" : [ "test" ],
      "allSignedOffBy" : [ ],
      "message" : "Create namespace key: f1",
      "commitTime" : "2023-06-13T14:30:23.379376Z",
      "authorTime" : "2023-06-13T14:30:23.379376Z",
      "parentCommitHashes" : [ "2e1cfa82b035c26cbbbdae632cea070514eb8b773f616aaeaf668e2f0be8f10d" ]
    },
    "parentCommitHash" : "2e1cfa82b035c26cbbbdae632cea070514eb8b773f616aaeaf668e2f0be8f10d",
    "operations" : null
  } ],
  "hasMore" : false
}

dimas-b on Jun 13, 2023