[PATCH v10 7/7] git-stash: use update-ref --create-reflog instead of creating files

2015-07-21 Thread David Turner
This is in support of alternate ref backends which don't necessarily
store reflogs as files.

Signed-off-by: David Turner dtur...@twopensource.com
---
 git-stash.sh | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/git-stash.sh b/git-stash.sh
index 8e9e2cd..1d5ba7a 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -183,9 +183,7 @@ store_stash () {
stash_msg=Created via \git stash store\.
fi
 
-   # Make sure the reflog for stash is kept.
-   : $(git rev-parse --git-path logs/$ref_stash)
-   git update-ref -m $stash_msg $ref_stash $w_commit
+   git update-ref --create-reflog -m $stash_msg $ref_stash $w_commit
ret=$?
test $ret != 0  test -z $quiet 
die $(eval_gettext Cannot update \$ref_stash with \$w_commit)
@@ -262,7 +260,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
-- 
2.0.4.315.gad8727a-twtrsrc

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v10 7/7] git-stash: use update-ref --create-reflog instead of creating files

2015-07-21 Thread Junio C Hamano
Compared them with v9, signed them off, and merged to 'next'.
Haven't pushed the result out yet.

Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html