[PATCH 3/3] stash: call reflog_delete from reflog.c
From: John Cai via GitGitGadget <hidden>
Date: 2022-02-18 18:40:58
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: John Cai <redacted> Now that cmd_reflog_delete has been libified an exported it into a new reflog.c library so we can call it directly from builtin/stash.c. This not only gives us a performance gain since we don't need to create a subprocess, but it also allows us to use the ref transactions api in the future. Helped-by: Ævar Arnfjörð Bjarmason [off-list ref] Signed-off-by: John Cai <redacted> --- builtin/stash.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/builtin/stash.c b/builtin/stash.c
index 9638c56303e..d0967b3d3c3 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c@@ -17,6 +17,7 @@ #include "diffcore.h" #include "exec-cmd.h" #include "entry.h" +#include "reflog.h" #define INCLUDE_ALL_FILES 2
@@ -635,18 +636,9 @@ static int reflog_is_empty(const char *refname) static int do_drop_stash(struct stash_info *info, int quiet) { int ret; - struct child_process cp_reflog = CHILD_PROCESS_INIT; - - /* - * reflog does not provide a simple function for deleting refs. One will - * need to be added to avoid implementing too much reflog code here - */ - - cp_reflog.git_cmd = 1; - strvec_pushl(&cp_reflog.args, "reflog", "delete", "--updateref", - "--rewrite", NULL); - strvec_push(&cp_reflog.args, info->revision.buf); - ret = run_command(&cp_reflog); + ret = reflog_delete(info->revision.buf, + EXPIRE_REFLOGS_REWRITE | EXPIRE_REFLOGS_REWRITE, + 0); if (!ret) { if (!quiet) printf_ln(_("Dropped %s (%s)"), info->revision.buf,
--
gitgitgadget