From 1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 11 Jan 2020 23:36:56 +0000 Subject: Squashed 'third_party/git/' content from commit cb71568594 git-subtree-dir: third_party/git git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7 --- t/t2101-update-index-reupdate.sh | 91 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100755 t/t2101-update-index-reupdate.sh (limited to 't/t2101-update-index-reupdate.sh') diff --git a/t/t2101-update-index-reupdate.sh b/t/t2101-update-index-reupdate.sh new file mode 100755 index 000000000000..6c32d42c8c68 --- /dev/null +++ b/t/t2101-update-index-reupdate.sh @@ -0,0 +1,91 @@ +#!/bin/sh +# +# Copyright (c) 2006 Junio C Hamano +# + +test_description='git update-index --again test. +' + +. ./test-lib.sh + +test_expect_success 'update-index --add' ' + echo hello world >file1 && + echo goodbye people >file2 && + git update-index --add file1 file2 && + git ls-files -s >current && + cat >expected <<-EOF && + 100644 $(git hash-object file1) 0 file1 + 100644 $(git hash-object file2) 0 file2 + EOF + cmp current expected +' + +test_expect_success 'update-index --again' ' + rm -f file1 && + echo hello everybody >file2 && + if git update-index --again + then + echo should have refused to remove file1 + exit 1 + else + echo happy - failed as expected + fi && + git ls-files -s >current && + cmp current expected +' + +test_expect_success 'update-index --remove --again' ' + git update-index --remove --again && + git ls-files -s >current && + cat >expected <<-EOF && + 100644 $(git hash-object file2) 0 file2 + EOF + cmp current expected +' + +test_expect_success 'first commit' 'git commit -m initial' + +test_expect_success 'update-index again' ' + mkdir -p dir1 && + echo hello world >dir1/file3 && + echo goodbye people >file2 && + git update-index --add file2 dir1/file3 && + echo hello everybody >file2 && + echo happy >dir1/file3 && + git update-index --again && + git ls-files -s >current && + cat >expected <<-EOF && + 100644 $(git hash-object dir1/file3) 0 dir1/file3 + 100644 $(git hash-object file2) 0 file2 + EOF + cmp current expected +' + +file2=$(git hash-object file2) +test_expect_success 'update-index --update from subdir' ' + echo not so happy >file2 && + (cd dir1 && + cat ../file2 >file3 && + git update-index --again + ) && + git ls-files -s >current && + cat >expected <<-EOF && + 100644 $(git hash-object dir1/file3) 0 dir1/file3 + 100644 $file2 0 file2 + EOF + test_cmp expected current +' + +test_expect_success 'update-index --update with pathspec' ' + echo very happy >file2 && + cat file2 >dir1/file3 && + git update-index --again dir1/ && + git ls-files -s >current && + cat >expected <<-EOF && + 100644 $(git hash-object dir1/file3) 0 dir1/file3 + 100644 $file2 0 file2 + EOF + cmp current expected +' + +test_done -- cgit 1.4.1