Skip to content

object id conversion (grep and diff)

Brandon Williams git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest33 patches 32 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/33notes: convert internal structures to struct object_idnotes.c+51 -470 replies
2/33notes: convert internal parts to struct object_idnotes.c+33 -310 replies
3/33notes: convert for_each_note to struct object_idbuiltin/notes.c notes.c notes.h +1 more+21 -210 replies
4/33notes: make get_note return pointer to struct object_idbuiltin/notes.c notes-cache.c notes.c +2 more+28 -282 replies
5/33notes: convert format_display_notes to struct object_idlog-tree.c notes.c notes.h +1 more+7 -70 replies
6/33builtin/notes: convert to struct object_idbuiltin/am.c builtin/commit.c builtin/notes.c +2 more+60 -600 replies
7/33notes: convert some accessor functions to struct object_idbuiltin/notes.c notes-cache.c notes-merge.c +4 more+41 -410 replies
8/33grep: convert to struct object_idbuiltin/grep.c cache.h grep.c +1 more+27 -211 reply
9/33diff: convert get_stat_data to struct object_iddiff-lib.c+13 -130 replies
10/33diff: convert diff_index_show_file to struct object_iddiff-lib.c+5 -50 replies
11/33diff: convert diff_addremove to struct object_iddiff-lib.c diff.c diff.h +2 more+17 -170 replies
12/33diff: convert run_diff_files to struct object_iddiff-lib.c+6 -60 replies
13/33diff: convert diff_change to struct object_iddiff-lib.c diff.c diff.h +2 more+19 -200 replies
14/33diff: convert fill_filespec to struct object_idbuiltin/blame.c builtin/diff.c combine-diff.c +7 more+21 -210 replies
15/33diff: convert reuse_worktree_file to struct object_iddiff.c+5 -50 replies
16/33diff: finish conversion for prepare_temp_file to struct object_iddiff.c+2 -21 reply
17/33patch-ids: convert to struct object_idbuiltin/log.c patch-ids.c patch-ids.h+13 -130 replies
18/33diff: convert diff_flush_patch_id to struct object_iddiff.c diff.h patch-ids.c+8 -80 replies
19/33combine-diff: convert diff_tree_combined to struct object_idbuiltin/diff.c combine-diff.c diff.h+7 -70 replies
20/33combine-diff: convert find_paths_* to struct object_idcombine-diff.c+6 -62 replies
21/33tree-diff: convert diff_root_tree_sha1 to struct object_idbuiltin/fast-export.c diff.h log-tree.c +2 more+8 -80 replies
22/33notes-merge: convert notes_merge* to struct object_idbuiltin/notes.c notes-merge.c notes-merge.h+38 -384 replies
23/33notes-merge: convert merge_from_diffs to struct object_idnotes-merge.c+16 -152 replies
24/33notes-merge: convert find_notes_merge_pair_ps to struct object_idnotes-merge.c+12 -120 replies
25/33notes-merge: convert verify_notes_filepair to struct object_idnotes-merge.c+10 -104 replies
26/33notes-merge: convert write_note_to_worktree to struct object_idnotes-merge.c+10 -100 replies
27/33diff-tree: convert diff_tree_sha1 to struct object_idbuiltin/blame.c builtin/diff-tree.c builtin/diff.c +13 more+47 -460 replies
28/33builtin/diff-tree: cleanup references to sha1builtin/diff-tree.c+3 -51 reply
29/33tree-diff: convert try_to_follow_renames to struct object_idtree-diff.c+5 -30 replies
30/33tree-diff: convert diff_tree_paths to struct object_idcombine-diff.c diff.h tree-diff.c+39 -386 replies
31/33tree-diff: convert path_appendnew to object_idtree-diff.c+3 -31 reply
32/33diffcore-rename: use is_empty_blob_oiddiffcore-rename.c+2 -20 replies
33/33diff: rename diff_fill_sha1_info to diff_fill_oid_infodiff.c+9 -90 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 00/33] object id conversion (grep and diff)

A month or so ago I thought I would lend a hand to Brian and do a round of conversions from sha1 -> struct object_id. Now that Brian's latest series has hit master I can finally send these patches out.

The first couple patches are from Brian which convert some of the notes logic to using 'struct object_id'. The remaining patches are to convert the grep and diff machinery to using 'struct object_id'.

Brandon Williams (26):
grep: convert to struct object_id
diff: convert get_stat_data to struct object_id
diff: convert diff_index_show_file to struct object_id
diff: convert diff_addremove to struct object_id
diff: convert run_diff_files to struct object_id
diff: convert diff_change to struct object_id
diff: convert fill_filespec to struct object_id
diff: convert reuse_worktree_file to struct object_id
diff: finish conversion for prepare_temp_file to struct object_id
patch-ids: convert to struct object_id
diff: convert diff_flush_patch_id to struct object_id
combine-diff: convert diff_tree_combined to struct object_id
combine-diff: convert find_paths_* to struct object_id
tree-diff: convert diff_root_tree_sha1 to struct object_id
notes-merge: convert notes_merge* to struct object_id
notes-merge: convert merge_from_diffs to struct object_id
notes-merge: convert find_notes_merge_pair_ps to struct object_id
notes-merge: convert verify_notes_filepair to struct object_id
notes-merge: convert write_note_to_worktree to struct object_id
diff-tree: convert diff_tree_sha1 to struct object_id builtin/diff-tree: cleanup references to sha1
tree-diff: convert try_to_follow_renames to struct object_id
tree-diff: convert diff_tree_paths to struct object_id
tree-diff: convert path_appendnew to object_id
diffcore-rename: use is_empty_blob_oid
diff: rename diff_fill_sha1_info to diff_fill_oid_info

brian m. carlson (7):
notes: convert internal structures to struct object_id
notes: convert internal parts to struct object_id
notes: convert for_each_note to struct object_id
notes: make get_note return pointer to struct object_id
notes: convert format_display_notes to struct object_id builtin/notes: convert to struct object_id
notes: convert some accessor functions to struct object_id

 builtin/am.c          |   2 +-
 builtin/blame.c       |  22 +++---
 builtin/commit.c      |   2 +-
 builtin/diff-tree.c   |  16 ++--
 builtin/diff.c        |   8 +-
 builtin/fast-export.c |   8 +-
 builtin/grep.c        |  22 +++---
 builtin/log.c         |   8 +-
 builtin/merge.c       |   2 +-
 builtin/notes.c       | 136 ++++++++++++++++-----------------
 cache.h               |   7 ++
 combine-diff.c        |  30 ++++----
 diff-lib.c            |  52 ++++++-------
 diff-no-index.c       |   2 +-
 diff.c                |  74 +++++++++---------
 diff.h                |  38 +++++-----
 diffcore-rename.c     |   6 +-
 diffcore.h            |   2 +-
 grep.c                |  19 +++--
 grep.h                |   2 +-
 line-log.c            |  10 +--
 log-tree.c            |  12 +--
 merge-recursive.c     |   2 +-
 notes-cache.c         |  10 +--
 notes-merge.c         | 165 +++++++++++++++++++++--------------------
 notes-merge.h         |  12 +--
 notes-utils.c         |   2 +-
 notes-utils.h         |   2 +-
 notes.c               | 202 ++++++++++++++++++++++++++------------------------
 notes.h               |  16 ++--
 patch-ids.c           |  26 +++----
 patch-ids.h           |   4 +-
 remote-testsvn.c      |  22 +++---
 revision.c            |  16 ++--
 sequencer.c           |   4 +-
 tree-diff.c           |  93 ++++++++++++-----------
 36 files changed, 535 insertions(+), 521 deletions(-)
Signature · 1 line
2.13.0.219.gdb65acc882-goog