Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f8230b5 authored by Adrian DC's avatar Adrian DC
Browse files

repopick: Warn about empty commits instead of failing 

 * If a cherry-pick results in an empty commit
    (hints about git commit --allow-empty),
    we should warn instead of failing all repopicks

Change-Id: I8410d7d02c4118c8072de609cf3c291e2d8523e6
parent a94cf0c7

build/tools/repopick.py

+9 −2
Original line number Diff line number Diff line
@@ -455,10 +455,17 @@ if __name__ == '__main__': 
                cmd_out = None

            result = subprocess.call(cmd, cwd=project_path, shell=True, stdout=cmd_out, stderr=cmd_out)

            if result != 0:

                if args.reset:

                cmd = ['git diff-index --quiet HEAD --']

                result = subprocess.call(cmd, cwd=project_path, shell=True, stdout=cmd_out, stderr=cmd_out)

                if result == 0:

                    print('WARNING: git command resulted with an empty commit, aborting cherry-pick')

                    cmd = ['git cherry-pick --abort']

                    subprocess.call(cmd, cwd=project_path, shell=True, stdout=cmd_out, stderr=cmd_out)

                elif args.reset:

                    print('ERROR: git command failed, aborting cherry-pick')

                    cmd = ['git cherry-pick --abort']

                    subprocess.call(cmd, cwd=project_path, shell=True, stdout=cmd_out, stderr=cmd_out)

                    sys.exit(result)

                else:

                    print('ERROR: git command failed')

                    sys.exit(result)