aboutsummaryrefslogtreecommitdiffstats
path: root/tool
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-08-18 16:20:50 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-08-18 16:20:50 +0900
commit666b87049a4195859d25cfc7462e3f6c54c57879 (patch)
treeec5a8e92433f0ce8b4b51b245143722caa03934e /tool
parent0fa04d370c34a57ab9533d9ea88123b00f20943f (diff)
downloadruby-openssl-666b87049a4195859d25cfc7462e3f6c54c57879.tar.gz
tool/sync-with-trunk: ignore openssl.gemspec in Ruby tree
Diffstat (limited to 'tool')
-rwxr-xr-xtool/sync-with-trunk2
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/sync-with-trunk b/tool/sync-with-trunk
index c4fcf1f7..21854a7f 100755
--- a/tool/sync-with-trunk
+++ b/tool/sync-with-trunk
@@ -37,7 +37,7 @@ echo "#### Step 1. Sync '$BRANCH_EXTRACT' with 'ruby/trunk'"
git filter-branch -f --prune-empty --index-filter '
git rm --cached -qr --ignore-unmatch . &&
git reset -q $GIT_COMMIT -- ext/openssl test/openssl sample/openssl &&
- git rm --cached -q --ignore-unmatch ext/openssl/depend
+ git rm --cached -q --ignore-unmatch ext/openssl/depend ext/openssl/openssl.gemspec
' -- $filter_range ||:
echo "## Adjust path"