git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Yasushi SHOJI <yasushi.shoji@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] bisect: debug: convert struct object to object_id
Date: Tue, 09 Jan 2018 10:57:33 -0800
Message-ID: <xmqqr2qy6esi.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20180109110356.25824-1-yasushi.shoji@gmail.com>

Yasushi SHOJI <yasushi.shoji@gmail.com> writes:

> The commit f2fd0760f62e79609fef7bfd7ecebb002e8e4ced converted struct
> object to object_id but a debug function show_list(), which is
> ifdef'ed to noop, in bisect.c wasn't.
>
> So fix it.
>
> Signed-off-by: Yasushi SHOJI <Yasushi.SHOJI@gmail.com>
> ---

Thanks.  That's quite an old breakage ;-)



>  bisect.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/bisect.c b/bisect.c
> index 3756f127b..0dd0f289a 100644
> --- a/bisect.c
> +++ b/bisect.c
> @@ -132,7 +132,7 @@ static void show_list(const char *debug, int counted, int nr,
>  		unsigned flags = commit->object.flags;
>  		enum object_type type;
>  		unsigned long size;
> -		char *buf = read_sha1_file(commit->object.sha1, &type, &size);
> +		char *buf = read_sha1_file(commit->object.oid.hash, &type, &size);
>  		const char *subject_start;
>  		int subject_len;
>  
> @@ -144,10 +144,10 @@ static void show_list(const char *debug, int counted, int nr,
>  			fprintf(stderr, "%3d", weight(p));
>  		else
>  			fprintf(stderr, "---");
> -		fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.sha1));
> +		fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.oid.hash));
>  		for (pp = commit->parents; pp; pp = pp->next)
>  			fprintf(stderr, " %.*s", 8,
> -				sha1_to_hex(pp->item->object.sha1));
> +				sha1_to_hex(pp->item->object.oid.hash));
>  
>  		subject_len = find_commit_subject(buf, &subject_start);
>  		if (subject_len)

  reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-09 11:03 Yasushi SHOJI
2018-01-09 18:57 ` Junio C Hamano [this message]
2018-01-11  2:08 ` brian m. carlson

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqr2qy6esi.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=yasushi.shoji@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox