#!/bin/sh # # Copyright (c) 2019 Stefan Sperling # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above # copyright notice and this permission notice appear in all copies. # # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. . ./common.sh function test_commit_basic { local testroot=`test_init commit_basic` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified alpha" > $testroot/wt/alpha (cd $testroot/wt && got rm beta >/dev/null) echo "new file" > $testroot/wt/new (cd $testroot/wt && got add new >/dev/null) (cd $testroot/wt && got commit -m 'test commit_basic' > $testroot/stdout) local head_rev=`git_show_head $testroot/repo` echo "A new" > $testroot/stdout.expected echo "M alpha" >> $testroot/stdout.expected echo "D beta" >> $testroot/stdout.expected echo "Created commit $head_rev" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_commit_new_subdir { local testroot=`test_init commit_new_subdir` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi mkdir -p $testroot/wt/d echo "new file" > $testroot/wt/d/new echo "another new file" > $testroot/wt/d/new2 (cd $testroot/wt && got add d/new >/dev/null) (cd $testroot/wt && got add d/new2 >/dev/null) (cd $testroot/wt && \ got commit -m 'test commit_new_subdir' > $testroot/stdout) local head_rev=`git_show_head $testroot/repo` echo "A d/new" > $testroot/stdout.expected echo "A d/new2" >> $testroot/stdout.expected echo "Created commit $head_rev" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_commit_subdir { local testroot=`test_init commit_subdir` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified alpha" > $testroot/wt/alpha echo "modified zeta" > $testroot/wt/epsilon/zeta (cd $testroot/wt && \ got commit -m 'test commit_subdir' epsilon > $testroot/stdout) local head_rev=`git_show_head $testroot/repo` echo "M epsilon/zeta" >> $testroot/stdout.expected echo "Created commit $head_rev" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_commit_single_file { local testroot=`test_init commit_single_file` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified alpha" > $testroot/wt/alpha echo "modified zeta" > $testroot/wt/epsilon/zeta (cd $testroot/wt && got commit -m 'changed zeta' epsilon/zeta \ > $testroot/stdout) local head_rev=`git_show_head $testroot/repo` echo "M epsilon/zeta" >> $testroot/stdout.expected echo "Created commit $head_rev" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_commit_out_of_date { local testroot=`test_init commit_out_of_date` local first_commit=`git_show_head $testroot/repo` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified alpha" > $testroot/repo/alpha git_commit $testroot/repo -m "modified alpha" echo "modified alpha" > $testroot/wt/alpha (cd $testroot/wt && got commit -m 'test commit_out_of_date' \ > $testroot/stdout 2> $testroot/stderr) echo -n > $testroot/stdout.expected echo "got: work tree must be updated before these" \ "changes can be committed" > $testroot/stderr.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi cmp -s $testroot/stderr.expected $testroot/stderr ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stderr.expected $testroot/stderr test_done "$testroot" "$ret" return 1 fi echo "alpha" > $testroot/repo/alpha git_commit $testroot/repo -m "reset alpha contents" (cd $testroot/wt && got update -c $first_commit > /dev/null) echo "modified alpha" > $testroot/wt/alpha (cd $testroot/wt && got commit -m 'changed alpha ' > $testroot/stdout) ret="$?" if [ "$ret" != "0" ]; then echo "commit failed unexpectedly" >&2 test_done "$testroot" "1" return 1 fi local head_rev=`git_show_head $testroot/repo` echo "M alpha" > $testroot/stdout.expected echo "Created commit $head_rev" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_commit_added_subdirs { local testroot=`test_init commit_added_subdirs` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi mkdir -p $testroot/wt/d echo "new file" > $testroot/wt/d/new echo "new file 2" > $testroot/wt/d/new2 mkdir -p $testroot/wt/d/f echo "new file 3" > $testroot/wt/d/f/new3 mkdir -p $testroot/wt/d/f/g echo "new file 4" > $testroot/wt/d/f/g/new4 (cd $testroot/wt && got add $testroot/wt/*/new* \ $testroot/wt/*/*/new* $testroot/wt/*/*/*/new* > /dev/null) (cd $testroot/wt && got commit -m 'test commit_added_subdirs' \ > $testroot/stdout 2> $testroot/stderr) local head_rev=`git_show_head $testroot/repo` echo "A d/f/g/new4" > $testroot/stdout.expected echo "A d/f/new3" >> $testroot/stdout.expected echo "A d/new" >> $testroot/stdout.expected echo "A d/new2" >> $testroot/stdout.expected echo "Created commit $head_rev" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_commit_deleted_subdirs { local testroot=`test_init commit_deleted_subdirs` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got rm -R $testroot/wt/{epsilon,gamma} >/dev/null) (cd $testroot/wt && got commit -m 'test commit_deleted_subdirs' \ > $testroot/stdout 2> $testroot/stderr) local head_rev=`git_show_head $testroot/repo` echo "D epsilon/zeta" > $testroot/stdout.expected echo "D gamma/delta" >> $testroot/stdout.expected echo "Created commit $head_rev" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi got tree -r $testroot/repo > $testroot/stdout echo "alpha" > $testroot/stdout.expected echo "beta" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_commit_rejects_conflicted_file { local testroot=`test_init commit_rejects_conflicted_file` local initial_rev=`git_show_head $testroot/repo` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified alpha" > $testroot/wt/alpha (cd $testroot/wt && got commit -m "modified alpha" >/dev/null) (cd $testroot/wt && got update -c $initial_rev > /dev/null) echo "modified alpha, too" > $testroot/wt/alpha echo "C alpha" > $testroot/stdout.expected echo -n "Updated to commit " >> $testroot/stdout.expected git_show_head $testroot/repo >> $testroot/stdout.expected echo >> $testroot/stdout.expected echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected (cd $testroot/wt && got update > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got commit -m 'commit it' > $testroot/stdout \ 2> $testroot/stderr) echo -n > $testroot/stdout.expected echo "got: cannot commit file in conflicted status" \ > $testroot/stderr.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi cmp -s $testroot/stderr.expected $testroot/stderr ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stderr.expected $testroot/stderr fi test_done "$testroot" "$ret" } function test_commit_single_file_multiple { local testroot=`test_init commit_single_file_multiple` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi for i in 1 2 3 4; do echo "modified alpha" >> $testroot/wt/alpha (cd $testroot/wt && \ got commit -m "changed alpha" > $testroot/stdout) local head_rev=`git_show_head $testroot/repo` echo "M alpha" > $testroot/stdout.expected echo "Created commit $head_rev" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi done test_done "$testroot" "0" } function test_commit_added_and_modified_in_same_dir { local testroot=`test_init commit_added_and_modified_in_same_dir` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified zeta" > $testroot/wt/epsilon/zeta echo "new file" > $testroot/wt/epsilon/new (cd $testroot/wt && got add epsilon/new >/dev/null) (cd $testroot/wt && got commit \ -m 'added and modified in same dir' > $testroot/stdout \ 2> $testroot/stderr) local head_rev=`git_show_head $testroot/repo` echo "A epsilon/new" > $testroot/stdout.expected echo "M epsilon/zeta" >> $testroot/stdout.expected echo "Created commit $head_rev" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_commit_path_prefix { local testroot=`test_init commit_path_prefix` local commit1=`git_show_head $testroot/repo` got checkout -p gamma $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified delta" > $testroot/wt/delta (cd $testroot/wt && got commit -m 'changed gamma/delta' > $testroot/stdout) local commit2=`git_show_head $testroot/repo` echo "M delta" > $testroot/stdout.expected echo "Created commit $commit2" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo "diff $commit1 $commit2" > $testroot/stdout.expected echo -n 'blob - ' >> $testroot/stdout.expected got tree -r $testroot/repo -c $commit1 -i gamma | grep 'delta$' \ | cut -d' ' -f 1 >> $testroot/stdout.expected echo -n 'blob + ' >> $testroot/stdout.expected got tree -r $testroot/repo -c $commit2 -i gamma | grep 'delta$' | \ cut -d' ' -f 1 >> $testroot/stdout.expected echo '--- gamma/delta' >> $testroot/stdout.expected echo '+++ gamma/delta' >> $testroot/stdout.expected echo '@@ -1 +1 @@' >> $testroot/stdout.expected echo '-delta' >> $testroot/stdout.expected echo '+modified delta' >> $testroot/stdout.expected got diff -r $testroot/repo $commit1 $commit2 > $testroot/stdout cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_commit_dir_path { local testroot=`test_init commit_dir_path` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified alpha" > $testroot/wt/alpha echo "modified zeta" > $testroot/wt/epsilon/zeta (cd $testroot/wt && got commit -m 'changed zeta' epsilon \ > $testroot/stdout) local head_rev=`git_show_head $testroot/repo` echo "M epsilon/zeta" >> $testroot/stdout.expected echo "Created commit $head_rev" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo "M alpha" > $testroot/stdout.expected (cd $testroot/wt && got status > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_commit_selected_paths { local testroot=`test_init commit_selected_paths` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified alpha" > $testroot/wt/alpha echo "modified delta" > $testroot/wt/gamma/delta echo "modified zeta" > $testroot/wt/epsilon/zeta (cd $testroot/wt && got rm beta >/dev/null) echo "new file" > $testroot/wt/new (cd $testroot/wt && got add new >/dev/null) (cd $testroot/wt && got commit -m 'many paths' nonexistent alpha \ > $testroot/stdout 2> $testroot/stderr) ret="$?" if [ "$ret" == "0" ]; then echo "commit succeeded unexpectedly" >&2 test_done "$testroot" "1" return 1 fi echo "got: nonexistent: bad path" > $testroot/stderr.expected cmp -s $testroot/stderr.expected $testroot/stderr ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stderr.expected $testroot/stderr test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got commit -m 'many paths' \ beta new gamma > $testroot/stdout) local head_rev=`git_show_head $testroot/repo` echo "A new" > $testroot/stdout.expected echo "D beta" >> $testroot/stdout.expected echo "M gamma/delta" >> $testroot/stdout.expected echo "Created commit $head_rev" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_commit_outside_refs_heads { local testroot=`test_init commit_outside_refs_heads` got ref -r $testroot/repo -c master refs/remotes/origin/master got checkout -b refs/remotes/origin/master \ $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified alpha" > $testroot/wt/alpha (cd $testroot/wt && got commit -m 'change alpha' \ > $testroot/stdout 2> $testroot/stderr) ret="$?" if [ "$ret" == "0" ]; then echo "commit succeeded unexpectedly" >&2 test_done "$testroot" "1" return 1 fi echo -n > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi echo -n "got: will not commit to a branch outside the " \ > $testroot/stderr.expected echo '"refs/heads/" reference namespace' \ >> $testroot/stderr.expected cmp -s $testroot/stderr.expected $testroot/stderr ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stderr.expected $testroot/stderr fi test_done "$testroot" "$ret" } function test_commit_no_email { local testroot=`test_init commit_no_email` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "modified alpha" > $testroot/wt/alpha (cd $testroot/wt && env GOT_AUTHOR=":flan_hacker:" \ got commit -m 'test no email' > $testroot/stdout \ 2> $testroot/stderr) echo -n "got: GOT_AUTHOR environment variable contains no email " \ > $testroot/stderr.expected echo -n "address; an email address is required for compatibility "\ >> $testroot/stderr.expected echo "with Git" >> $testroot/stderr.expected cmp -s $testroot/stderr.expected $testroot/stderr ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stderr.expected $testroot/stderr test_done "$testroot" "$ret" return 1 fi echo -n > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_commit_tree_entry_sorting { local testroot=`test_init commit_tree_entry_sorting` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi # Git's index gets corrupted when tree entries are written in the # order defined by got_path_cmp() rather than Git's own ordering. # Create a new tree where a directory "got" and a file "got-version" # would sort in the wrong order according to Git's opinion. mkdir $testroot/wt/got touch $testroot/wt/got/foo echo foo > $testroot/wt/got-version echo zzz > $testroot/wt/zzz (cd $testroot/wt && got add got-version got/foo zzz > /dev/null) (cd $testroot/wt && got commit -m 'test' > /dev/null) # Let git-fsck verify the newly written tree to make sure Git is happy (cd $testroot/repo && git fsck --strict \ > $testroot/fsck.stdout 2> $testroot/fsck.stderr) ret="$?" test_done "$testroot" "$ret" } function test_commit_gitconfig_author { local testroot=`test_init commit_gitconfig_author` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi (cd $testroot/repo && git config user.name 'Flan Luck') (cd $testroot/repo && git config user.email 'flan_luck@openbsd.org') echo "modified alpha" > $testroot/wt/alpha (cd $testroot/wt && got commit -m 'test gitconfig author' > /dev/null) ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi (cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout) ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi echo "from: Flan Luck " \ > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function test_commit_xbit_change { local testroot=`test_init commit_xbit_change` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi chmod +x $testroot/wt/alpha echo 'm alpha' > $testroot/stdout.expected (cd $testroot/wt && got status > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got commit -mx > $testroot/stdout) ret="$?" if [ "$ret" != "0" ]; then echo "got commit failed unexpectedly" test_done "$testroot" "$ret" return 1 fi local commit_id=`git_show_head $testroot/repo` echo 'm alpha' > $testroot/stdout.expected echo "Created commit $commit_id" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got status > $testroot/stdout) echo -n > $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi chmod -x $testroot/wt/alpha echo 'm alpha' > $testroot/stdout.expected (cd $testroot/wt && got status > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi (cd $testroot/wt && got commit -mx > $testroot/stdout) ret="$?" if [ "$ret" != "0" ]; then echo "got commit failed unexpectedly" test_done "$testroot" "$ret" return 1 fi local commit_id=`git_show_head $testroot/repo` echo 'm alpha' > $testroot/stdout.expected echo "Created commit $commit_id" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" return 1 fi chmod +x $testroot/wt/alpha echo 'm alpha' > $testroot/stdout.expected (cd $testroot/wt && got status > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi test_done "$testroot" "$ret" } function commit_check_mode { local mode="$1" local expected_mode="$2" chmod 644 $testroot/wt/alpha echo a >> $testroot/wt/alpha chmod $mode $testroot/wt/alpha (cd $testroot/wt && got commit -mm > $testroot/stdout) ret="$?" if [ "$ret" != "0" ]; then echo "got commit failed unexpectedly" test_done "$testroot" "$ret" return 1 fi local commit_id=`git_show_head $testroot/repo` echo 'M alpha' > $testroot/stdout.expected echo "Created commit $commit_id" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout test_done "$testroot" "$ret" fi local tree_id=$(got cat -r $testroot/repo $commit_id | \ grep ^tree | cut -d' ' -f2) local alpha_id=$(got cat -r $testroot/repo $tree_id | \ grep 'alpha$' | cut -d' ' -f1) echo "$alpha_id $expected_mode alpha" > $testroot/stdout.expected got cat -r $testroot/repo $tree_id | grep 'alpha$' > $testroot/stdout cmp -s $testroot/stdout.expected $testroot/stdout ret="$?" if [ "$ret" != "0" ]; then diff -u $testroot/stdout.expected $testroot/stdout fi return $ret } function test_commit_normalizes_filemodes { local testroot=`test_init commit_normalizes_filemodes` got checkout $testroot/repo $testroot/wt > /dev/null ret="$?" if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi modes="600 400 460 640 440 660 444 666" for m in $modes; do commit_check_mode "$m" "0100644" ret="$?" if [ "$ret" != "0" ]; then break fi done if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi modes="700 500 570 750 550 770 555 777" for m in $modes; do commit_check_mode "$m" "0100755" ret="$?" if [ "$ret" != "0" ]; then break fi done if [ "$ret" != "0" ]; then test_done "$testroot" "$ret" return 1 fi test_done "$testroot" "$ret" } run_test test_commit_basic run_test test_commit_new_subdir run_test test_commit_subdir run_test test_commit_single_file run_test test_commit_out_of_date run_test test_commit_added_subdirs run_test test_commit_deleted_subdirs run_test test_commit_rejects_conflicted_file run_test test_commit_single_file_multiple run_test test_commit_added_and_modified_in_same_dir run_test test_commit_path_prefix run_test test_commit_dir_path run_test test_commit_selected_paths run_test test_commit_outside_refs_heads run_test test_commit_no_email run_test test_commit_tree_entry_sorting run_test test_commit_gitconfig_author run_test test_commit_xbit_change run_test test_commit_normalizes_filemodes