Project

General

Profile

Feature #16842

Feature #10034: Translation web platform

Feature #15079: Integrate the platform with our Git and ikiwiki infrastructure

Feature #15082: Have the Weblate Git communicate with our main Git repository

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

Added by intrigeri 5 months ago. Updated 4 months ago.

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

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.

History

#1 Updated by intrigeri 5 months ago

  • Status changed from Confirmed to Resolved

#2 Updated by intrigeri 5 months ago

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

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

#3 Updated by intrigeri 5 months ago

  • Assignee changed from hans to hefee

#4 Updated by intrigeri 4 months ago

Are we 100% done here?

#5 Updated by hefee 4 months ago

  • 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

Also available in: Atom PDF