Commit ecfff807e1145877b3360f07915ef8e3af0e2751
2020-09-23T19:10:15
add an xfail test for a histedit issue where a deleted file remains If a previous commit introduces a new file, and it is folded into a commit that deletes the same file, the file still exists after the histedit. reported by jrick on freenode
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108
diff --git a/regress/cmdline/histedit.sh b/regress/cmdline/histedit.sh
index 75c5017..d3da701 100755
--- a/regress/cmdline/histedit.sh
+++ b/regress/cmdline/histedit.sh
@@ -1340,6 +1340,98 @@ test_histedit_duplicate_commit_in_script() {
}
+# if a previous commit introduces a new file, and it is folded into a commit
+# that deletes the same file, the file still exists after the histedit
+test_histedit_fold_add_delete() {
+ local testroot=`test_init histedit_fold`
+
+ local orig_commit=`git_show_head $testroot/repo`
+
+ echo "added new file epsilon/psi" > $testroot/repo/epsilon/psi
+ (cd $testroot/repo && git add epsilon/psi)
+ git_commit $testroot/repo -m "committing changes"
+ local old_commit1=`git_show_head $testroot/repo`
+
+ echo "modified epsilon/psi" > $testroot/repo/epsilon/psi
+ git_commit $testroot/repo -m "editing psi"
+ local old_commit2=`git_show_head $testroot/repo`
+
+ (cd $testroot/repo && git rm -q epsilon/psi)
+ git_commit $testroot/repo -m "removing psi"
+ local old_commit3=`git_show_head $testroot/repo`
+
+ got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ echo "fold $old_commit1" > $testroot/histedit-script
+ echo "fold $old_commit2" >> $testroot/histedit-script
+ echo "pick $old_commit3" >> $testroot/histedit-script
+ echo "mesg folded changes" >> $testroot/histedit-script
+
+ (cd $testroot/wt && got histedit -F $testroot/histedit-script \
+ > $testroot/stdout)
+
+ local new_commit1=`git_show_head $testroot/repo`
+
+ local short_old_commit1=`trim_obj_id 28 $old_commit1`
+ local short_old_commit2=`trim_obj_id 28 $old_commit2`
+ local short_old_commit3=`trim_obj_id 28 $old_commit3`
+ local short_new_commit1=`trim_obj_id 28 $new_commit1`
+
+ echo "A epsilon/psi" >> $testroot/stdout.expected
+ echo "$short_old_commit1 -> fold commit: committing changes" \
+ >> $testroot/stdout.expected
+ echo "G epsilon/psi" >> $testroot/stdout.expected
+ echo "$short_old_commit2 -> fold commit: editing psi" \
+ >> $testroot/stdout.expected
+ echo "d epsilon/psi" >> $testroot/stdout.expected
+ echo "$short_old_commit3 -> $short_new_commit1: folded changes" \
+ >> $testroot/stdout.expected
+ echo "Switching work tree to refs/heads/master" \
+ >> $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
+
+ if [ -e $testroot/wt/epsilon/psi ]; then
+ #echo "removed file psi still exists on disk" >&2
+ ret="xfail: removed file psi still exists on disk"
+ 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
+
+ (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
+ echo "commit $new_commit1 (master)" > $testroot/stdout.expected
+ echo "commit $orig_commit" >> $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"
+}
+
+
test_parseargs "$@"
run_test test_histedit_no_op
run_test test_histedit_swap
@@ -1355,3 +1447,4 @@ run_test test_histedit_outside_refs_heads
run_test test_histedit_fold_last_commit_swap
run_test test_histedit_split_commit
run_test test_histedit_duplicate_commit_in_script
+run_test test_histedit_fold_add_delete