зеркало из https://github.com/microsoft/git.git
expire_reflog(): move dry_run to flags argument
The policy objects don't care about "--dry-run". So move it to expire_reflog()'s flags parameter. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
aba56c89b2
Коммит
98f31d8589
|
@ -20,9 +20,12 @@ static const char reflog_delete_usage[] =
|
||||||
static unsigned long default_reflog_expire;
|
static unsigned long default_reflog_expire;
|
||||||
static unsigned long default_reflog_expire_unreachable;
|
static unsigned long default_reflog_expire_unreachable;
|
||||||
|
|
||||||
|
enum expire_reflog_flags {
|
||||||
|
EXPIRE_REFLOGS_DRY_RUN = 1 << 0
|
||||||
|
};
|
||||||
|
|
||||||
struct cmd_reflog_expire_cb {
|
struct cmd_reflog_expire_cb {
|
||||||
struct rev_info revs;
|
struct rev_info revs;
|
||||||
int dry_run;
|
|
||||||
int stalefix;
|
int stalefix;
|
||||||
int rewrite;
|
int rewrite;
|
||||||
int updateref;
|
int updateref;
|
||||||
|
@ -438,7 +441,7 @@ static int expire_reflog(const char *refname, const unsigned char *sha1,
|
||||||
}
|
}
|
||||||
|
|
||||||
log_file = git_pathdup("logs/%s", refname);
|
log_file = git_pathdup("logs/%s", refname);
|
||||||
if (!cmd->dry_run) {
|
if (!(flags & EXPIRE_REFLOGS_DRY_RUN)) {
|
||||||
/*
|
/*
|
||||||
* Even though holding $GIT_DIR/logs/$reflog.lock has
|
* Even though holding $GIT_DIR/logs/$reflog.lock has
|
||||||
* no locking implications, we use the lock_file
|
* no locking implications, we use the lock_file
|
||||||
|
@ -467,7 +470,7 @@ static int expire_reflog(const char *refname, const unsigned char *sha1,
|
||||||
for_each_reflog_ent(refname, expire_reflog_ent, &cb);
|
for_each_reflog_ent(refname, expire_reflog_ent, &cb);
|
||||||
reflog_expiry_cleanup(&cb);
|
reflog_expiry_cleanup(&cb);
|
||||||
|
|
||||||
if (cb.newlog) {
|
if (!(flags & EXPIRE_REFLOGS_DRY_RUN)) {
|
||||||
if (close_lock_file(&reflog_lock)) {
|
if (close_lock_file(&reflog_lock)) {
|
||||||
status |= error("couldn't write %s: %s", log_file,
|
status |= error("couldn't write %s: %s", log_file,
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
|
@ -658,7 +661,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
|
||||||
for (i = 1; i < argc; i++) {
|
for (i = 1; i < argc; i++) {
|
||||||
const char *arg = argv[i];
|
const char *arg = argv[i];
|
||||||
if (!strcmp(arg, "--dry-run") || !strcmp(arg, "-n"))
|
if (!strcmp(arg, "--dry-run") || !strcmp(arg, "-n"))
|
||||||
cb.dry_run = 1;
|
flags |= EXPIRE_REFLOGS_DRY_RUN;
|
||||||
else if (starts_with(arg, "--expire=")) {
|
else if (starts_with(arg, "--expire=")) {
|
||||||
if (parse_expiry_date(arg + 9, &cb.expire_total))
|
if (parse_expiry_date(arg + 9, &cb.expire_total))
|
||||||
die(_("'%s' is not a valid timestamp"), arg);
|
die(_("'%s' is not a valid timestamp"), arg);
|
||||||
|
@ -752,7 +755,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
|
||||||
for (i = 1; i < argc; i++) {
|
for (i = 1; i < argc; i++) {
|
||||||
const char *arg = argv[i];
|
const char *arg = argv[i];
|
||||||
if (!strcmp(arg, "--dry-run") || !strcmp(arg, "-n"))
|
if (!strcmp(arg, "--dry-run") || !strcmp(arg, "-n"))
|
||||||
cb.dry_run = 1;
|
flags |= EXPIRE_REFLOGS_DRY_RUN;
|
||||||
else if (!strcmp(arg, "--rewrite"))
|
else if (!strcmp(arg, "--rewrite"))
|
||||||
cb.rewrite = 1;
|
cb.rewrite = 1;
|
||||||
else if (!strcmp(arg, "--updateref"))
|
else if (!strcmp(arg, "--updateref"))
|
||||||
|
|
Загрузка…
Ссылка в новой задаче