git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 1/6] t4008: correct stale comments
Date: Sun, 15 Feb 2015 15:43:39 -0800	[thread overview]
Message-ID: <1424043824-25242-2-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1424043824-25242-1-git-send-email-gitster@pobox.com>

A complete rewrite of a single file was originally designed to be
expressed as a deletion immediately followed by a creation of the
same file, and the comments in the test updated here were written to
reflect that design decision made in f345b0a0 (Add -B flag to diff-*
brothers., 2005-05-30).  However, we later realized that a complete
rewrite is merely how a textual diff should be represented at
366175ef (Rework -B output., 2005-06-19), and updated the actual
tests.  But we forgot to update the introductory text while doing
so.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t4008-diff-break-rewrite.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/t/t4008-diff-break-rewrite.sh b/t/t4008-diff-break-rewrite.sh
index 8920464..a4e771b 100755
--- a/t/t4008-diff-break-rewrite.sh
+++ b/t/t4008-diff-break-rewrite.sh
@@ -10,14 +10,14 @@ We have two very different files, file0 and file1, registered in a tree.
 We update file1 so drastically that it is more similar to file0, and
 then remove file0.  With -B, changes to file1 should be broken into
 separate delete and create, resulting in removal of file0, removal of
-original file1 and creation of completely rewritten file1.
+original file1 and creation of completely rewritten file1.  The latter
+two are then merged back into a single "complete rewrite".
 
 Further, with -B and -M together, these three modifications should
 turn into rename-edit of file0 into file1.
 
 Starting from the same two files in the tree, we swap file0 and file1.
-With -B, this should be detected as two complete rewrites, resulting in
-four changes in total.
+With -B, this should be detected as two complete rewrites.
 
 Further, with -B and -M together, these should turn into two renames.
 '
-- 
2.3.0-266-g5b48884

  reply	other threads:[~2015-02-15 23:44 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-15 23:43 [PATCH 0/6] test updates around diff Junio C Hamano
2015-02-15 23:43 ` Junio C Hamano [this message]
2015-02-15 23:43 ` [PATCH 2/6] t9300: correct expected object names Junio C Hamano
2015-02-15 23:43 ` [PATCH 3/6] t4010: " Junio C Hamano
2015-02-15 23:43 ` [PATCH 4/6] tests: do not borrow from COPYING and README from the real source Junio C Hamano
2015-02-15 23:43 ` [PATCH 5/6] t/diff-lib: check exact object names in compare_diff_raw Junio C Hamano
2015-02-23 18:14   ` Johannes Sixt
2015-02-23 19:45     ` Junio C Hamano
2015-02-15 23:43 ` [PATCH 6/6] t4008: modernise style Junio C Hamano
2015-02-16  6:23 ` [PATCH 0/6] test updates around diff Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1424043824-25242-2-git-send-email-gitster@pobox.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).