git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 1/2] Test case that demonstrates problem with --merge-order ^ processing

From
Jon Seymour <jon.seymour@gmail.com>
Date
Jun 29, 2005, 23:45 UTC
Message-ID
<20050629234530.28690.qmail@blackcubes.dyndns.org>

Added a test case that shows that --merge-order doesn't produce the correct result in the following case.

A
|
| B
|/
C
|
D

git-rev-list --merge-order A ^B should produce just A. Instead it produces BCD.

A subsequent patch will fix this defect.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
 t/t6001-rev-list-merge-order.sh |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
444e7b2e2491309cd7101bd48881743a35837a56
diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
--- a/t/t6001-rev-list-merge-order.sh
+++ b/t/t6001-rev-list-merge-order.sh
@@ -543,6 +543,11 @@ test_output_expect_success 'simple merge
 = alt_root
 EOF
 
+test_output_expect_success "don't print things unreachable from one branch" "git-rev-list a3 ^b3 --merge-order" <<EOF
+a3
+a2
+a1
+EOF
 
 #
 #
------------
Message 1 of 1 in “Test case that demonstrates problem with --merge-order ^ processing”
  1. 1/2 Test case that demonstrates problem with --merge-order ^ processingJon Seymour, Jun 29, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.