git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 22/33] notes-merge: convert notes_merge* to struct object_id

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
May 31, 2017, 22:00 UTC
Message-ID
<20170530185653.cfy4cbq3pmxfq5x6@genre.crustytoothpaste.net>
In-Reply-To
<20170530173109.54904-23-bmwill@google.com>
On Tue, May 30, 2017 at 10:30:58AM -0700, Brandon Williams wrote:
Show 19 quoted lines
> @@ -596,47 +596,47 @@ int notes_merge(struct notes_merge_options *o,
>  	/* Find merge bases */
>  	bases = get_merge_bases(local, remote);
>  	if (!bases) {
> -		base_sha1 = null_sha1;
> -		base_tree_sha1 = EMPTY_TREE_SHA1_BIN;
> +		base_oid = &null_oid;
> +		base_tree_oid = &empty_tree_oid;
>  		if (o->verbosity >= 4)
>  			printf("No merge base found; doing history-less merge\n");
>  	} else if (!bases->next) {
> -		base_sha1 = bases->item->object.oid.hash;
> -		base_tree_sha1 = bases->item->tree->object.oid.hash;
> +		base_oid = &bases->item->object.oid;
> +		base_tree_oid = &bases->item->tree->object.oid;
>  		if (o->verbosity >= 4)
>  			printf("One merge base found (%.7s)\n",
> -				sha1_to_hex(base_sha1));
> +			       oid_to_hex(base_oid));
I noticed you fixed up the indentation.  Thanks.
Show 23 quoted lines
> diff --git a/notes-merge.h b/notes-merge.h
> index 0d890563b..eaa8e3b86 100644
> --- a/notes-merge.h
> +++ b/notes-merge.h
> @@ -33,15 +33,15 @@ void init_notes_merge_options(struct notes_merge_options *o);
>   *
>   * 1. The merge trivially results in an existing commit (e.g. fast-forward or
>   *    already-up-to-date). 'local_tree' is untouched, the SHA1 of the result
> - *    is written into 'result_sha1' and 0 is returned.
> + *    is written into 'result_oid' and 0 is returned.
>   * 2. The merge successfully completes, producing a merge commit. local_tree
>   *    contains the updated notes tree, the SHA1 of the resulting commit is
> - *    written into 'result_sha1', and 1 is returned.
> + *    written into 'result_oid', and 1 is returned.
>   * 3. The merge results in conflicts. This is similar to #2 in that the
>   *    partial merge result (i.e. merge result minus the unmerged entries)
>   *    are stored in 'local_tree', and the SHA1 or the resulting commit
>   *    (to be amended when the conflicts have been resolved) is written into
> - *    'result_sha1'. The unmerged entries are written into the
> + *    'result_oid'. The unmerged entries are written into the
>   *    .git/NOTES_MERGE_WORKTREE directory with conflict markers.
>   *    -1 is returned.
>   *

Did you want to change the comment to say "object ID" or "OID" instead of "SHA1" like you did in an earlier patch?

-- 
brian m. carlson / brian with sandals: Houston, Texas, US
https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: https://keybase.io/bk2204
Previous: Stefan BellerNext: Junio C Hamano
Message 43 of 66 in “object id conversion (grep and diff)”
  1. 00/33 object id conversion (grep and diff)Brandon Williams, May 30, 2017
  2. 01/33 notes: convert internal structures to struct object_idBrandon Williams, May 30, 2017
  3. 03/33 notes: convert for_each_note to struct object_idBrandon Williams, May 30, 2017
  4. 05/33 notes: convert format_display_notes to struct object_idBrandon Williams, May 30, 2017
  5. 06/33 builtin/notes: convert to struct object_idBrandon Williams, May 30, 2017
  6. 02/33 notes: convert internal parts to struct object_idBrandon Williams, May 30, 2017
  7. 04/33 notes: make get_note return pointer to struct object_idBrandon Williams, May 30, 2017
  8. René ScharfeJul 15, 2017
  9. Brandon WilliamsJul 17, 2017
  10. 09/33 diff: convert get_stat_data to struct object_idBrandon Williams, May 30, 2017
  11. 07/33 notes: convert some accessor functions to struct object_idBrandon Williams, May 30, 2017
  12. 08/33 grep: convert to struct object_idBrandon Williams, May 30, 2017
  13. Junio C HamanoJun 2, 2017
  14. 15/33 diff: convert reuse_worktree_file to struct object_idBrandon Williams, May 30, 2017
  15. 10/33 diff: convert diff_index_show_file to struct object_idBrandon Williams, May 30, 2017
  16. 19/33 combine-diff: convert diff_tree_combined to struct object_idBrandon Williams, May 30, 2017
  17. 14/33 diff: convert fill_filespec to struct object_idBrandon Williams, May 30, 2017
  18. 21/33 tree-diff: convert diff_root_tree_sha1 to struct object_idBrandon Williams, May 30, 2017
  19. 24/33 notes-merge: convert find_notes_merge_pair_ps to struct object_idBrandon Williams, May 30, 2017
  20. 18/33 diff: convert diff_flush_patch_id to struct object_idBrandon Williams, May 30, 2017
  21. 25/33 notes-merge: convert verify_notes_filepair to struct object_idBrandon Williams, May 30, 2017
  22. Stefan BellerMay 31, 2017
  23. Junio C HamanoJun 2, 2017
  24. Brandon WilliamsJun 2, 2017
  25. Junio C HamanoJun 2, 2017
  26. 30/33 tree-diff: convert diff_tree_paths to struct object_idBrandon Williams, May 30, 2017
  27. Stefan BellerMay 31, 2017
  28. Jeff KingMay 31, 2017
  29. Jeff KingMay 31, 2017
  30. Junio C HamanoJun 2, 2017
  31. René ScharfeJul 15, 2017
  32. brian m. carlsonJul 15, 2017
  33. 26/33 notes-merge: convert write_note_to_worktree to struct object_idBrandon Williams, May 30, 2017
  34. 29/33 tree-diff: convert try_to_follow_renames to struct object_idBrandon Williams, May 30, 2017
  35. 20/33 combine-diff: convert find_paths_* to struct object_idBrandon Williams, May 30, 2017
  36. Stefan BellerMay 31, 2017
  37. Junio C HamanoJun 2, 2017
  38. 23/33 notes-merge: convert merge_from_diffs to struct object_idBrandon Williams, May 30, 2017
  39. Stefan BellerMay 31, 2017
  40. Junio C HamanoJun 2, 2017
  41. 22/33 notes-merge: convert notes_merge* to struct object_idBrandon Williams, May 30, 2017
  42. Stefan BellerMay 31, 2017
  43. brian m. carlsonMay 31, 2017
  44. Junio C HamanoJun 2, 2017
  45. Brandon WilliamsJun 2, 2017
  46. 33/33 diff: rename diff_fill_sha1_info to diff_fill_oid_infoBrandon Williams, May 30, 2017
  47. 31/33 tree-diff: convert path_appendnew to object_idBrandon Williams, May 30, 2017
  48. Junio C HamanoJun 2, 2017
  49. 27/33 diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams, May 30, 2017
  50. 32/33 diffcore-rename: use is_empty_blob_oidBrandon Williams, May 30, 2017
  51. 28/33 builtin/diff-tree: cleanup references to sha1Brandon Williams, May 30, 2017
  52. Junio C HamanoJun 2, 2017
  53. 17/33 patch-ids: convert to struct object_idBrandon Williams, May 30, 2017
  54. 16/33 diff: finish conversion for prepare_temp_file to struct object_idBrandon Williams, May 30, 2017
  55. Stefan BellerMay 31, 2017
  56. 11/33 diff: convert diff_addremove to struct object_idBrandon Williams, May 30, 2017
  57. 12/33 diff: convert run_diff_files to struct object_idBrandon Williams, May 30, 2017
  58. 13/33 diff: convert diff_change to struct object_idBrandon Williams, May 30, 2017
  59. brian m. carlsonMay 31, 2017
  60. Brandon WilliamsJun 2, 2017
  61. Junio C HamanoJun 2, 2017
  62. Junio C HamanoJun 2, 2017
  63. Junio C HamanoJun 2, 2017
  64. Brandon WilliamsJun 2, 2017
  65. Junio C HamanoJun 2, 2017
  66. Brandon WilliamsJun 5, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.