1. 02 Jun, 2017 2 commits
  2. 01 Jun, 2017 1 commit
  3. 19 May, 2017 1 commit
  4. 12 May, 2017 1 commit
    • Sean McGivern's avatar
      Fix conflict resolution from corrupted upstream · ad2bfeb8
      Sean McGivern authored
      I don't know why this happens exactly, but given an upstream and fork repository
      from a customer, both of which required GC, resolving conflicts would corrupt
      the fork so badly that it couldn't be cloned.
      
      This isn't a perfect fix for that case, because the MR may still need to be
      merged manually, but it does ensure that the repository is at least usable.
      
      My best guess is that when we generate the index for the conflict
      resolution (which we previously did in the target project), we obtain a
      reference to an OID that doesn't exist in the source, even though we already
      fetch the refs from the target into the source.
      
      Explicitly setting the source project as the place to get the merge index from
      seems to prevent repository corruption in this way.
      ad2bfeb8
  5. 09 May, 2017 2 commits
  6. 06 Apr, 2017 3 commits
  7. 05 Apr, 2017 2 commits
  8. 04 Apr, 2017 3 commits
  9. 24 Mar, 2017 1 commit
  10. 06 Mar, 2017 3 commits
  11. 24 Jan, 2017 1 commit
  12. 18 Jan, 2017 4 commits