Re: [PATCH v2 00/24] object_id part 10

[brian m. carlson]

On Thu, Oct 12, 2017 at 06:58:49PM +0900, Junio C Hamano wrote:
> "brian m. carlson"  writes:
> 
> > In the course of that, I'll rebase on top of master so that Junio can
> > avoid as much conflict resolution as possible.
> 
> I actually do not mind either way, but by rebasing on top of a more
> recent codebase you can lose a large part of 07/24 IIRC, which would
> be a big plus ;-)

Yes, I just noticed that.  The patch used to be bigger still, but as I
mentioned in the original cover letter, a lot of it went away due to
previous work in that area.
-- 
brian m. carlson / brian with sandals: Houston, Texas, US
https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: https://keybase.io/bk2204


signature.asc
Description: PGP signature

Re: [PATCH v2 00/24] object_id part 10

[Junio C Hamano]

"brian m. carlson"  writes:

> In the course of that, I'll rebase on top of master so that Junio can
> avoid as much conflict resolution as possible.

I actually do not mind either way, but by rebasing on top of a more
recent codebase you can lose a large part of 07/24 IIRC, which would
be a big plus ;-)

Re: [PATCH v2 00/24] object_id part 10

[brian m. carlson]

On Wed, Oct 11, 2017 at 12:05:50PM +0200, Michael Haggerty wrote:
> On 10/09/2017 03:11 AM, brian m. carlson wrote:
> > This is the tenth in a series of patches to convert from unsigned char
> > [20] to struct object_id.  This series mostly involves changes to the
> > refs code.  After these changes, there are almost no references to
> > unsigned char in the main refs code.
> > 
> > The series has not been rebased on master since the last submission, but
> > I can do so if that's more convenient.
> > 
> > This series is available from the following URL:
> > https://github.com/bk2204/git.git object-id-part10
> 
> I read through the whole series medium-thoroughly and left a few
> comments, but overall it looks very good and clear. Thanks so much for
> working on this!

Thanks for pointing out the places where I forgot to update the
docstrings.  I'll plan another reroll with those changes and the other
issues mentioned about the accidental deletion.

In the course of that, I'll rebase on top of master so that Junio can
avoid as much conflict resolution as possible.
-- 
brian m. carlson / brian with sandals: Houston, Texas, US
https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: https://keybase.io/bk2204


signature.asc
Description: PGP signature

Re: [PATCH v2 00/24] object_id part 10

[Junio C Hamano]

Michael Haggerty  writes:

> I took a stab at rebasing this patch series on top of current master
> using `git-imerge`. I pushed the results to my GitHub fork [1] as branch
> `object-id-part-10-rebased`. I didn't check the results very carefully,
> nor whether the commit messages need adjusting, but I did verify that
> each of the commits passes the test suite. Junio, it might serve as
> something to compare against your conflict resolution.
>
> Michael
>
> [1] https://github.com/mhagger/git

2f0e14e6 ("Merge branch 'js/rebase-i-final'", 2017-10-09) is where
your -rebased series has forked from the mainline.  I checked that
fork-point out, merged bc/object-id I queued to it, with the help
from rerere I earlier taught.  The resulting tree was identical to
the tip of your rebase.

So hopefully both of us should be good ;-)  I do not know about the
intermediate steps, though.

Thanks.

Re: [PATCH v2 00/24] object_id part 10

[Michael Haggerty]

On 10/09/2017 03:11 AM, brian m. carlson wrote:
> This is the tenth in a series of patches to convert from unsigned char
> [20] to struct object_id.  This series mostly involves changes to the
> refs code.  After these changes, there are almost no references to
> unsigned char in the main refs code.
> 
> The series has not been rebased on master since the last submission, but
> I can do so if that's more convenient.
> 
> This series is available from the following URL:
> https://github.com/bk2204/git.git object-id-part10

I read through the whole series medium-thoroughly and left a few
comments, but overall it looks very good and clear. Thanks so much for
working on this!

I took a stab at rebasing this patch series on top of current master
using `git-imerge`. I pushed the results to my GitHub fork [1] as branch
`object-id-part-10-rebased`. I didn't check the results very carefully,
nor whether the commit messages need adjusting, but I did verify that
each of the commits passes the test suite. Junio, it might serve as
something to compare against your conflict resolution.

Michael

[1] https://github.com/mhagger/git

Re: [PATCH v2 00/24] object_id part 10

[Junio C Hamano]

"brian m. carlson"  writes:

> This is the tenth in a series of patches to convert from unsigned char
> [20] to struct object_id.  This series mostly involves changes to the
> refs code.  After these changes, there are almost no references to
> unsigned char in the main refs code.
>
> The series has not been rebased on master since the last submission, but
> I can do so if that's more convenient.

Thanks for working on this.

I took a look at the conflicting parts between what happened on
'master' since than and this series.  Two things stood out:

 - many calls to resolve_refdup() started passing NULL when the
   caller does not care the object name (they just want to know what
   ref the symref points at, if any).

 - the implementation of ref peeling has been updated quite a bit.

In addition, builtin/pack-objects.c will lose want_object_in_pack()
and a new function ignore_object() will be introduced to replace its
role in a topic in flight.

Having said all that, I think I managed to come up with a clean
conflict resolutions to all integration branches 'master', 'next',
'jch' and 'pu' (that is, I pretend that the topic is mergeable to
these branches immediately, make a trial merge and test the result
before teaching the resolution to my rerere database, even though
the trial merges to more stable branches than the branch the topic
will start cooking in would be immediately discarded); at least the
results of these all passed the tests, so this round that is based
on a tad older version of 'master' looks alright.

Re: [PATCH v2 00/24] object_id part 10

[Stefan Beller]

On Sun, Oct 8, 2017 at 6:11 PM, brian m. carlson
 wrote:
> This is the tenth in a series of patches to convert from unsigned char
> [20] to struct object_id.  This series mostly involves changes to the
> refs code.  After these changes, there are almost no references to
> unsigned char in the main refs code.
>
> The series has not been rebased on master since the last submission, but
> I can do so if that's more convenient.
>
> This series is available from the following URL:
> https://github.com/bk2204/git.git object-id-part10

Skimmed-over-and-found-no-issues-by: Stefan Beller 

[PATCH v2 00/24] object_id part 10

[brian m. carlson]

This is the tenth in a series of patches to convert from unsigned char
[20] to struct object_id.  This series mostly involves changes to the
refs code.  After these changes, there are almost no references to
unsigned char in the main refs code.

The series has not been rebased on master since the last submission, but
I can do so if that's more convenient.

This series is available from the following URL:
https://github.com/bk2204/git.git object-id-part10

Changes from v1:
* Fix line wrapping in several places.
* Remove empty line.
* Update die messages to refer to "object ID" instead of "sha1".

brian m. carlson (24):
  walker: convert to struct object_id
  refs/files-backend: convert struct ref_to_prune to object_id
  refs: convert delete_ref and refs_delete_ref to struct object_id
  refs: convert update_ref and refs_update_ref to use struct object_id
  refs: update ref transactions to use struct object_id
  Convert check_connected to use struct object_id
  refs: convert resolve_refdup and refs_resolve_refdup to struct
object_id
  refs: convert read_ref and read_ref_full to object_id
  refs: convert dwim_ref and expand_ref to struct object_id
  builtin/reflog: convert remaining unsigned char uses to object_id
  refs: convert dwim_log to struct object_id
  pack-bitmap: convert traverse_bitmap_commit_list to object_id
  builtin/pack-objects: convert to struct object_id
  refs: convert peel_ref to struct object_id
  refs: convert read_ref_at to struct object_id
  refs: convert reflog_expire parameter to struct object_id
  sha1_file: convert index_path and index_fd to struct object_id
  Convert remaining callers of resolve_gitlink_ref to object_id
  refs: convert resolve_gitlink_ref to struct object_id
  worktree: convert struct worktree to object_id
  refs: convert resolve_ref_unsafe to struct object_id
  refs: convert peel_object to struct object_id
  refs: convert read_raw_ref backends to struct object_id
  refs/files-backend: convert static functions to object_id

 archive.c   |   2 +-
 bisect.c|   5 +-
 blame.c |   4 +-
 branch.c|   4 +-
 builtin/am.c|  16 ++--
 builtin/branch.c|   8 +-
 builtin/checkout.c  |  13 ++-
 builtin/clone.c |  22 ++---
 builtin/commit.c|   4 +-
 builtin/describe.c  |   2 +-
 builtin/fast-export.c   |   2 +-
 builtin/fetch.c |   8 +-
 builtin/fmt-merge-msg.c |   2 +-
 builtin/fsck.c  |   2 +-
 builtin/log.c   |   2 +-
 builtin/merge-base.c|   2 +-
 builtin/merge.c |  17 ++--
 builtin/notes.c |  12 +--
 builtin/pack-objects.c  | 139 ++-
 builtin/pull.c  |   2 +-
 builtin/receive-pack.c  |  16 ++--
 builtin/reflog.c|  18 ++--
 builtin/remote.c|   2 +-
 builtin/replace.c   |   8 +-
 builtin/reset.c |   6 +-
 builtin/rev-list.c  |   4 +-
 builtin/rev-parse.c |   2 +-
 builtin/show-branch.c   |  12 +--
 builtin/show-ref.c  |   4 +-
 builtin/submodule--helper.c |   2 +-
 builtin/tag.c   |   8 +-
 builtin/update-index.c  |  10 +-
 builtin/update-ref.c|  12 +--
 builtin/worktree.c  |   6 +-
 bundle.c|   4 +-
 combine-diff.c  |   2 +-
 connected.c |  18 ++--
 connected.h |   4 +-
 diff-lib.c  |   4 +-
 dir.c   |   8 +-
 fast-import.c   |   6 +-
 notes-cache.c   |   4 +-
 notes-merge.c   |   2 +-
 notes-utils.c   |   4 +-
 notes.c |   2 +-
 pack-bitmap.c   |   8 +-
 pack-bitmap.h   |   2 +-
 read-cache.c|   6 +-
 ref-filter.c|   4 +-
 reflog-walk.c   |   6 +-
 refs.c  | 229 +---
 refs.h  |  75 +++
 refs/files-backend.c| 118 +++
 refs/packed-backend.c   |  14 +--
 refs/ref-cache.c|   2 +-
 refs/refs-internal.h|  22 ++---
 remote-testsvn.c|   2 +-
 remote.c|   9 +-
 sequencer.c |  15 ++-
 sha1_file.c |  32 +++
 sha1_name.c |  10 +-
 submodule.c |   2 +-
 t/helper/test-ref-store.c   |  28 +++---
 transport-helper.c  |  15 ++-
 transport.c |   6 +-
 unpack-trees.c  |   8 +-
 upload-pack.c   |   4 +-
 walker.c|  24 ++---
 worktree.c  |   2 +-
 worktree.h  |   2 +-
 wt-status.c |   4 +-
 71 files changed, 533 insertions(+), 552 deletions(-)

-- 
2.14.2.920.gcf0c67979c