[PATCH v3 6/7] git-reflog: add create and exists functions
- From
David Turner <dturner@twopensource.com>
- Date
- Jun 26, 2015, 00:29 UTC
- Message-ID
- <1435278548-3790-6-git-send-email-dturner@twopensource.com>
- In-Reply-To
- <1435278548-3790-1-git-send-email-dturner@twopensource.com>
These are necessary because alternate ref backends might store reflogs somewhere other than .git/logs. Code that now directly manipulates .git/logs should instead go through git-reflog.
In a moment, we will use these functions to make git stash work with alternate ref backends.
Signed-off-by: David Turner <dturner@twopensource.com> --- builtin/reflog.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++- t/t1411-reflog-show.sh | 12 ++++++++ 2 files changed, 90 insertions(+), 1 deletion(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c index c2eb8ff..7fe31fa 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -13,6 +13,10 @@ static const char reflog_expire_usage[] = "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 [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <refs>..."; +static const char reflog_create_usage[] = +"git reflog create <refs>..."; +static const char reflog_exists_usage[] = +"git reflog exists <ref>"; static unsigned long default_reflog_expire; static unsigned long default_reflog_expire_unreachable; @@ -699,12 +703,79 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix) return status; } +static int cmd_reflog_create(int argc, const char **argv, const char *prefix) +{ + int i, status = 0, start = 0; + struct strbuf err = STRBUF_INIT; + int temp; + + for (i = 1; i < argc; i++) { + const char *arg = argv[i]; + if (!strcmp(arg, "--")) { + i++; + break; + } + else if (arg[0] == '-') + usage(reflog_create_usage); + else + break; + } + + start = i; + + if (argc - start < 1) + return error("Nothing to create?"); + + temp = log_all_ref_updates; + log_all_ref_updates = 1; + for (i = start; i < argc; i++) { + if (check_refname_format(argv[i], REFNAME_ALLOW_ONELEVEL)) + die("invalid ref format: %s", argv[i]); + } + for (i = start; i < argc; i++) { + if (safe_create_reflog(argv[i], &err, 1)) { + error("could not create reflog %s: %s", argv[i], + err.buf); + status = 1; + strbuf_release(&err); + } + } + log_all_ref_updates = temp; + return status; +} + +static int cmd_reflog_exists(int argc, const char **argv, const char *prefix) +{ + int i, status = 0, start = 0; + + for (i = 1; i < argc; i++) { + const char *arg = argv[i]; + if (!strcmp(arg, "--")) { + i++; + break; + } + else if (arg[0] == '-') + usage(reflog_exists_usage); + else + break; + } + + start = i; + + if (argc - start != 1) + usage(reflog_exists_usage); + + if (check_refname_format(argv[start], REFNAME_ALLOW_ONELEVEL)) + die("invalid ref format: %s", argv[start]); + return !reflog_exists(argv[start]); +} + /* * main "reflog" */ static const char reflog_usage[] = -"git reflog [ show | expire | delete ]"; +"git reflog [ show | expire | delete | create | exists ]"; int cmd_reflog(int argc, const char **argv, const char *prefix) { @@ -724,5 +795,11 @@ int cmd_reflog(int argc, const char **argv, const char *prefix) if (!strcmp(argv[1], "delete")) return cmd_reflog_delete(argc - 1, argv + 1, prefix); + if (!strcmp(argv[1], "create")) + return cmd_reflog_create(argc - 1, argv + 1, prefix); + + if (!strcmp(argv[1], "exists")) + return cmd_reflog_exists(argc - 1, argv + 1, prefix); + return cmd_log_reflog(argc, argv, prefix); } diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh index 6f47c0d..6e1abe7 100755 --- a/t/t1411-reflog-show.sh +++ b/t/t1411-reflog-show.sh @@ -166,4 +166,16 @@ test_expect_success 'git log -g -p shows diffs vs. parents' ' test_cmp expect actual ' +test_expect_success 'reflog exists works' ' + git reflog exists refs/heads/master && + ! git reflog exists refs/heads/nonexistent +' + +test_expect_success 'reflog create works' ' + git update-ref non-refs-dir HEAD && + ! git reflog exists non-refs-dir && + git reflog create non-refs-dir && + git reflog exists non-refs-dir +' + test_done
-- 2.0.4.314.gdbf7a51-twtrsrc