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
  • #1457
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

Confusing amend commit behaviour

By @ch3cooli on October 14, 2012 01:20 (imported from Google Code)


I do not use "Add" to stage files. I always use the Commit Dialog directly.
But the amend function is confusing when I deselect a file that I have wrongly committed.
For example, I committed 1.txt and 2.txt, but later I do not want to commit 2.txt at the moment so I amend the commit not to include the latest change to 2.txt

What steps will reproduce the problem?

  1. Create a repository
  2. Create 1.txt and commit it (commit 1)
  3. Create 2.txt and commit it (commit 2)
  4. Modify (first time) 1.txt and commit it (commit 3)
  5. Modify (first time) 2.txt and commit it (commit 4)
  6. Modify (second time) 1.txt and 2.txt and commit them (commit 5)
  7. Use Commit Dialog to amend commit: check 1.txt but uncheck 2.txt, then click OK (commit 5')

What is the expected output? What do you see instead?
Expected: 2.txt
(commit 5') has the content of (commit 4),
working dir has the content of (commit 5).
1.txt is fine.
Actual: 2.txt
(commit 5') has the content of (commit 2),
working dir has the content of (commit 5).
1.txt is fine.

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

Please provide any additional information below.
Also, in some situation, if a file is not checked (tracked file), Commit Dialog may make it staged if not staged. I use the command line 'git status' to discover that.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking