[PATCH v5 7/7] git-stash: use git-reflog instead of creating files
DORMANTno replies
From: David Turner <hidden>
Date: 2016-06-15 23:05:35
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v5 of 3 in this series.
Revisions (3)
- v5 current
- v6 [diff vs current]
- v9 [diff vs current]
This is in support of alternate ref backends which don't necessarily store reflogs as files. Signed-off-by: David Turner <redacted> --- git-stash.sh | 4 ++-- refs.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index 8e9e2cd..27155bc 100755
--- a/git-stash.sh
+++ b/git-stash.sh@@ -184,7 +184,7 @@ store_stash () { fi # Make sure the reflog for stash is kept. - : >>"$(git rev-parse --git-path logs/$ref_stash)" + git reflog create "$ref_stash" git update-ref -m "$stash_msg" $ref_stash $w_commit ret=$? test $ret != 0 && test -z $quiet &&
@@ -262,7 +262,7 @@ save_stash () { say "$(gettext "No local changes to save")" exit 0 fi - test -f "$(git rev-parse --git-path logs/$ref_stash)" || + git reflog exists $ref_stash || clear_stash || die "$(gettext "Cannot initialize stash")" create_stash "$stash_msg" $untracked
diff --git a/refs.c b/refs.c
index 0ece8f2..813b1fc 100644
--- a/refs.c
+++ b/refs.c@@ -3125,6 +3125,7 @@ static int should_autocreate_reflog(const char *refname) return starts_with(refname, "refs/heads/") || starts_with(refname, "refs/remotes/") || starts_with(refname, "refs/notes/") || + !strcmp(refname, "refs/stash") || !strcmp(refname, "HEAD"); }
--
2.0.4.315.gad8727a-twtrsrc