mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1

Browse Source 
* ek/maint-1.6.1-filter-branch-bare:
  filter-branch: Fix fatal error on bare repositories
This commit is contained in:
Junio C Hamano
2009-03-12 21:45:21 -07:00
parent d9b04430d2 9273b56278
commit 592ebd087a
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
git-filter-branch.sh
View File

@ -442,19 +442,20 @@ rm -rf "$tempdir"
trap - 0 trap - 0
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
}
if [ "$(is_bare_repository)" = false ]; then if [ "$(is_bare_repository)" = false ]; then
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 git read-tree -u -m HEAD
fi fi

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

@ -39,7 +39,9 @@ test_expect_success 'result is really identical' '
' '
test_expect_success 'rewrite bare repository identically' ' test_expect_success 'rewrite bare repository identically' '
(git config core.bare true && cd .git && git filter-branch branch) (git config core.bare true && cd .git &&
git filter-branch branch > filter-output 2>&1 &&
! fgrep fatal filter-output)
' '
git config core.bare false git config core.bare false
test_expect_success 'result is really identical' ' test_expect_success 'result is really identical' '