Junio C Hamano <gitster@xxxxxxxxx> writes:
> "make refs.sp" should have told you that you should not write NULL
> as just 0. I'll queue a SQUASH??? fix-up on top before merging it
> into 'seen' for today's integration.
>
> diff --git c/refs.c w/refs.c
> index 010f426def..d578a2823b 100644
> --- c/refs.c
> +++ w/refs.c
> @@ -2758,7 +2758,7 @@ int refs_delete_refs(struct ref_store *refs, const char *logmsg,
>
> for_each_string_list_item(item, refnames) {
> ret = ref_transaction_delete(transaction, item->string,
> - NULL, flags, 0, msg, &err);
> + NULL, flags, NULL, msg, &err);
> if (ret) {
> warning(_("could not delete reference %s: %s"),
> item->string, err.buf);
>
>
Thanks Junio, I'll apply it locally too.
>
>
> Also there are quite many whitespace breakages.
>
> $ git am -s ./+kn7-v2-update-ref-symref
> Applying: refs: accept symref values in `ref_transaction[_add]_update`
> Applying: update-ref: add support for symref-verify
> .git/rebase-apply/patch:59: indent with spaces.
> if (line_termination) {
> .git/rebase-apply/patch:60: indent with spaces.
> /* Without -z, consume SP and use next argument */
> .git/rebase-apply/patch:61: indent with spaces.
> if (!**next || **next == line_termination)
> .git/rebase-apply/patch:62: indent with spaces.
> return NULL;
> .git/rebase-apply/patch:63: indent with spaces.
> if (**next != ' ')
> warning: squelched 10 whitespace errors
> warning: 15 lines applied after fixing whitespace errors.
> Applying: update-ref: add support for symref-delete
> .git/rebase-apply/patch:95: indent with spaces.
> die("symref-delete: cannot operate with deref mode");
> .git/rebase-apply/patch:101: indent with spaces.
> old_ref = parse_next_refname(&next);
> warning: 2 lines applied after fixing whitespace errors.
> Applying: files-backend: extract out `create_symref_lock`
> Applying: update-ref: add support for symref-create
> .git/rebase-apply/patch:81: indent with spaces.
> die("symref-create: cannot operate with deref mode");
> warning: 1 line applied after fixing whitespace errors.
> Applying: update-ref: add support for symref-update
> Applying: refs: support symrefs in 'reference-transaction' hook
Sigh. Even with editorconfig, this seems to be problematic for me on
Emacs. I'll just start applying locally from now before sending it.
As such I've applied this locally and will refrain from sending a new
version until a review happens.
1: 3269d0e91e = 1: 3269d0e91e refs: accept symref values in
`ref_transaction[_add]_update`
2: a8cb0e0a1d ! 2: 2293b514a8 update-ref: add support for symref-verify
@@ builtin/update-ref.c: static char *parse_refname(const char **next)
return strbuf_detach(&ref, NULL);
}
-+
-+
+/*
+ * Wrapper around parse_refname which skips the next delimiter.
+ */
+static char *parse_next_refname(const char **next)
+{
-+ if (line_termination) {
-+ /* Without -z, consume SP and use next argument */
-+ if (!**next || **next == line_termination)
-+ return NULL;
-+ if (**next != ' ')
-+ die("expected SP but got: %s", *next);
-+ } else {
-+ /* With -z, read the next NUL-terminated line */
-+ if (**next)
-+ return NULL;
-+ }
-+ /* Skip the delimiter */
-+ (*next)++;
++ if (line_termination) {
++ /* Without -z, consume SP and use next argument */
++ if (!**next || **next == line_termination)
++ return NULL;
++ if (**next != ' ')
++ die("expected SP but got: %s", *next);
++ } else {
++ /* With -z, read the next NUL-terminated line */
++ if (**next)
++ return NULL;
++ }
++ /* Skip the delimiter */
++ (*next)++;
+
-+ return parse_refname(next);
++ return parse_refname(next);
+}
+
/*
@@ builtin/update-ref.c: static void parse_cmd_verify(struct
ref_transaction *trans
+}
+
+static void parse_cmd_symref_verify(struct ref_transaction *transaction,
-+ const char *next, const char *end)
++ const char *next, const char *end)
+{
+ struct strbuf err = STRBUF_INIT;
+ struct object_id old_oid;
3: 37c3e006da ! 3: 62d05e7cb7 update-ref: add support for symref-delete
@@ builtin/update-ref.c: static void parse_cmd_delete(struct
ref_transaction *trans
+ char *refname, *old_ref;
+
+ if (!(update_flags & REF_NO_DEREF))
-+ die("symref-delete: cannot operate with deref mode");
++ die("symref-delete: cannot operate with deref mode");
+
+ refname = parse_refname(&next);
+ if (!refname)
+ die("symref-delete: missing <ref>");
+
-+ old_ref = parse_next_refname(&next);
++ old_ref = parse_next_refname(&next);
+ if (old_ref && read_ref(old_ref, NULL))
+ die("symref-delete %s: invalid <old-ref>", refname);
+
@@ refs.c: int refs_delete_refs(struct ref_store *refs, const char *logmsg,
for_each_string_list_item(item, refnames) {
ret = ref_transaction_delete(transaction, item->string,
- NULL, flags, msg, &err);
-+ NULL, flags, 0, msg, &err);
++ NULL, flags, NULL, msg, &err);
if (ret) {
warning(_("could not delete reference %s: %s"),
item->string, err.buf);
4: 53fdb408ef = 4: 1bd39a38dc files-backend: extract out `create_symref_lock`
5: 8fa0151f94 ! 5: 732d31b43d update-ref: add support for symref-create
@@ builtin/update-ref.c: static void parse_cmd_create(struct
ref_transaction *trans
+ char *refname, *new_ref;
+
+ if (!(update_flags & REF_NO_DEREF))
-+ die("symref-create: cannot operate with deref mode");
++ die("symref-create: cannot operate with deref mode");
+
+ refname = parse_refname(&next);
+ if (!refname)
6: 714492ede3 = 6: eb3d239b4b update-ref: add support for symref-update
7: c483104562 = 7: 3cdfb9e528 refs: support symrefs in
'reference-transaction' hook
Attachment:
signature.asc
Description: PGP signature
