commit c3c0cd4ee46dc16ee54e199c078f4a37845fc4d6
author Haibo Huang <hhb@google.com> Tue Jan 29 15:24:45 2019 -0800
committer Haibo Huang <hhb@google.com> Tue Jan 29 23:34:42 2019 +0000
tree be6d0247cc1a9600f59c93bf0b780b725c3b7b3f
parent 39aaab6a6e058bbc00f9ac9650d9b943d9db3ca6

[Updater] Optionally commit and upload change

Test: ./updater.sh update --force --branch_and_commit --push_change googletest
Test: aosp/889542
Change-Id: I1025e2ded65000ce34e2f02f84052e7871e425d3

git_updater.py

diff --git a/git_updater.py b/git_updater.py
index 81ef922..81ee93d 100644
--- a/git_updater.py
+++ b/git_updater.py
@@ -135,7 +135,8 @@
             print('{} is {} commits behind of {}.'.format(
                 self.merge_from, len(commits), upstream_branch))
 
-        self._write_metadata(self.proj_path)
         print("Running `git merge {merge_branch}`..."
               .format(merge_branch=self.merge_from))
         git_utils.merge(self.proj_path, self.merge_from)
+        self._write_metadata(self.proj_path)
+        git_utils.add_file(self.proj_path, 'METADATA')