RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2024-12-15 11:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

when merging a branch, make sure all filters are applied

Browse Source
This commit is contained in:
Rudolf Polzer 2010-11-03 10:03:07 +01:00
parent a80db75073
commit 465ba00605
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
all
View File

@ -1129,6 +1129,11 @@ case "$cmd" in
reportecho4 "--> test failed, postponed" reportecho4 "--> test failed, postponed"
fi fi
else else
# apply crlf, or other cleanup filters (non-behavioural changes)
git reset --hard
find . -type f -exec touch {} \;
git commit -a --amend -c HEAD
echo "MERGING" echo "MERGING"
case ",`repoflags "$d"`," in case ",`repoflags "$d"`," in
*,svn,*) *,svn,*)