Uploaded image for project: 'Qt Creator'
  1. Qt Creator
  2. QTCREATORBUG-5347

Git commit editor does not handle staged and unstaged changes in same file correctly

    XMLWordPrintable

Details

    • Bug
    • Resolution: Done
    • P3: Somewhat important
    • Qt Creator 2.7.0
    • Qt Creator 2.3.0
    • Version Control Integration
    • Windows Vista x64
      git version 1.7.4.msysgit.0
    • 76f672989206a7c8d1ccc10fc758b0e42065c6c0

    Description

      1. Open a file which is checked in to a git repository.
      2. Edit and save the file.
      3. Stage this change (git add).
      4. Edit and save the file again.
      5. Open Creator's git commit editor.
        The file will be displayed twice, once with a checked checkbox and once with an unchecked one.
      6. Compare the diffs shown for these two items.
        Both display the same changes. Instead the one should display only the stages changes, the other should display only the unstaged changes.

      Attachments

        Issue Links

          relates to

          Bug - A problem which impairs or prevents the functions of the product. QTCREATORBUG-11074 Misleading texts when having staged and unstaged changes in Git

          • Not Evaluated - Not yet evaluated/prioritized
          • Closed

          Bug - A problem which impairs or prevents the functions of the product. QTCREATORBUG-5945 Git: wrong handling for partially staged file

          • P3: Somewhat important - Should be fixed, but doesn't affect the release in any way.
          • Closed
          For Gerrit Dashboard: QTCREATORBUG-5347
          # Subject Branch Project Status CR V
          44457,2 Git: Pass rows instead of files for diffSelectedFiles master qt-creator/qt-creator Status: MERGED +2 0

          Activity

            People

              orgads Orgad Shaneh
              rlohning Robert Löhning
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Gerrit Reviews

                  There are no open Gerrit changes