Re: [PATCH] replace: fix replacing object with itself
- From
Jeff King <peff@peff.net>
- Date
- Nov 11, 2014, 03:03 UTC
- Message-ID
- <20141111030341.GC21328@peff.net>
- In-Reply-To
- <1415661656-3657-1-git-send-email-manzurmm@gmail.com>
On Tue, Nov 11, 2014 at 12:20:56AM +0100, Manzur Mukhitdinov wrote:
Show 5 quoted lines
> When object is replaced with itself git shows unhelpful messages like(git log): > "fatal: replace depth too high for object <SHA1>" > > Prevents user from replacing object with itself(with test for checking > this case).
Thanks, this looks good to me.
Show 7 quoted lines
> +test_expect_success 'replacing object with itself must fail' ' > + test_must_fail git replace $HASH1 $HASH1 && > + HASH8=$(git rev-parse --verify HEAD) && > + test_must_fail git replace HEAD $HASH8 && > + test_must_fail git replace --graft HEAD HEAD^ && > + test_must_fail env GIT_EDITOR=true git replace --edit HEAD > +'
I think some of these overlap with earlier tests (I know that the "--edit" case is checked already), but I think it is nice to keep the related checks together here.
Should we maybe squash this in to drop the now redundant test (AFAICT, that is the only one that overlaps)?
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 98ac9dd..5f96374 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -369,9 +369,8 @@ test_expect_success '--edit with and without already replaced object' ' git cat-file commit "$PARA3" | grep "A fake Thor" ' -test_expect_success '--edit and change nothing or command failed' ' +test_expect_success '--edit with failed editor' ' git replace -d "$PARA3" && - test_must_fail env GIT_EDITOR=true git replace --edit "$PARA3" && test_must_fail env GIT_EDITOR="./fakeeditor;false" git replace --edit "$PARA3" && GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" && git replace -l | grep "$PARA3" &&