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

[git-rebase-update] Ignore submodules when checking tree status.

Browse Source 
Noticed while working on the infra repos.

Currently `git rebase-update` will do a `git freeze`, then run a
`git status` to make sure the tree is clean... however this status call
currently considers submodule state, which leads to a really confusing
experience. `git rebase-update` is trying to ensure that the FILES on
disk won't be goobered during the rebase process... a process which
essentially ignores submodule state entirely.

This CL just makes `git rebase-update` ignore submodule diffs.

R=aravindvasudev@google.com

Change-Id: I9d546ac9ef0c0ba6ac9918f08fb5163ab18aebb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4680280
Auto-Submit: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Aravind Vasudevan <aravindvasudev@google.com>
Commit-Queue: Aravind Vasudevan <aravindvasudev@google.com>
This commit is contained in:
Robert Iannucci
2023-07-11 23:56:17 +00:00
committed by LUCI CQ
parent 878c74a134
commit c5dab15050
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git_rebase_update.py
View File

@@ -258,7 +258,7 @@ def main(args=None):
os.chdir(git.run('rev-parse', '--show-toplevel'))
if git.current_branch() == 'HEAD':
if git.run('status', '--porcelain'):
if git.run('status', '--porcelain', '--ignore-submodules=all'):
print('Cannot rebase-update with detached head + uncommitted changes.')
return 1
else: