From b6db0268928224504e68639a981a724623c7a85b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 17 Jan 2015 13:11:08 -0600 Subject: [PATCH] Fix update_compton_tde script (cherry picked from commit 614d4d45f31fd1d20e89a26448759ab609b9dd5f) --- twin/update_compton_tde | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/twin/update_compton_tde b/twin/update_compton_tde index c6ad83ba8..71d27dea8 100755 --- a/twin/update_compton_tde +++ b/twin/update_compton_tde @@ -34,7 +34,7 @@ git reflog expire --all --expire-unreachable=0 git repack -A -d git prune -cd .. +cd ../.. cd compton-tde git remote add -f compton-update $TDEBASE_WORKING_DIRECTORY/twin/TEMP/compton-tde @@ -44,3 +44,4 @@ bash git read-tree --prefix=twin/compton-tde/ -u compton-update/master git commit -m "Merge compton changes" git pull -s subtree compton-update master +git remote rm compton-update