From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Jun 2016 16:56:49 +0000 (-0700)
Subject: Merge branch 'jc/deref-tag'
X-Git-Tag: v2.10.0-rc0~178
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2a5618ec78c5689295fa7feae590823df606f3b3?hp=--cc

Merge branch 'jc/deref-tag'

Code clean-up.

* jc/deref-tag:
blame, line-log: do not loop around deref_tag()
---

2a5618ec78c5689295fa7feae590823df606f3b3
diff --cc builtin/blame.c
index 759d84affb,0136dfcffa..e5deb9c67f
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@@ -2425,26 -2400,17 +2425,25 @@@ static struct commit *find_single_final
  		struct object *obj = revs->pending.objects[i].item;
  		if (obj->flags & UNINTERESTING)
  			continue;
- 		while (obj->type == OBJ_TAG)
- 			obj = deref_tag(obj, NULL, 0);
+ 		obj = deref_tag(obj, NULL, 0);
  		if (obj->type != OBJ_COMMIT)
  			die("Non commit %s?", revs->pending.objects[i].name);
 -		if (sb->final)
 +		if (found)
  			die("More than one commit to dig from %s and %s?",
 -			    revs->pending.objects[i].name,
 -			    final_commit_name);
 -		sb->final = (struct commit *) obj;
 -		final_commit_name = revs->pending.objects[i].name;
 +			    revs->pending.objects[i].name, name);
 +		found = (struct commit *)obj;
 +		name = revs->pending.objects[i].name;
  	}
 -	return xstrdup_or_null(final_commit_name);
 +	if (name_p)
 +		*name_p = name;
 +	return found;
 +}
 +
 +static char *prepare_final(struct scoreboard *sb)
 +{
 +	const char *name;
 +	sb->final = find_single_final(sb->revs, &name);
 +	return xstrdup_or_null(name);
  }
  
  static char *prepare_initial(struct scoreboard *sb)