Skip to content

dolthub/dolt#9582 - Fix cherry-pick timestamp preservation #9637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elianddb merged 2 commits into from
Aug 7, 2025
Merged

dolthub/dolt#9582 - Fix cherry-pick timestamp preservation #9637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cda66d3
add carry timestamp and bats
elianddb Aug 6, 2025
89818f0
use dolt commit time env var
elianddb Aug 7, 2025
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
2 changes: 1 addition & 1 deletion go/libraries/doltcore/cherry_pick/cherry_pick.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func CreateCommitStagedPropsFromCherryPickOptions(ctx *sql.Context, options Cher
}

commitProps := actions.CommitStagedProps{
Date: ctx.QueryTime(),
Date: originalMeta.Time(),
Name: originalMeta.Name,
Email: originalMeta.Email,
}
Expand Down
12 changes: 8 additions & 4 deletions integration-tests/bats/cherry-pick.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,29 +616,33 @@ teardown() {
[[ $output =~ "error: cannot merge because table test has different primary keys" ]] || false
}

@test "cherry-pick: author preserved during cherry-pick" {
@test "cherry-pick: author and timestamp preserved during cherry-pick" {
dolt checkout branch1
dolt sql -q "INSERT INTO test VALUES (99, 'auth')"
dolt add .
dolt commit --author="Original Author <original@example.com>" -m "commit with specific author"

# Create commit with specific author and timestamp
DOLT_AUTHOR_DATE='2023-09-26T01:23:45' dolt commit --author="Original Author <original@example.com>" -m "commit with specific author"
COMMIT_HASH=$(get_head_commit)

run dolt log -n 1
[ $status -eq 0 ]
[[ "$output" =~ "Original Author <original@example.com>" ]] || false

dolt checkout main

run dolt cherry-pick $COMMIT_HASH
[ $status -eq 0 ]

run dolt log -n 1
[ $status -eq 0 ]
[[ "$output" =~ "Original Author <original@example.com>" ]] || false

# Verify dolt_log table also shows correct author
run dolt sql -q "SELECT committer, email FROM dolt_log WHERE message = 'commit with specific author'" -r csv
# Verify dolt_log table shows correct author and preserved timestamp
run dolt sql -q "SELECT committer, email, date FROM dolt_log WHERE message = 'commit with specific author'" -r csv
[ $status -eq 0 ]
[[ "$output" =~ "Original Author,original@example.com" ]] || false
[[ "$output" =~ "2023-09-26 01:23:45" ]] || false
}

@test "cherry-pick: multiple authors preserved in sequence with merge workflow" {
Expand Down
Loading