From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Nov 2015 23:13:09 +0000 (-0800)
Subject: Merge branch 'mk/blame-first-parent'
X-Git-Tag: v2.7.0-rc0~42
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6784eb5ad93da15d24a5d111a3d6df618f98532f

Merge branch 'mk/blame-first-parent'

"git blame" learnt to take "--first-parent" and "--reverse" at the
same time when it makes sense.

* mk/blame-first-parent:
blame: allow blame --reverse --first-parent when it makes sense
blame: extract find_single_final
blame: test to describe use of blame --reverse --first-parent
---

6784eb5ad93da15d24a5d111a3d6df618f98532f
diff --cc builtin/blame.c
index 3b80e8fd75,861a5372b9..83612f5b64
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@@ -2691,9 -2689,7 +2697,7 @@@ parse_done
  		sb.commits.compare = compare_commits_by_commit_date;
  	}
  	else if (contents_from)
 -		die("--contents and --children do not blend well.");
 +		die("--contents and --reverse do not blend well.");
- 	else if (revs.first_parent_only)
- 		die("combining --first-parent and --reverse is not supported");
  	else {
  		final_commit_name = prepare_initial(&sb);
  		sb.commits.compare = compare_commits_by_reverse_commit_date;