undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

delete_ref: accept a reflog message argument

Browse Source 
When the current branch is renamed with 'git branch -m/-M' or deleted
with 'git update-ref -m<msg> -d', the event is recorded in HEAD's log
with an empty message.  In preparation for adding a more meaningful
message to HEAD's log in these cases, update delete_ref() to take a
message argument and pass it along to ref_transaction_delete().
Modify all callers to pass NULL for the new message argument; no
change in behavior is intended.

Note that this is relevant for HEAD's log but not for the deleted
ref's log, which is currently deleted along with the ref.  Even if it
were not, an entry for the deletion wouldn't be present in the deleted
ref's log.  files_transaction_commit() writes to the log if
REF_NEEDS_COMMIT or REF_LOG_ONLY are set, but lock_ref_for_update()
doesn't set REF_NEEDS_COMMIT for the deleted ref because REF_DELETING
is set.  In contrast, the update for HEAD has REF_LOG_ONLY set by
split_head_update(), resulting in the deletion being logged.

Signed-off-by: Kyle Meyer <kyle@kyleam.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kyle Meyer 2017-02-20 20:10:32 -05:00 committed by Junio C Hamano
parent 20769079d2
commit 755b49ae96
14 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/am.c
View File

@ -1049,7 +1049,7 @@ static void am_setup(struct am_state *state, enum patch_format patch_format,
} else { } else {
write_state_text(state, "abort-safety", ""); write_state_text(state, "abort-safety", "");
if (!state->rebasing) if (!state->rebasing)
delete_ref("ORIG_HEAD", NULL, 0); delete_ref(NULL, "ORIG_HEAD", NULL, 0);
} }
/* /*
@ -2172,7 +2172,7 @@ static void am_abort(struct am_state *state)
has_curr_head ? &curr_head : NULL, 0, has_curr_head ? &curr_head : NULL, 0,
UPDATE_REFS_DIE_ON_ERR); UPDATE_REFS_DIE_ON_ERR);
else if (curr_branch) else if (curr_branch)
delete_ref(curr_branch, NULL, REF_NODEREF); delete_ref(NULL, curr_branch, NULL, REF_NODEREF);
free(curr_branch); free(curr_branch);
am_destroy(state); am_destroy(state);

2
builtin/branch.c
View File

@ -251,7 +251,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
goto next; goto next;
} }
if (delete_ref(name, is_null_sha1(sha1) ? NULL : sha1, if (delete_ref(NULL, name, is_null_sha1(sha1) ? NULL : sha1,
REF_NODEREF)) { REF_NODEREF)) {
error(remote_branch error(remote_branch
? _("Error deleting remote-tracking branch '%s'") ? _("Error deleting remote-tracking branch '%s'")

4
builtin/notes.c
View File

@ -681,9 +681,9 @@ static int merge_abort(struct notes_merge_options *o)
* notes_merge_abort() to remove .git/NOTES_MERGE_WORKTREE. * notes_merge_abort() to remove .git/NOTES_MERGE_WORKTREE.
*/ */
if (delete_ref("NOTES_MERGE_PARTIAL", NULL, 0)) if (delete_ref(NULL, "NOTES_MERGE_PARTIAL", NULL, 0))
ret += error(_("failed to delete ref NOTES_MERGE_PARTIAL")); ret += error(_("failed to delete ref NOTES_MERGE_PARTIAL"));
if (delete_ref("NOTES_MERGE_REF", NULL, REF_NODEREF)) if (delete_ref(NULL, "NOTES_MERGE_REF", NULL, REF_NODEREF))
ret += error(_("failed to delete ref NOTES_MERGE_REF")); ret += error(_("failed to delete ref NOTES_MERGE_REF"));
if (notes_merge_abort(o)) if (notes_merge_abort(o))
ret += error(_("failed to remove 'git notes merge' worktree")); ret += error(_("failed to remove 'git notes merge' worktree"));

4
builtin/remote.c
View File

@ -691,7 +691,7 @@ static int mv(int argc, const char **argv)
read_ref_full(item->string, RESOLVE_REF_READING, oid.hash, &flag); read_ref_full(item->string, RESOLVE_REF_READING, oid.hash, &flag);
if (!(flag & REF_ISSYMREF)) if (!(flag & REF_ISSYMREF))
continue; continue;
if (delete_ref(item->string, NULL, REF_NODEREF)) if (delete_ref(NULL, item->string, NULL, REF_NODEREF))
die(_("deleting '%s' failed"), item->string); die(_("deleting '%s' failed"), item->string);
} }
for (i = 0; i < remote_branches.nr; i++) { for (i = 0; i < remote_branches.nr; i++) {
@ -1248,7 +1248,7 @@ static int set_head(int argc, const char **argv)
head_name = xstrdup(states.heads.items[0].string); head_name = xstrdup(states.heads.items[0].string);
free_remote_ref_states(&states); free_remote_ref_states(&states);
} else if (opt_d && !opt_a && argc == 1) { } else if (opt_d && !opt_a && argc == 1) {
if (delete_ref(buf.buf, NULL, REF_NODEREF)) if (delete_ref(NULL, buf.buf, NULL, REF_NODEREF))
result |= error(_("Could not delete %s"), buf.buf); result |= error(_("Could not delete %s"), buf.buf);
} else } else
usage_with_options(builtin_remote_sethead_usage, options); usage_with_options(builtin_remote_sethead_usage, options);

2
builtin/replace.c
View File

@ -121,7 +121,7 @@ static int for_each_replace_name(const char **argv, each_replace_name_fn fn)
static int delete_replace_ref(const char *name, const char *ref, static int delete_replace_ref(const char *name, const char *ref,
const unsigned char *sha1) const unsigned char *sha1)
{ {
if (delete_ref(ref, sha1, 0)) if (delete_ref(NULL, ref, sha1, 0))
return 1; return 1;
printf("Deleted replace ref '%s'\n", name); printf("Deleted replace ref '%s'\n", name);
return 0; return 0;

2
builtin/reset.c
View File

@ -256,7 +256,7 @@ static int reset_refs(const char *rev, const struct object_id *oid)
update_ref_oid(msg.buf, "ORIG_HEAD", orig, old_orig, 0, update_ref_oid(msg.buf, "ORIG_HEAD", orig, old_orig, 0,
UPDATE_REFS_MSG_ON_ERR); UPDATE_REFS_MSG_ON_ERR);
} else if (old_orig) } else if (old_orig)
delete_ref("ORIG_HEAD", old_orig->hash, 0); delete_ref(NULL, "ORIG_HEAD", old_orig->hash, 0);
set_reflog_message(&msg, "updating HEAD", rev); set_reflog_message(&msg, "updating HEAD", rev);
update_ref_status = update_ref_oid(msg.buf, "HEAD", oid, orig, 0, update_ref_status = update_ref_oid(msg.buf, "HEAD", oid, orig, 0,
UPDATE_REFS_MSG_ON_ERR); UPDATE_REFS_MSG_ON_ERR);

2
builtin/symbolic-ref.c
View File

@ -58,7 +58,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
die("Cannot delete %s, not a symbolic ref", argv[0]); die("Cannot delete %s, not a symbolic ref", argv[0]);
if (!strcmp(argv[0], "HEAD")) if (!strcmp(argv[0], "HEAD"))
die("deleting '%s' is not allowed", argv[0]); die("deleting '%s' is not allowed", argv[0]);
return delete_ref(argv[0], NULL, REF_NODEREF); return delete_ref(NULL, argv[0], NULL, REF_NODEREF);
} }
switch (argc) { switch (argc) {

2
builtin/tag.c
View File

@ -97,7 +97,7 @@ static int for_each_tag_name(const char **argv, each_tag_name_fn fn,
static int delete_tag(const char *name, const char *ref, static int delete_tag(const char *name, const char *ref,
const unsigned char *sha1, const void *cb_data) const unsigned char *sha1, const void *cb_data)
{ {
if (delete_ref(ref, sha1, 0)) if (delete_ref(NULL, ref, sha1, 0))
return 1; return 1;
printf(_("Deleted tag '%s' (was %s)\n"), name, find_unique_abbrev(sha1, DEFAULT_ABBREV)); printf(_("Deleted tag '%s' (was %s)\n"), name, find_unique_abbrev(sha1, DEFAULT_ABBREV));
return 0; return 0;

2
builtin/update-ref.c
View File

@ -433,7 +433,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
* For purposes of backwards compatibility, we treat * For purposes of backwards compatibility, we treat
* NULL_SHA1 as "don't care" here: * NULL_SHA1 as "don't care" here:
*/ */
return delete_ref(refname, return delete_ref(NULL, refname,
(oldval && !is_null_sha1(oldsha1)) ? oldsha1 : NULL, (oldval && !is_null_sha1(oldsha1)) ? oldsha1 : NULL,
flags); flags);
else else

2
fast-import.c
View File

@ -1752,7 +1752,7 @@ static int update_branch(struct branch *b)
if (is_null_sha1(b->sha1)) { if (is_null_sha1(b->sha1)) {
if (b->delete) if (b->delete)
delete_ref(b->name, NULL, 0); delete_ref(NULL, b->name, NULL, 0);
return 0; return 0;
} }
if (read_ref(b->name, old_sha1)) if (read_ref(b->name, old_sha1))

6
refs.c
View File

@ -591,8 +591,8 @@ static int delete_pseudoref(const char *pseudoref, const unsigned char *old_sha1
return 0; return 0;
} }
int delete_ref(const char *refname, const unsigned char *old_sha1, int delete_ref(const char *msg, const char *refname,
unsigned int flags) const unsigned char *old_sha1, unsigned int flags)
{ {
struct ref_transaction *transaction; struct ref_transaction *transaction;
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
@ -603,7 +603,7 @@ int delete_ref(const char *refname, const unsigned char *old_sha1,
transaction = ref_transaction_begin(&err); transaction = ref_transaction_begin(&err);
if (!transaction || if (!transaction ||
ref_transaction_delete(transaction, refname, old_sha1, ref_transaction_delete(transaction, refname, old_sha1,
flags, NULL, &err) || flags, msg, &err) ||
ref_transaction_commit(transaction, &err)) { ref_transaction_commit(transaction, &err)) {
error("%s", err.buf); error("%s", err.buf);
ref_transaction_free(transaction); ref_transaction_free(transaction);

4
refs.h
View File

@ -276,8 +276,8 @@ int reflog_exists(const char *refname);
* exists, regardless of its old value. It is an error for old_sha1 to * exists, regardless of its old value. It is an error for old_sha1 to
* be NULL_SHA1. flags is passed through to ref_transaction_delete(). * be NULL_SHA1. flags is passed through to ref_transaction_delete().
*/ */
int delete_ref(const char *refname, const unsigned char *old_sha1, int delete_ref(const char *msg, const char *refname,
unsigned int flags); const unsigned char *old_sha1, unsigned int flags);
/* /*
* Delete the specified references. If there are any problems, emit * Delete the specified references. If there are any problems, emit

6
refs/files-backend.c
View File

@ -2489,7 +2489,7 @@ static int files_delete_refs(struct ref_store *ref_store,
for (i = 0; i < refnames->nr; i++) { for (i = 0; i < refnames->nr; i++) {
const char *refname = refnames->items[i].string; const char *refname = refnames->items[i].string;
if (delete_ref(refname, NULL, flags)) if (delete_ref(NULL, refname, NULL, flags))
result |= error(_("could not remove reference %s"), refname); result |= error(_("could not remove reference %s"), refname);
} }
@ -2616,7 +2616,7 @@ static int files_rename_ref(struct ref_store *ref_store,
return error("unable to move logfile logs/%s to "TMP_RENAMED_LOG": %s", return error("unable to move logfile logs/%s to "TMP_RENAMED_LOG": %s",
oldrefname, strerror(errno)); oldrefname, strerror(errno));
if (delete_ref(oldrefname, orig_sha1, REF_NODEREF)) { if (delete_ref(NULL, oldrefname, orig_sha1, REF_NODEREF)) {
error("unable to delete old %s", oldrefname); error("unable to delete old %s", oldrefname);
goto rollback; goto rollback;
} }
@ -2630,7 +2630,7 @@ static int files_rename_ref(struct ref_store *ref_store,
*/ */
if (!read_ref_full(newrefname, RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE, if (!read_ref_full(newrefname, RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
sha1, NULL) && sha1, NULL) &&
delete_ref(newrefname, NULL, REF_NODEREF)) { delete_ref(NULL, newrefname, NULL, REF_NODEREF)) {
if (errno==EISDIR) { if (errno==EISDIR) {
struct strbuf path = STRBUF_INIT; struct strbuf path = STRBUF_INIT;
int result; int result;

2
transport.c
View File

@ -299,7 +299,7 @@ void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int v
if (verbose) if (verbose)
fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst); fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst);
if (ref->deletion) { if (ref->deletion) {
delete_ref(rs.dst, NULL, 0); delete_ref(NULL, rs.dst, NULL, 0);
} else } else
update_ref("update by push", rs.dst, update_ref("update by push", rs.dst,
ref->new_oid.hash, NULL, 0, 0); ref->new_oid.hash, NULL, 0, 0);