diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-10 13:52:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-10 13:52:40 -0700 |
| commit | 82b7e651990dce7016a903cb020e3dc0eba2ecfe (patch) | |
| tree | 565e55c4f99224f95f1c6172c26f3415a103638a /builtin | |
| parent | 2d659f7d6e6071701a4f532487edf139b3e1fa9d (diff) | |
| parent | 423c688b855c328ecda0b6a79c4b1af78d09a10c (diff) | |
| download | git-82b7e651990dce7016a903cb020e3dc0eba2ecfe.tar.gz | |
Merge branch 'mh/expire-updateref-fixes'
Various issues around "reflog expire", e.g. using --updateref when
expiring a reflog for a symbolic reference, have been corrected
and/or made saner.
* mh/expire-updateref-fixes:
reflog_expire(): never update a reference to null_sha1
reflog_expire(): ignore --updateref for symbolic references
reflog: improve and update documentation
struct ref_lock: delete the force_write member
lock_ref_sha1_basic(): do not set force_write for missing references
write_ref_sha1(): move write elision test to callers
write_ref_sha1(): remove check for lock == NULL
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/reflog.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/builtin/reflog.c b/builtin/reflog.c index 49c64f96d8..8182b648b9 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -8,14 +8,11 @@ #include "revision.h" #include "reachable.h" -/* - * reflog expire - */ - +/* NEEDSWORK: switch to using parse_options */ static const char reflog_expire_usage[] = -"git reflog expire [--verbose] [--dry-run] [--stale-fix] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>..."; +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <refs>..."; static const char reflog_delete_usage[] = -"git reflog delete [--verbose] [--dry-run] [--rewrite] [--updateref] <refs>..."; +"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <refs>..."; static unsigned long default_reflog_expire; static unsigned long default_reflog_expire_unreachable; |