Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
aa2c42d9
Commit
aa2c42d9
authored
Apr 30, 2013
by
Evan Hunt
Browse files
[master] branchsync: don't update EXCLUDED
parent
7105104b
Changes
1
Hide whitespace changes
Inline
Side-by-side
util/branchsync.sh
View file @
aa2c42d9
...
...
@@ -104,6 +104,10 @@ git log $SOURCEBRANCH --reverse --format='%H' $LASTHASH..$SOURCEBRANCH | \
# cherry-pick was clean
# restore the copyrights and api files
git checkout HEAD
--
util/copyrights lib/
*
/api
# don't update the EXCLUDED file
if
[
-n
`
git ls-files EXCLUDED
`
]
;
then
git checkout HEAD
--
EXCLUDED
fi
# note which hash we've merged
savehash branchsync.dat
$SOURCEBRANCH
$hash
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment