aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-03 12:32:35 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-03 12:32:35 -0700
commit3967c995eed9f4046a1dde5ef520d1dbcdedfab8 (patch)
tree3d4d615a457d845a3b0dd15f6b4d3ad4dc5d3f60
parent1030536153db404daba4a140d1e3fa1a7ba470a5 (diff)
parent6e7d0efa9058aa61147d9d18b33bd046055584e4 (diff)
downloadgit-3967c995eed9f4046a1dde5ef520d1dbcdedfab8.tar.gz
git-3967c995eed9f4046a1dde5ef520d1dbcdedfab8.tar.xz
Merge branch 'jc/maint-rev-list-culled-boundary' into maint
* jc/maint-rev-list-culled-boundary: list-objects.c: don't add an unparsed NULL as a pending tree Conflicts: list-objects.c
-rw-r--r--list-objects.c7
-rwxr-xr-xt/t6110-rev-list-sparse.sh27
2 files changed, 33 insertions, 1 deletions
diff --git a/list-objects.c b/list-objects.c
index 8953548c0..44fa5a92e 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -148,7 +148,12 @@ void traverse_commit_list(struct rev_info *revs,
struct commit *commit;
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++) {
diff --git a/t/t6110-rev-list-sparse.sh b/t/t6110-rev-list-sparse.sh
new file mode 100755
index 000000000..2a267e84c
--- /dev/null
+++ b/t/t6110-rev-list-sparse.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+test_description='operations that cull histories in unusual ways'
+. ./test-lib.sh
+
+test_commit () {
+ echo "$1" >"$1.file" &&
+ git add "$1.file" &&
+ test_tick &&
+ git commit -m "$1"
+}
+
+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