mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-07 17:46:10 +02:00
Code

Merge branch 'jc/maint-rev-list-culled-boundary' 

* jc/maint-rev-list-culled-boundary:
  list-objects.c: don't add an unparsed NULL as a pending tree

Conflicts:
	list-objects.c
This commit is contained in:
Junio C Hamano 2011-03-22 21:37:59 -07:00
parent 91b3c7ce8e 6e7d0efa90
commit 4b28cd9f2f
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
list-objects.c
View File

@ -173,7 +173,12 @@ void traverse_commit_list(struct rev_info *revs,
strbuf_init(&base, PATH_MAX);
while ((commit = get_revision(revs)) != NULL) {
add_pending_tree(revs, commit->tree);
/*
* an uninteresting boundary commit may not have its tree
* parsed yet, but we are not going to show them anyway
*/
if (commit->tree)
add_pending_tree(revs, commit->tree);
show_commit(commit, data);
}
for (i = 0; i < revs->pending.nr; i++) {

20
t/t6110-rev-list-sparse.sh Executable file
View File

@ -0,0 +1,20 @@
#!/bin/sh
test_description='operations that cull histories in unusual ways'
. ./test-lib.sh
test_expect_success setup '
test_commit A &&
test_commit B &&
test_commit C &&
git checkout -b side HEAD^ &&
test_commit D &&
test_commit E &&
git merge master
'
test_expect_success 'rev-list --first-parent --boundary' '
git rev-list --first-parent --boundary HEAD^..
'
test_done