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

Merge branch 'jc/require-work-tree-exists'

Browse Source 
* jc/require-work-tree-exists:
  require-work-tree wants more than what its name says
This commit is contained in:
Junio C Hamano
2011-05-26 10:31:47 -07:00
parent 1dcfb2ac65 e2eb527345
commit 0a2a5d889d
2 changed files with 15 additions and 3 deletions
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."