From: Junio C Hamano Date: Thu, 26 May 2011 17:31:47 +0000 (-0700) Subject: Merge branch 'jc/require-work-tree-exists' X-Git-Tag: v1.7.6-rc0~28 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0a2a5d889dcd0982de31e1d4faee3242854d7b9d?ds=inline;hp=-c Merge branch 'jc/require-work-tree-exists' * jc/require-work-tree-exists: require-work-tree wants more than what its name says --- 0a2a5d889dcd0982de31e1d4faee3242854d7b9d diff --combined Documentation/git-sh-setup.txt index 053df505bc,1f02c4b6ea..27fd8ba854 --- a/Documentation/git-sh-setup.txt +++ b/Documentation/git-sh-setup.txt @@@ -58,14 -58,28 +58,19 @@@ cd_to_toplevel: runs chdir to the toplevel of the working tree. require_work_tree:: - checks if the repository is a bare repository, and dies - if so. Used by scripts that require working tree - (e.g. `checkout`). + checks if the current directory is within the working tree + of the repository, and otherwise dies. + + 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:: outputs code for use with eval to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL and GIT_AUTHOR_DATE variables for a given commit. - -Author ------- -Written by Linus Torvalds - -Documentation --------------- -Documentation by Junio C Hamano and the git-list . - GIT --- Part of the linkgit:git[1] suite