Uploaded image for project: 'Bitbucket Server'
  1. Bitbucket Server
  2. BSERV-7097

Diff is incorrect when source branch modified before destination branch

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Closed (View Workflow)
    • Priority: Low
    • Resolution: Answered
    • Affects Version/s: 3.6.1
    • Fix Version/s: None
    • Labels:
      None
    • Environment:

      Stash 3.6.1 linux x86_64 on both:

      • Fedora 20, git 2.1.0, JDK8
      • RHEL6, git 2.2.2, JDK7

      Description

      If a portion of a file is independently deleted in two branches, then sometimes the diff view is incorrect.

      To reproduce, create a new repo in stash, then run the attached shell script (changing the remote URL if needed), and view the diff between master and branch:

      http://localhost:7990/stash/projects/TEST/repos/diffbug/compare/diff?targetBranch=refs%2Fheads%2Fmaster&sourceBranch=refs%2Fheads%2Fbranch

      Expected results: the diff view shows the first line changed from 'MASTER START' to 'BRANCH START', like 'git diff master branch' shows:

      $ git diff master branch
      diff --git a/test.txt b/test.txt
      index 9199536..91ad9bb 100644
      — a/test.txt
      +++ b/test.txt
      @@ -1,3 +1,3 @@
      -MASTER START
      +BRANCH START

      END

      Actual results: the diff view shows the 'MIDDLE' section having been deleted as well as the first line changing

      Reversing the source/dest branches (ie http://localhost:7990/stash/projects/TEST/repos/diffbug/compare/diff?targetBranch=refs%2Fheads%2Fbranch) shows the ONLY the middle section changing WITHOUT the first line changing.

      This affects both the side-by-side diff and the unified Once a pull request is made, then the diff in the PR is correct.

        Attachments

        1. stash-diffbug.sh
          0.4 kB
        2. stash-diffbug.sh
          0.4 kB

          Issue Links

            Activity

              People

              Assignee:
              Unassigned Unassigned
              Reporter:
              bradley.baetz Bradley Baetz
              Votes:
              0 Vote for this issue
              Watchers:
              8 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: