Commit d24813c4 authored by Ian Campbell's avatar Ian Campbell Committed by Junio C Hamano

filter-branch: reset $GIT_* before cleaning up

This is pure code motion to enable a subsequent patch to add code which needs
to happen with the reset $GIT_* but before the temporary directory has been
cleaned up.
Signed-off-by: Ian Campbell's avatarIan Campbell <ijc@hellion.org.uk>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 94c9fd26
......@@ -544,11 +544,6 @@ if [ "$filter_tag_name" ]; then
done
fi
cd "$orig_dir"
rm -rf "$tempdir"
trap - 0
unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE
test -z "$ORIG_GIT_DIR" || {
GIT_DIR="$ORIG_GIT_DIR" && export GIT_DIR
......@@ -562,6 +557,11 @@ test -z "$ORIG_GIT_INDEX_FILE" || {
export GIT_INDEX_FILE
}
cd "$orig_dir"
rm -rf "$tempdir"
trap - 0
if [ "$(is_bare_repository)" = false ]; then
git read-tree -u -m HEAD || exit
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment