Don't commit unstaged gitlinks in FREEZE.index during rebase-update.
To avoid having users deal with merge conflicts between unstaged
gitlinks modified before and after a git rebase-update we can just
not commit unstaged gitlinks in our freeze index.
This change results in whatever gitlinks are unstaged before
git rebase-update to be just rebased on top of whatever the latest
gitlinks are from remote.
Bug: 1472148
Change-Id: If7dcb82778a0bdd14c408f0a0287780a7bdc5358
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4771356
Commit-Queue: Joanna Wang <jojwang@chromium.org>
Reviewed-by: Gregory Nisbet <gregorynisbet@google.com>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
diff --git a/git_freezer.py b/git_freezer.py
index afcfb75..e4b1d8b 100755
--- a/git_freezer.py
+++ b/git_freezer.py
@@ -12,7 +12,7 @@
def CMDfreeze(parser, args):
- """Freeze a branch's changes."""
+ """Freeze a branch's changes, excluding unstaged gitlinks changes."""
parser.parse_args(args)
return freeze()