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

[PATCH 1/2] annotate: Support annotation of files on other revisions.

From
RARyan Anderson <ryan@michonline.com>
Date
Jul 4, 2006, 01:30 UTC
Message-ID
<11519766033852-git-send-email-ryan@michonline.com>
In-Reply-To
<11519766021208-git-send-email-ryan@michonline.com>

This is a bug fix, and cleans up one or two other things spotted during the course of tracking down the main bug here.

Also, the test-suite is updated to reflect this case.
Signed-off-by: Ryan Anderson <ryan@michonline.com>
(cherry picked from 2f7554b4db3ab2c2d3866b160245c91c9236fc9a commit)
---
 t/t8001-annotate.sh |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/t/t8001-annotate.sh b/t/t8001-annotate.sh
index 2496397..70e2ad2 100755
--- a/t/t8001-annotate.sh
+++ b/t/t8001-annotate.sh
@@ -6,4 +6,10 @@ test_description='git-annotate'
 PROG='git annotate'
 . ../annotate-tests.sh
 
+test_expect_success \
+    'Annotating an old revision works' \
+    '[ $(git annotate file master | awk "{print \$3}" | grep -c "^A$") == 2 ] && \
+     [ $(git annotate file master | awk "{print \$3}" | grep -c "^B$") == 2 ]'
+
+
 test_done
-- 
1.4.1.g8fced
Previous: Ryan AndersonNext: Ryan Anderson
Message 2 of 6 in “Fix handling of merges in git-annotate”
  1. 0/2 Fix handling of merges in git-annotateRyan Anderson, Jul 4, 2006
  2. 1/2 annotate: Support annotation of files on other revisions.Ryan Anderson, Jul 4, 2006
  3. 2/2 annotate: Correct most merge following to annotate correctly.Ryan Anderson, Jul 4, 2006
  4. t8001-annotate: fix a bash-ism in this testEric Wong, Jul 4, 2006
  5. Junio C HamanoJul 4, 2006
  6. Ryan AndersonJul 4, 2006

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.