Commit 2c41dce749de6cee00ec5b611d0509f9e45f0fd7
2021-06-27T15:30:08
allow obstructed files skipped by 'got update' to be updated again
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 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136
diff --git a/lib/worktree.c b/lib/worktree.c
index 9cc4b32..515ea23 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -1947,6 +1947,8 @@ update_blob(struct got_worktree *worktree,
}
if (status == GOT_STATUS_OBSTRUCTED) {
+ if (ie)
+ got_fileindex_entry_mark_skipped(ie);
err = (*progress_cb)(progress_arg, status, path);
goto done;
}
diff --git a/regress/cmdline/update.sh b/regress/cmdline/update.sh
index 1869166..b75e01f 100755
--- a/regress/cmdline/update.sh
+++ b/regress/cmdline/update.sh
@@ -2572,6 +2572,113 @@ test_update_file_skipped_due_to_conflict() {
test_done "$testroot" "$ret"
}
+test_update_file_skipped_due_to_obstruction() {
+ local testroot=`test_init update_file_skipped_due_to_obstruction`
+ local commit_id0=`git_show_head $testroot/repo`
+ blob_id0=`get_blob_id $testroot/repo "" beta`
+
+ echo "changed beta" > $testroot/repo/beta
+ git_commit $testroot/repo -m "changed beta"
+ local commit_id1=`git_show_head $testroot/repo`
+ blob_id1=`get_blob_id $testroot/repo "" beta`
+
+ got checkout -c $commit_id0 $testroot/repo $testroot/wt > /dev/null
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
+ cut -d ':' -f 2 | tr -d ' ')`
+ if [ "$blob_id" != "$blob_id0" ]; then
+ echo "file beta has the wrong base blob ID" >&2
+ test_done "$testroot" "1"
+ return 1
+ fi
+
+ commit_id=`(cd $testroot/wt && got info beta | \
+ grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
+ if [ "$commit_id" != "$commit_id0" ]; then
+ echo "file beta has the wrong base commit ID" >&2
+ test_done "$testroot" "1"
+ return 1
+ fi
+
+ rm $testroot/wt/beta
+ mkdir -p $testroot/wt/beta/psi
+
+ # update to the latest commit; this skips beta
+ (cd $testroot/wt && got update > $testroot/stdout)
+
+ echo "~ beta" > $testroot/stdout.expected
+ echo "Updated to commit $commit_id1" >> $testroot/stdout.expected
+ echo "File paths obstructed by a non-regular file: 1" >> $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
+
+ blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
+ cut -d ':' -f 2 | tr -d ' ')`
+ if [ "$blob_id" != "$blob_id0" ]; then
+ echo "file beta has the wrong base blob ID" >&2
+ test_done "$testroot" "1"
+ return 1
+ fi
+
+ commit_id=`(cd $testroot/wt && got info beta | \
+ grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
+ if [ "$commit_id" != "$commit_id0" ]; then
+ echo "file beta has the wrong base commit ID" >&2
+ test_done "$testroot" "1"
+ return 1
+ fi
+
+ # remove the directory which obstructs file beta
+ rm -r $testroot/wt/beta
+
+ # updating to the latest commit should now update beta
+ (cd $testroot/wt && got update > $testroot/stdout)
+ echo "! beta" > $testroot/stdout.expected
+ echo "Updated to commit $commit_id1" >> $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
+
+ blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
+ cut -d ':' -f 2 | tr -d ' ')`
+ if [ "$blob_id" != "$blob_id1" ]; then
+ echo "file beta has the wrong base blob ID" >&2
+ test_done "$testroot" "1"
+ return 1
+ fi
+
+ commit_id=`(cd $testroot/wt && got info beta | \
+ grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
+ if [ "$commit_id" != "$commit_id1" ]; then
+ echo "file beta has the wrong base commit ID: $commit_id" >&2
+ test_done "$testroot" "1"
+ return 1
+ fi
+
+ echo "changed beta" > $testroot/content.expected
+ cat $testroot/wt/beta > $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ diff -u $testroot/content.expected $testroot/content
+ fi
+ test_done "$testroot" "$ret"
+}
+
test_parseargs "$@"
run_test test_update_basic
@@ -2614,3 +2721,4 @@ run_test test_update_deletes_symlink
run_test test_update_symlink_conflicts
run_test test_update_single_file
run_test test_update_file_skipped_due_to_conflict
+run_test test_update_file_skipped_due_to_obstruction