undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filter-branch: update current branch when rewritten

Browse Source 
Earlier, "git filter-branch --<options> HEAD" would not update the
working tree after rewriting the branch.  This commit fixes it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Johannes Schindelin 2007-10-17 03:23:10 +01:00 committed by Shawn O. Pearce
parent 8ef44519a6
commit 46eb449cbe
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
git-filter-branch.sh
View File

@ -94,6 +94,10 @@ USAGE="[--env-filter <command>] [--tree-filter <command>] \
. git-sh-setup . git-sh-setup
git diff-files --quiet &&
git diff-index --cached --quiet HEAD ||
die "Cannot rewrite branch(es) with a dirty working directory."
tempdir=.git-rewrite tempdir=.git-rewrite
filter_env= filter_env=
filter_tree= filter_tree=
@ -196,6 +200,9 @@ do
esac esac
done < "$tempdir"/backup-refs done < "$tempdir"/backup-refs
ORIG_GIT_DIR="$GIT_DIR"
ORIG_GIT_WORK_TREE="$GIT_WORK_TREE"
ORIG_GIT_INDEX_FILE="$GIT_INDEX_FILE"
export GIT_DIR GIT_WORK_TREE=. export GIT_DIR GIT_WORK_TREE=.
# These refs should be updated if their heads were rewritten # These refs should be updated if their heads were rewritten
@ -413,4 +420,12 @@ echo
test $count -gt 0 && echo "These refs were rewritten:" test $count -gt 0 && echo "These refs were rewritten:"
git show-ref | grep ^"$orig_namespace" git show-ref | grep ^"$orig_namespace"
unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE
test -z "$ORIG_GIT_DIR" || GIT_DIR="$ORIG_GIT_DIR" && export GIT_DIR
test -z "$ORIG_GIT_WORK_TREE" || GIT_WORK_TREE="$ORIG_GIT_WORK_TREE" &&
export GIT_WORK_TREE
test -z "$ORIG_GIT_INDEX_FILE" || GIT_INDEX_FILE="$ORIG_GIT_INDEX_FILE" &&
export GIT_INDEX_FILE
git read-tree -u -m HEAD
exit $ret exit $ret

4
t/t7003-filter-branch.sh
View File

@ -41,7 +41,9 @@ test_expect_success 'rewrite, renaming a specific file' '
' '
test_expect_success 'test that the file was renamed' ' test_expect_success 'test that the file was renamed' '
test d = $(git show HEAD:doh) test d = $(git show HEAD:doh) &&
test -f doh &&
test d = $(cat doh)
' '
git tag oldD HEAD~4 git tag oldD HEAD~4