rename_ref: replace empty message in HEAD's log
When the current branch is renamed, the deletion of the old ref is recorded in HEAD's log with an empty message. Now that delete_ref() accepts a reflog message, provide a more descriptive message by passing along the log message that is given to rename_ref(). The next step will be to extend HEAD's log to also include the second part of the rename, the creation of the new branch. Helped-by: Jeff King <peff@peff.net> Signed-off-by: Kyle Meyer <kyle@kyleam.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kyle Meyer committed
Feb 20, 2017 at 20:10 UTC
893dbf5ba16c47c7284209bc6c527195f368ee35
2 files changed
+6
-1
refs/files-backend.c
+1
-1
@@ -2616,7 +2616,7 @@ static int files_rename_ref(struct ref_store *ref_store,
2616
return error("unable to move logfile logs/%s to "TMP_RENAMED_LOG": %s",
2617
oldrefname, strerror(errno));
2618
2619
- if (delete_ref(NULL, oldrefname, orig_sha1, REF_NODEREF)) {
2619
+ if (delete_ref(logmsg, oldrefname, orig_sha1, REF_NODEREF)) {
2620
error("unable to delete old %s", oldrefname);
2621
goto rollback;
2622
}
t/t3200-branch.sh
+5
@@ -139,6 +139,11 @@ test_expect_success 'git branch -M baz bam should succeed when baz is checked ou
139
test $(git rev-parse --abbrev-ref HEAD) = bam
140
'
141
142
+test_expect_success 'git branch -M baz bam should add entry to .git/logs/HEAD' '
143
+ msg="Branch: renamed refs/heads/baz to refs/heads/bam" &&
144
+ grep " 0\{40\}.*$msg$" .git/logs/HEAD
145
+'
146
+
147
test_expect_success 'git branch -M baz bam should succeed when baz is checked out as linked working tree' '
148
git checkout master &&
149
git worktree add -b baz bazdir &&