From: Thomas Gummerer <t.gummerer@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: [PATCH v5 13/34] directory rename detection: tests for handling overwriting untracked files
Date: Fri, 5 Jan 2018 20:31:51 +0000 [thread overview]
Message-ID: <20180105203151.GA24806@hank> (raw)
In-Reply-To: <CABPp-BH66p1MU0Ry0LRcSpr7yGZymqwrnBmMh239xO3rgShdcw@mail.gmail.com>
On 01/04, Elijah Newren wrote:
> On Wed, Jan 3, 2018 at 5:52 PM, SZEDER Gábor <szeder.dev@gmail.com> wrote:
>
> >> + test $(git rev-parse :0:y/b) = $(git rev-parse O:z/b) &&
> >
> > There is a test helper for that :)
> >
> > test_cmp_rev :0:y/b O:z/b
> >
> > Note, that this is not only a matter of useful output on failure, but
> > also that of correctness and robustness.
>
>
> Cool, good to know. Is there any reason test_cmp_rev is not
> documented in t/README?
It is documented since a few weeks, I added the docs in 5a0526264b
("t/README: document test_cmp_rev", 2017-11-26). Though as people
mention they just look in 't/test-lib-functions.sh' anyway, maybe the
docs should live there instead of in the README in the first place?
> [...]
next prev parent reply other threads:[~2018-01-05 20:29 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-28 4:13 [PATCH v5 00/34] Add directory rename detection to git Elijah Newren
2017-12-28 4:13 ` [PATCH v5 01/34] Tighten and correct a few testcases for merging and cherry-picking Elijah Newren
2017-12-28 4:13 ` [PATCH v5 02/34] merge-recursive: fix logic ordering issue Elijah Newren
2017-12-28 4:13 ` [PATCH v5 03/34] merge-recursive: add explanation for src_entry and dst_entry Elijah Newren
2017-12-28 4:13 ` [PATCH v5 04/34] directory rename detection: basic testcases Elijah Newren
2018-01-03 1:18 ` SZEDER Gábor
2018-01-03 3:43 ` Elijah Newren
2017-12-28 4:13 ` [PATCH v5 05/34] directory rename detection: directory splitting testcases Elijah Newren
2017-12-28 4:13 ` [PATCH v5 06/34] directory rename detection: testcases to avoid taking detection too far Elijah Newren
2017-12-28 4:13 ` [PATCH v5 07/34] directory rename detection: partially renamed directory testcase/discussion Elijah Newren
2017-12-28 4:13 ` [PATCH v5 08/34] directory rename detection: files/directories in the way of some renames Elijah Newren
2017-12-28 4:13 ` [PATCH v5 09/34] directory rename detection: testcases checking which side did the rename Elijah Newren
2017-12-28 4:13 ` [PATCH v5 10/34] directory rename detection: more involved edge/corner testcases Elijah Newren
2017-12-28 4:13 ` [PATCH v5 11/34] directory rename detection: testcases exploring possibly suboptimal merges Elijah Newren
2017-12-28 4:13 ` [PATCH v5 12/34] directory rename detection: miscellaneous testcases to complete coverage Elijah Newren
2017-12-28 4:13 ` [PATCH v5 13/34] directory rename detection: tests for handling overwriting untracked files Elijah Newren
2018-01-04 0:52 ` SZEDER Gábor
2018-01-04 21:10 ` Elijah Newren
2018-01-05 14:37 ` SZEDER Gábor
2018-01-05 20:31 ` Thomas Gummerer [this message]
2018-01-05 20:33 ` Elijah Newren
2017-12-28 4:13 ` [PATCH v5 14/34] directory rename detection: tests for handling overwriting dirty files Elijah Newren
2017-12-28 4:13 ` [PATCH v5 15/34] merge-recursive: move the get_renames() function Elijah Newren
2017-12-28 4:13 ` [PATCH v5 16/34] merge-recursive: introduce new functions to handle rename logic Elijah Newren
2017-12-28 4:13 ` [PATCH v5 17/34] merge-recursive: fix leaks of allocated renames and diff_filepairs Elijah Newren
2017-12-28 4:13 ` [PATCH v5 18/34] merge-recursive: make !o->detect_rename codepath more obvious Elijah Newren
2017-12-28 4:13 ` [PATCH v5 19/34] merge-recursive: split out code for determining diff_filepairs Elijah Newren
2017-12-28 4:13 ` [PATCH v5 20/34] merge-recursive: add a new hashmap for storing directory renames Elijah Newren
2017-12-28 4:13 ` [PATCH v5 21/34] merge-recursive: make a helper function for cleanup for handle_renames Elijah Newren
2017-12-28 4:13 ` [PATCH v5 22/34] merge-recursive: add get_directory_renames() Elijah Newren
2017-12-28 4:13 ` [PATCH v5 23/34] merge-recursive: check for directory level conflicts Elijah Newren
2017-12-28 4:13 ` [PATCH v5 24/34] merge-recursive: add a new hashmap for storing file collisions Elijah Newren
2017-12-28 4:13 ` [PATCH v5 25/34] merge-recursive: add computation of collisions due to dir rename & merging Elijah Newren
2017-12-28 4:13 ` [PATCH v5 26/34] merge-recursive: check for file level conflicts then get new name Elijah Newren
2017-12-28 4:13 ` [PATCH v5 27/34] merge-recursive: when comparing files, don't include trees Elijah Newren
2017-12-28 4:13 ` [PATCH v5 28/34] merge-recursive: apply necessary modifications for directory renames Elijah Newren
2017-12-28 4:13 ` [PATCH v5 29/34] merge-recursive: avoid clobbering untracked files with " Elijah Newren
2017-12-28 4:13 ` [PATCH v5 30/34] merge-recursive: fix overwriting dirty files involved in renames Elijah Newren
2017-12-28 4:13 ` [PATCH v5 31/34] merge-recursive: fix remaining directory rename + dirty overwrite cases Elijah Newren
2017-12-28 4:13 ` [PATCH v5 32/34] directory rename detection: new testcases showcasing a pair of bugs Elijah Newren
2017-12-28 4:13 ` [PATCH v5 33/34] merge-recursive: avoid spurious rename/rename conflict from dir renames Elijah Newren
2017-12-28 4:13 ` [PATCH v5 34/34] merge-recursive: ensure we write updates for directory-renamed file Elijah Newren
2018-01-03 0:02 ` [PATCH v5 00/34] Add directory rename detection to git Elijah Newren
2018-01-03 10:57 ` Johannes Sixt
2018-01-03 21:02 ` Elijah Newren
2018-01-03 22:23 ` Johannes Sixt
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=20180105203151.GA24806@hank \
--to=t.gummerer@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=szeder.dev@gmail.com \
/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).