Merge branch 'jc/bare'
* jc/bare: Disallow working directory commands in a bare repository. git-fetch: allow updating the current branch in a bare repository. Introduce is_bare_repository() and core.bare configuration variable Move initialization of log_all_ref_updates
This commit is contained in:
commit
e861ce1692
@ -252,9 +252,13 @@ static int create_default_files(const char *git_dir, const char *template_path)
|
||||
}
|
||||
git_config_set("core.filemode", filemode ? "true" : "false");
|
||||
|
||||
/* Enable logAllRefUpdates if a working tree is attached */
|
||||
if (!is_bare_git_dir(git_dir))
|
||||
if (is_bare_repository()) {
|
||||
git_config_set("core.bare", "true");
|
||||
}
|
||||
else {
|
||||
git_config_set("core.bare", "false");
|
||||
git_config_set("core.logallrefupdates", "true");
|
||||
}
|
||||
return reinit;
|
||||
}
|
||||
|
||||
|
3
cache.h
3
cache.h
@ -127,7 +127,8 @@ extern int cache_errno;
|
||||
#define CONFIG_LOCAL_ENVIRONMENT "GIT_CONFIG_LOCAL"
|
||||
#define EXEC_PATH_ENVIRONMENT "GIT_EXEC_PATH"
|
||||
|
||||
extern int is_bare_git_dir(const char *dir);
|
||||
extern int is_bare_repository_cfg;
|
||||
extern int is_bare_repository(void);
|
||||
extern const char *get_git_dir(void);
|
||||
extern char *get_object_directory(void);
|
||||
extern char *get_refs_directory(void);
|
||||
|
5
config.c
5
config.c
@ -269,6 +269,11 @@ int git_default_config(const char *var, const char *value)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!strcmp(var, "core.bare")) {
|
||||
is_bare_repository_cfg = git_config_bool(var, value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!strcmp(var, "core.ignorestat")) {
|
||||
assume_unchanged = git_config_bool(var, value);
|
||||
return 0;
|
||||
|
@ -15,7 +15,8 @@ int use_legacy_headers = 1;
|
||||
int trust_executable_bit = 1;
|
||||
int assume_unchanged;
|
||||
int prefer_symlink_refs;
|
||||
int log_all_ref_updates;
|
||||
int is_bare_repository_cfg = -1; /* unspecified */
|
||||
int log_all_ref_updates = -1; /* unspecified */
|
||||
int warn_ambiguous_refs = 1;
|
||||
int repository_format_version;
|
||||
char *git_commit_encoding;
|
||||
@ -51,12 +52,15 @@ static void setup_git_env(void)
|
||||
git_graft_file = getenv(GRAFT_ENVIRONMENT);
|
||||
if (!git_graft_file)
|
||||
git_graft_file = xstrdup(git_path("info/grafts"));
|
||||
log_all_ref_updates = !is_bare_git_dir(git_dir);
|
||||
}
|
||||
|
||||
int is_bare_git_dir (const char *dir)
|
||||
int is_bare_repository(void)
|
||||
{
|
||||
const char *s;
|
||||
const char *dir, *s;
|
||||
if (0 <= is_bare_repository_cfg)
|
||||
return is_bare_repository_cfg;
|
||||
|
||||
dir = get_git_dir();
|
||||
if (!strcmp(dir, DEFAULT_GIT_DIR_ENVIRONMENT))
|
||||
return 0;
|
||||
s = strrchr(dir, '/');
|
||||
|
@ -7,6 +7,7 @@ USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
|
||||
or, when resuming [--skip | --resolved]'
|
||||
. git-sh-setup
|
||||
set_reflog_action am
|
||||
require_work_tree
|
||||
|
||||
git var GIT_COMMITTER_IDENT >/dev/null || exit
|
||||
|
||||
|
@ -3,6 +3,7 @@
|
||||
USAGE='[-f] [-b <new_branch>] [-m] [<branch>] [<paths>...]'
|
||||
SUBDIRECTORY_OK=Sometimes
|
||||
. git-sh-setup
|
||||
require_work_tree
|
||||
|
||||
old_name=HEAD
|
||||
old=$(git-rev-parse --verify $old_name 2>/dev/null)
|
||||
|
@ -14,6 +14,7 @@ When optional <paths>... arguments are given, the paths
|
||||
affected are further limited to those that match them.'
|
||||
SUBDIRECTORY_OK=Yes
|
||||
. git-sh-setup
|
||||
require_work_tree
|
||||
|
||||
ignored=
|
||||
ignoredonly=
|
||||
|
@ -6,6 +6,7 @@
|
||||
USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-u] [--amend] [-e] [--author <author>] [[-i | -o] <path>...]'
|
||||
SUBDIRECTORY_OK=Yes
|
||||
. git-sh-setup
|
||||
require_work_tree
|
||||
|
||||
git-rev-parse --verify HEAD >/dev/null 2>&1 || initial_commit=t
|
||||
|
||||
|
@ -231,11 +231,12 @@ update_local_ref () {
|
||||
esac
|
||||
}
|
||||
|
||||
case "$update_head_ok" in
|
||||
'')
|
||||
# updating the current HEAD with git-fetch in a bare
|
||||
# repository is always fine.
|
||||
if test -z "$update_head_ok" && test $(is_bare_repository) = false
|
||||
then
|
||||
orig_head=$(git-rev-parse --verify HEAD 2>/dev/null)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# If --tags (and later --heads or --all) is specified, then we are
|
||||
# not talking about defaults stored in Pull: line of remotes or
|
||||
|
@ -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."
|
||||
|
@ -8,6 +8,7 @@ USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <rep
|
||||
LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
|
||||
. git-sh-setup
|
||||
set_reflog_action "pull $*"
|
||||
require_work_tree
|
||||
|
||||
test -z "$(git ls-files -u)" ||
|
||||
die "You are in a middle of conflicted merge."
|
||||
|
@ -29,6 +29,7 @@ Example: git-rebase master~1 topic
|
||||
'
|
||||
. git-sh-setup
|
||||
set_reflog_action rebase
|
||||
require_work_tree
|
||||
|
||||
RESOLVEMSG="
|
||||
When you have resolved this problem run \"git rebase --continue\".
|
||||
|
@ -6,6 +6,7 @@ USAGE='[--mixed | --soft | --hard] [<commit-ish>] [ [--] <paths>...]'
|
||||
SUBDIRECTORY_OK=Yes
|
||||
. git-sh-setup
|
||||
set_reflog_action "reset $*"
|
||||
require_work_tree
|
||||
|
||||
update= reset_type=--mixed
|
||||
unset rev
|
||||
|
@ -19,6 +19,7 @@ case "$0" in
|
||||
die "What are you talking about?" ;;
|
||||
esac
|
||||
. git-sh-setup
|
||||
require_work_tree
|
||||
|
||||
no_commit=
|
||||
while case "$#" in 0) break ;; esac
|
||||
|
@ -28,6 +28,19 @@ set_reflog_action() {
|
||||
fi
|
||||
}
|
||||
|
||||
is_bare_repository () {
|
||||
git-repo-config --bool --get core.bare ||
|
||||
case "$GIT_DIR" in
|
||||
.git | */.git) echo false ;;
|
||||
*) echo true ;;
|
||||
esac
|
||||
}
|
||||
|
||||
require_work_tree () {
|
||||
test $(is_bare_repository) = false ||
|
||||
die "fatal: $0 cannot be used without a working tree."
|
||||
}
|
||||
|
||||
if [ -z "$LONG_USAGE" ]
|
||||
then
|
||||
LONG_USAGE="Usage: $0 $USAGE"
|
||||
|
15
git.c
15
git.c
@ -199,6 +199,11 @@ const char git_version_string[] = GIT_VERSION;
|
||||
|
||||
#define RUN_SETUP (1<<0)
|
||||
#define USE_PAGER (1<<1)
|
||||
/*
|
||||
* require working tree to be present -- anything uses this needs
|
||||
* RUN_SETUP for reading from the configuration file.
|
||||
*/
|
||||
#define NOT_BARE (1<<2)
|
||||
|
||||
static void handle_internal_command(int argc, const char **argv, char **envp)
|
||||
{
|
||||
@ -208,7 +213,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
|
||||
int (*fn)(int, const char **, const char *);
|
||||
int option;
|
||||
} commands[] = {
|
||||
{ "add", cmd_add, RUN_SETUP },
|
||||
{ "add", cmd_add, RUN_SETUP | NOT_BARE },
|
||||
{ "annotate", cmd_annotate, },
|
||||
{ "apply", cmd_apply },
|
||||
{ "archive", cmd_archive },
|
||||
@ -240,7 +245,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
|
||||
{ "mailinfo", cmd_mailinfo },
|
||||
{ "mailsplit", cmd_mailsplit },
|
||||
{ "merge-file", cmd_merge_file },
|
||||
{ "mv", cmd_mv, RUN_SETUP },
|
||||
{ "mv", cmd_mv, RUN_SETUP | NOT_BARE },
|
||||
{ "name-rev", cmd_name_rev, RUN_SETUP },
|
||||
{ "pack-objects", cmd_pack_objects, RUN_SETUP },
|
||||
{ "pickaxe", cmd_blame, RUN_SETUP | USE_PAGER },
|
||||
@ -253,8 +258,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
|
||||
{ "rerere", cmd_rerere, RUN_SETUP },
|
||||
{ "rev-list", cmd_rev_list, RUN_SETUP },
|
||||
{ "rev-parse", cmd_rev_parse, RUN_SETUP },
|
||||
{ "rm", cmd_rm, RUN_SETUP },
|
||||
{ "runstatus", cmd_runstatus, RUN_SETUP },
|
||||
{ "rm", cmd_rm, RUN_SETUP | NOT_BARE },
|
||||
{ "runstatus", cmd_runstatus, RUN_SETUP | NOT_BARE },
|
||||
{ "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER },
|
||||
{ "show-branch", cmd_show_branch, RUN_SETUP },
|
||||
{ "show", cmd_show, RUN_SETUP | USE_PAGER },
|
||||
@ -291,6 +296,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
|
||||
prefix = setup_git_directory();
|
||||
if (p->option & USE_PAGER)
|
||||
setup_pager();
|
||||
if ((p->option & NOT_BARE) && is_bare_repository())
|
||||
die("%s cannot be used in a bare git directory", cmd);
|
||||
trace_argv_printf(argv, argc, "trace: built-in: git");
|
||||
|
||||
exit(p->fn(argc, argv, prefix));
|
||||
|
3
refs.c
3
refs.c
@ -923,6 +923,9 @@ static int log_ref_write(struct ref_lock *lock,
|
||||
char *logrec;
|
||||
const char *committer;
|
||||
|
||||
if (log_all_ref_updates < 0)
|
||||
log_all_ref_updates = !is_bare_repository();
|
||||
|
||||
if (log_all_ref_updates &&
|
||||
(!strncmp(lock->ref_name, "refs/heads/", 11) ||
|
||||
!strncmp(lock->ref_name, "refs/remotes/", 13))) {
|
||||
|
Loading…
Reference in New Issue
Block a user