From baf7a81dceaa68d634a96b4833bec2fc6999b5ce Mon Sep 17 00:00:00 2001
From: Egor Suvorov <egor@zenith.tech>
Date: Thu, 19 May 2022 13:01:03 +0200
Subject: [PATCH] git-upload: pass committer to 'git rebase' (fix #1749)
 (#1750)

No committer was specified, which resulted in failing `git rebase` if
the branch is not up-to-date.
---
 scripts/git-upload | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/git-upload b/scripts/git-upload
index 4649f6998d..a53987894a 100755
--- a/scripts/git-upload
+++ b/scripts/git-upload
@@ -80,12 +80,14 @@ class GitRepo:
                 print('No changes detected, quitting')
                 return
 
-            run([
+            git_with_user = [
                 'git',
                 '-c',
                 'user.name=vipvap',
                 '-c',
                 'user.email=vipvap@zenith.tech',
+            ]
+            run(git_with_user + [
                 'commit',
                 '--author="vipvap <vipvap@zenith.tech>"',
                 f'--message={message}',
@@ -94,7 +96,7 @@ class GitRepo:
             for _ in range(5):
                 try:
                     run(['git', 'fetch', 'origin', branch])
-                    run(['git', 'rebase', f'origin/{branch}'])
+                    run(git_with_user + ['rebase', f'origin/{branch}'])
                     run(['git', 'push', 'origin', branch])
                     return