InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't commit unstaged gitlinks in FREEZE.index during rebase-update.

Browse Source 
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>
This commit is contained in:
Joanna Wang
2023-08-10 23:28:44 +00:00
committed by LUCI CQ
parent 923bcf8635
commit 2541006811
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git_common.py
View File

@@ -448,7 +448,7 @@ def freeze():
# will be set to true if there are any indexed files to commit.
have_indexed_files = False
for f, s in status():
for f, s in status(ignore_submodules='all'):
if is_unmerged(s):
die("Cannot freeze unmerged changes!")
if s.lstat not in ' ?':