diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Tools/Scripts/update-webkit | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Tools/Scripts/update-webkit')
| -rwxr-xr-x | Tools/Scripts/update-webkit | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Tools/Scripts/update-webkit b/Tools/Scripts/update-webkit index aca56b8..c6e54f3 100755 --- a/Tools/Scripts/update-webkit +++ b/Tools/Scripts/update-webkit @@ -126,5 +126,11 @@ sub runGitUpdate() # Doing a git fetch first allows setups with svn-remote.svn.fetch = trunk:refs/remotes/origin/master # to perform the rebase much much faster. system("git", "fetch") == 0 or die; - system("git", "svn", "rebase") == 0 or die; + if (isGitSVN()) { + system("git", "svn", "rebase") == 0 or die; + } else { + # This will die if branch.$BRANCHNAME.merge isn't set, which is + # almost certainly what we want. + system("git", "pull") == 0 or die; + } } |