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

depot_tools: Use git-checkout instead of git-rebase.

Browse Source 
Changes like crrev.com/c/1752507, where a file that was previously in
.gitignore becomes part of the repo, makes update_depot_tools fail
to rebase.

Use git checkout origin/master instead.

Bug: 996359
Change-Id: Ib1a43b8842cebce96ab1fabaedc8e5653b9a708e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1764708
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
This commit is contained in:
Edward Lemur
2019-08-22 17:57:25 +00:00
committed by Commit Bot
parent 4c55b35558
commit 7f90416c08
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
update_depot_tools
View File

@@ -101,12 +101,11 @@ function update_git_repo {
git fetch -q origin &> /dev/null
local REBASE_TXT STATUS
REBASE_TXT=$(git rebase -q origin/master 2>&1)
CHECKOUT_TXT=$(git checkout origin/master 2>&1)
STATUS=$?
if [[ $STATUS -ne 0 ]]; then
echo "depot_tools update failed. Conflict in $base_dir" >&2
echo "$REBASE_TXT" >&2
git rebase --abort 2> /dev/null
echo "$CHECKOUT_TXT" >&2
fi
return $STATUS
}