Reviewers: machenbach,
Description:
Scripts should not care about closed tree when committing.
I just got bitten by this when merging to branch.
[email protected]
BUG=
Please review this at https://codereview.chromium.org/24254005/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+3, -2 lines):
M tools/merge-to-branch.sh
M tools/push-to-trunk.sh
Index: tools/merge-to-branch.sh
diff --git a/tools/merge-to-branch.sh b/tools/merge-to-branch.sh
index
e0011edff02d382559172eee478bd4a9efb48750..6b28b116b7dd480c90f66516607dfd06444e2555
100755
--- a/tools/merge-to-branch.sh
+++ b/tools/merge-to-branch.sh
@@ -229,7 +229,7 @@ if [ $START_STEP -le $CURRENT_STEP ] ; then
git checkout $BRANCHNAME \
|| die "cannot ensure that the current branch is $BRANCHNAME"
wait_for_lgtm
- git cl dcommit || die "failed to commit to $MERGE_TO_BRANCH"
+ git cl dcommit --bypass-hooks || die "failed to commit to
$MERGE_TO_BRANCH"
fi
let CURRENT_STEP+=1
Index: tools/push-to-trunk.sh
diff --git a/tools/push-to-trunk.sh b/tools/push-to-trunk.sh
index
8512d128778d4cad7b26d6c5c5b7bc44f70a7341..8ed7c74ecec118c4a69e9b80de3146d919486d29
100755
--- a/tools/push-to-trunk.sh
+++ b/tools/push-to-trunk.sh
@@ -211,7 +211,8 @@ if [ $START_STEP -le $CURRENT_STEP ] ; then
};
print $0;
}' > "$CHANGELOG_ENTRY_FILE"
- git cl dcommit || die "'git cl dcommit' failed, please try again."
+ git cl dcommit --bypass-hooks \
+ || die "'git cl dcommit' failed, please try again."
fi
let CURRENT_STEP+=1
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
