Uploaded image for project: 'FishEye'
  1. FishEye
  2. FE-6665

Git merge shows files that were not modified directly in that merge

    XMLWordPrintable

Details

    • Bug
    • Resolution: Answered
    • Low
    • N/A
    • 4.0.4, 4.1.1
    • None

    Description

      In repo https://github.com/magento/magento2 , commit 8d9fdb74625ba62c9f9ee0b82b6486f2678674d3 has 2 changed files according to github: 8d9fdb74625ba62c9f9ee0b82b6486f2678674d3.
      When we index that in FishEye with default rename detection ("copies"), we get 52 changed files (see attached 8d9fdb74625ba62c9f9ee0b82b6486f2678674d3.patch):

      When we index that with rename detection turned off ("none"), we get 1 changed file (en_US.csv):

      It seems that only en_US.csv was modified directly in that commit:

      $ git show --no-abbrev --raw -C --pretty=format:"C:%H%nP:%P%nA:%aN%nE:%aE%nR:%cN%nF:%cE%nD:%at%nS:%s%nB:%b%n@@fe_body_end@@" 8d9fdb74625ba62c9f9ee0b82b6486f2678674d3
      C:8d9fdb74625ba62c9f9ee0b82b6486f2678674d3
      P:6474bc8ae9fd94a2ace28d3b3852dfa89d5fccdc c07ffa9bb127e307de85bd102a300e776b2d92f6
      A:Hayder Sharhan
      E:hsharhan@ebay.com
      R:Hayder Sharhan
      F:hsharhan@ebay.com
      D:1469476403
      S:Merge commit 'refs/pull/3633/head' of https://github.com/magento/magento2 into MAGETWO-54587-Public-PR-3633
      B:# Conflicts:
      #       app/code/Magento/Checkout/i18n/en_US.csv
      @@fe_body_end@@
      ::100644 100644 100644 93723e1acfd4f832fe29375ea6fdf080f3fa9b07 0d3bc1df97e343afe6835f3a1e4c62071a4c3346 4a877301d97a680dec78d7198712d71d35102122 MM    app/code/Magento/Checkout/i18n/en_US.csv

      It takes 3 days to index the full repo.

      Attachments

        1. 8d9fdb74625ba62c9f9ee0b82b6486f2678674d3.patch
          186 kB
        2. screenshot-1.png
          screenshot-1.png
          226 kB
        3. screenshot-2.png
          screenshot-2.png
          311 kB

        Issue Links

          Activity

            People

              Unassigned Unassigned
              kcichy Kamil Cichy
              Votes:
              1 Vote for this issue
              Watchers:
              4 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: