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

Merge branch 'jk/misc-null-check-fixes'

Browse Source 
Code clean-up.

* jk/misc-null-check-fixes:
  fetch_bundle_uri(): drop pointless NULL check
  notes: clean up confusing NULL checks in init_notes()
This commit is contained in:
Junio C Hamano 2023-05-02 10:13:34 -07:00
commit f357d46ada
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundle-uri.c
View File

@ -795,10 +795,10 @@ int fetch_bundle_uri(struct repository *r, const char *uri,
init_bundle_list(&list); init_bundle_list(&list);
/* /*
* Do not fetch a NULL or empty bundle URI. An empty bundle URI * Do not fetch an empty bundle URI. An empty bundle URI
* could signal that a configured bundle URI has been disabled. * could signal that a configured bundle URI has been disabled.
*/ */
if (!uri || !*uri) { if (!*uri) {
result = 0; result = 0;
goto cleanup; goto cleanup;
} }

4
notes.c
View File

@ -1020,13 +1020,13 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
t->root = (struct int_node *) xcalloc(1, sizeof(struct int_node)); t->root = (struct int_node *) xcalloc(1, sizeof(struct int_node));
t->first_non_note = NULL; t->first_non_note = NULL;
t->prev_non_note = NULL; t->prev_non_note = NULL;
t->ref = xstrdup_or_null(notes_ref); t->ref = xstrdup(notes_ref);
t->update_ref = (flags & NOTES_INIT_WRITABLE) ? t->ref : NULL; t->update_ref = (flags & NOTES_INIT_WRITABLE) ? t->ref : NULL;
t->combine_notes = combine_notes; t->combine_notes = combine_notes;
t->initialized = 1; t->initialized = 1;
t->dirty = 0; t->dirty = 0;
if (flags & NOTES_INIT_EMPTY || !notes_ref || if (flags & NOTES_INIT_EMPTY ||
repo_get_oid_treeish(the_repository, notes_ref, &object_oid)) repo_get_oid_treeish(the_repository, notes_ref, &object_oid))
return; return;
if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, &object_oid)) if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, &object_oid))