Feature #16842

update_weblate_git.py: don't create merge commits when we could fast-forward

Added by intrigeri 2019-06-26 16:45:35 . Updated 2019-07-06 20:43:33 .

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

0%

Feature Branch:
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Translation Platform
Deliverable for:

Description

That is, after having prepared the index for the merge commit, if “git diff —cached remote” is empty, i.e. if we haven’t done anything on top of applying the changes from the remote branch, then drop everything and fast-forward merge.

Goal: don’t create tons of unneeded merge commits in our Git history.

Subtasks

History

#1 Updated by intrigeri 2019-06-27 11:06:20

  • Status changed from Confirmed to Resolved

#2 Updated by intrigeri 2019-06-29 07:11:59

  • Status changed from Resolved to In Progress
  • Assignee set to hans

@hefee, commit:f9969d6568eb2b6796c4641cf85827dea6d81731 looks suspicious. At first glance we should have fast-forwarded, no?

#3 Updated by intrigeri 2019-06-29 07:12:31

  • Assignee changed from hans to hefee

#4 Updated by intrigeri 2019-07-05 15:07:52

Are we 100% done here?

#5 Updated by hefee 2019-07-06 20:43:33

  • Status changed from In Progress to Resolved
  • Assignee deleted (hefee)

@intrigeri: ab0169d1ad230078207961744e36427a87831b82 had not triggered Redmine to be mentioned here. So far let’s close it and hopefully never need to reopen it again ;-D