Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 380
    • Issues 380
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 16
    • Merge requests 16
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #3945
Closed
Open
Issue created Jul 26, 2022 by Trivalik@trivalik

"Combine to one commit" broken

What steps will reproduce the problem?

I have one commit which has 420 files changed for multiple branches. I do regularya cherry pick on it with a smaller commit contains a range from 1 to 3 files.

  1. commit (NOTE: 1 file changed here)
    image
  2. select two commits in row ("All Branches" checkhox doesn't matter happens for both checked and unchecked)
  3. right click on commit and "Combine to one commit"
    image
  4. the opening window show the 42x files of both commits and slim message to contains only message of first big commit
  5. press "Commit"
  6. Now in the opening processing window of what git has done is just the file count of the small commit visible (1 to 3) (this is randomly happen only)
    image
  7. after confirm this window, the log window refresh and I see two commits with same commit message
    image

What is the expected output? What do you see instead?

both commits are combined and processing window shows a bigger file count

What version of TortoiseGit and Git are you using? On what operating system?

I tried 2.24.0 to 2.37.1 "git for windows" as git. I use TortoiseGit 2.13.0.1.

Please provide any additional information below.

See in video: combineCommitBug

Edited Aug 02, 2022 by Yue Lin Ho
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking