Bug #16862

GitPython incorrectly populates blobs for submodule changes, when using diff

Added by hefee 2019-07-08 23:33:44 . Updated 2020-04-22 16:01:05 .

Status:
Confirmed
Priority:
Normal
Assignee:
Category:
Target version:
Start date:
Due date:
% Done:

0%

Feature Branch:
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Translation Platform
Deliverable for:

Description

Our weblate_update_git.py script implements an own merge strategy and so it needs to access the elements within the diff, to decide how to merge. Currently we need a workaround for submodule changes, done by remote (main git).

The upstream issue is tracked at: https://github.com/gitpython-developers/GitPython/issues/891

If that is solved, we can remove the workaround.

For puppet-tails@a36884e96ce36d3c5e1c348d9813fffce46e4350

<code class="python">
480             if not isWikiPo(path):
481                 try:
482                     blob = i.b_blob
483                     index.updateFile(path, blob)
484                 except ValueError:
                        [...]
</code>

Subtasks

History

#1 Updated by Anonymous 2019-09-13 09:55:57

  • Subject changed from GitPython poulates incorectly blobs for submodule changes, when using diff to GitPython poulates incorrectly blobs for submodule changes, when using diff

#2 Updated by intrigeri 2019-09-13 09:56:13

  • Subject changed from GitPython poulates incorrectly blobs for submodule changes, when using diff to GitPython populates incorrectly blobs for submodule changes, when using diff

#3 Updated by Anonymous 2019-09-13 09:57:20

  • Subject changed from GitPython populates incorrectly blobs for submodule changes, when using diff to GitPython incorrectly populates blobs for submodule changes, when using diff

#4 Updated by intrigeri 2019-09-13 09:58:14

  • Type of work changed from Communicate to Wait

#5 Updated by Anonymous 2019-09-13 09:58:50

  • Description updated
  • Type of work changed from Wait to Communicate

#6 Updated by hefee 2020-04-22 16:01:05

  • Assignee deleted (hefee)
  • Type of work changed from Communicate to Code

It is now properly fixed by upstream within 3.0.5. So we can look into the scripts again and get rid of the workaround.