mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-log-first-parent-pathspec'

Browse Source 
* jc/maint-log-first-parent-pathspec:
  Making pathspec limited log play nicer with --first-parent
This commit is contained in:
Junio C Hamano
2012-01-29 13:18:54 -08:00
parent a734e7ef6c 36ed1913e1
commit 731218c18f
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
revision.c
View File

@ -416,7 +416,7 @@ static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit) static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
{ {
struct commit_list **pp, *parent; struct commit_list **pp, *parent;
int tree_changed = 0, tree_same = 0; int tree_changed = 0, tree_same = 0, nth_parent = 0;
/* /*
* If we don't do pruning, everything is interesting * If we don't do pruning, everything is interesting
@ -444,6 +444,14 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
while ((parent = *pp) != NULL) { while ((parent = *pp) != NULL) {
struct commit *p = parent->item; struct commit *p = parent->item;
/*
* Do not compare with later parents when we care only about
* the first parent chain, in order to avoid derailing the
* traversal to follow a side branch that brought everything
* in the path we are limited to by the pathspec.
*/
if (revs->first_parent_only && nth_parent++)
break;
if (parse_commit(p) < 0) if (parse_commit(p) < 0)
die("cannot simplify commit %s (because of %s)", die("cannot simplify commit %s (because of %s)",
sha1_to_hex(commit->object.sha1), sha1_to_hex(commit->object.sha1),

1
t/t6012-rev-list-simplify.sh
View File

@ -86,5 +86,6 @@ check_result 'I H E C B A' --full-history --date-order -- file
check_result 'I E C B A' --simplify-merges -- file check_result 'I E C B A' --simplify-merges -- file
check_result 'I B A' -- file check_result 'I B A' -- file
check_result 'I B A' --topo-order -- file check_result 'I B A' --topo-order -- file
check_result 'H' --first-parent -- another-file
test_done test_done