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

Disallow working directory commands in a bare repository.

Browse Source 
If the user tries to run a porcelainish command which requires
a working directory in a bare repository they may get unexpected
results which are difficult to predict and may differ from command
to command.

Instead we should detect that the current repository is a bare
repository and refuse to run the command there, as there is no
working directory associated with it.

[jc: updated Shawn's original somewhat -- bugs are mine.]

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn O. Pearce
2006-12-30 23:32:38 -05:00
committed by Junio C Hamano
parent 4b441f47ce
commit 7eff28a9b4
11 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
git-merge.sh
View File

@ -7,6 +7,7 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commi
. git-sh-setup
set_reflog_action "merge $*"
require_work_tree
test -z "$(git ls-files -u)" ||
die "You are in a middle of conflicted merge."