diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 19:03:30 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 19:03:30 +0000 |
| commit | 8a3e68a604284f1b20fa9d18633f8f5eb4d573e0 (patch) | |
| tree | be31ee0bcedb161b728b1c6b1fbb160c17840ab4 /tools/git/post-merge | |
| parent | 47115104dc1a6a06b85dc23cc4d5993847ea0fa7 (diff) | |
| download | chromium_src-8a3e68a604284f1b20fa9d18633f8f5eb4d573e0.zip chromium_src-8a3e68a604284f1b20fa9d18633f8f5eb4d573e0.tar.gz chromium_src-8a3e68a604284f1b20fa9d18633f8f5eb4d573e0.tar.bz2 | |
git: add some hooks under tools/git
These hooks will warn you if DEPS changes when you switch branches.
Review URL: http://codereview.chromium.org/650030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/git/post-merge')
| -rwxr-xr-x | tools/git/post-merge | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tools/git/post-merge b/tools/git/post-merge new file mode 100755 index 0000000..8b774ce --- /dev/null +++ b/tools/git/post-merge @@ -0,0 +1,12 @@ +#!/bin/bash +# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +script=$(readlink $0) +source $(dirname ${script:-$0})/git-utils.sh + +if git diff-tree ORIG_HEAD HEAD | grep -qs $'\tDEPS$'; then + warn "DEPS has changed; you probably need to re-run gclient sync." +fi + |