author | Junio C Hamano <gitster@pobox.com> | |
Sun, 3 Apr 2011 19:32:35 +0000 (12:32 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 3 Apr 2011 19:32:35 +0000 (12:32 -0700) |
* jc/maint-rev-list-culled-boundary:
list-objects.c: don't add an unparsed NULL as a pending tree
Conflicts:
list-objects.c
list-objects.c: don't add an unparsed NULL as a pending tree
Conflicts:
list-objects.c
list-objects.c | patch | blob | history | |
t/t6110-rev-list-sparse.sh | [new file with mode: 0755] | patch | blob |
diff --git a/list-objects.c b/list-objects.c
index 8953548c07bb36f20798c7ca344d07960c22618c..44fa5a92e29815cbee54f9954c2ceac8e1262811 100644 (file)
--- a/list-objects.c
+++ b/list-objects.c
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
--- /dev/null
@@ -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