mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 18:33:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

require-work-tree wants more than what its name says

Browse Source 
Somebody tried "git pull" from a random place completely outside the work
tree, while exporting GIT_DIR and GIT_WORK_TREE that are set to correct
places, e.g.

    GIT_WORK_TREE=$HOME/git.git
    GIT_DIR=$GIT_WORK_TREE/.git
    export GIT_WORK_TREE GIT_DIR
    cd /tmp
    git pull

At the beginning of git-pull, we check "require-work-tree" and then
"cd-to-toplevel".  I _think_ the original intention when I wrote the
command was "we MUST have a work tree, our $(cwd) might not be at the
top-level directory of it", and no stronger than that.  That check is a
very sensible thing to do before doing cd-to-toplevel.  We check that the
place we would want to go exists, and then go there.

But the implementation of require_work_tree we have today is quite
different.  I don't have energy to dig the history, but currently it says:

    test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true ||
    die "fatal: $0 cannot be used without a working tree."

Which is completely bogus.  Even though we may happen to be just outside
of it right now, we may have a working tree that we can cd_to_toplevel
back to.

Add a function "require_work_tree_exists" that implements the check
this function originally intended (this is so that third-party scripts
that rely on the current behaviour do not have to get broken).

For now, update _no_ in-tree scripts, not even "git pull", as nobody on
the list seems to really care about the above corner case workflow that
triggered this. Scripts can be updated after vetting that they do want the
"we want to make sure the place we are going to go actually exists"
semantics.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-05-04 19:11:18 -07:00
parent 7ed863a85a
commit e2eb527345
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/git-sh-setup.txt
View File

@ -58,9 +58,14 @@ cd_to_toplevel::
runs chdir to the toplevel of the working tree. runs chdir to the toplevel of the working tree.
require_work_tree:: require_work_tree::
checks if the repository is a bare repository, and dies checks if the current directory is within the working tree
if so. Used by scripts that require working tree of the repository, and otherwise dies.
(e.g. `checkout`).
require_work_tree_exists::
checks if the working tree associated with the repository
exists, and otherwise dies. Often done before calling
cd_to_toplevel, which is impossible to do if there is no
working tree.
get_author_ident_from_commit:: get_author_ident_from_commit::
outputs code for use with eval to set the GIT_AUTHOR_NAME, outputs code for use with eval to set the GIT_AUTHOR_NAME,

7
git-sh-setup.sh
View File

@ -140,6 +140,13 @@ cd_to_toplevel () {
} }
} }
require_work_tree_exists () {
if test "z$(git rev-parse --is-bare-repository)" != zfalse
then
die "fatal: $0 cannot be used without a working tree."
fi
}
require_work_tree () { require_work_tree () {
test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true || test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true ||
die "fatal: $0 cannot be used without a working tree." die "fatal: $0 cannot be used without a working tree."