Skip to content

Change .gitmodules to point to our Blink repo, disable the pre-commit… #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gdmclz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change .gitmodules to point to our Blink repo, disable the pre-commit… #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
os = ios
[submodule "third_party/WebKit"]
path = third_party/WebKit
url = https://chromium.googlesource.com/chromium/blink.git
url = git@github.com:ChromiumWebApps/blink.git
os = all
[submodule "third_party/android_tools"]
path = third_party/android_tools
Expand Down
14 changes: 7 additions & 7 deletions build/git-hooks/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ EOF
exit 1
fi

if test "$(git diff-index --cached HEAD .gitmodules)"; then
cat <<EOF 1>&2
You are trying to commit a change to .gitmodules. That is not allowed.
To make changes to submodule names/paths, edit DEPS.
EOF
exit 1
fi
#if test "$(git diff-index --cached HEAD .gitmodules)"; then
# cat <<EOF 1>&2
#You are trying to commit a change to .gitmodules. That is not allowed.
#To make changes to submodule names/paths, edit DEPS.
#EOF
# exit 1
#fi

exit 0