Commit 69d57f3de25cfb3fd0cbfef22bd20090b36cee5e
2020-07-31T11:19:29
fix spurious 'got cherrypick' error with a path prefix and an empty tree If the work tree's path prefix does not exist in the first of the two trees, then 'got cherrypick' failed with "no such entry found in tree". But this is a legitimate situation, as shown in the new test added here. The first tree could be the empty tree, for example, which should result in 'got cherrypick' adding all files from the second tree instead of complaining about a non-existent path-prefix directory in the first tree.
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
diff --git a/lib/worktree.c b/lib/worktree.c
index 61cc47c..d3a3569 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -2930,12 +2930,13 @@ merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
char *label_orig = NULL;
if (commit_id1) {
- char *id_str;
-
err = got_object_id_by_path(&tree_id1, repo, commit_id1,
worktree->path_prefix);
- if (err)
+ if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
goto done;
+ }
+ if (tree_id1) {
+ char *id_str;
err = got_object_open_as_tree(&tree1, repo, tree_id1);
if (err)
diff --git a/regress/cmdline/cherrypick.sh b/regress/cmdline/cherrypick.sh
index cb7dd89..9586283 100755
--- a/regress/cmdline/cherrypick.sh
+++ b/regress/cmdline/cherrypick.sh
@@ -732,6 +732,53 @@ function test_cherrypick_symlink_conflicts {
test_done "$testroot" "0"
}
+function test_cherrypick_with_path_prefix_and_empty_tree {
+ local testroot=`test_init cherrypick_with_path_prefix_and_empty_tree 1`
+
+ (cd $testroot/repo && git commit --allow-empty \
+ -m "initial empty commit" >/dev/null)
+
+ (cd $testroot/repo && got br bar >/dev/null)
+
+ mkdir -p $testroot/repo/epsilon
+ echo "file foo" > $testroot/repo/epsilon/foo
+ (cd $testroot/repo && git add .)
+ git_commit $testroot/repo -m "add file foo"
+ local commit_id=`git_show_head $testroot/repo`
+
+ got checkout -b bar $testroot/repo $testroot/wt > /dev/null
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ echo "got checkout failed unexpectedly" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ mkdir -p $testroot/wt/epsilon
+ echo "new file" > $testroot/wt/epsilon/new
+ (cd $testroot/wt && got add epsilon/new >/dev/null)
+ (cd $testroot/wt && got commit -m "add file on branch bar" > /dev/null)
+
+ got checkout -b bar -p epsilon $testroot/repo $testroot/wt2 > /dev/null
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ echo "got checkout failed unexpectedly" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+ (cd $testroot/wt2 && got cherrypick $commit_id > $testroot/stdout)
+
+ echo "A foo" > $testroot/stdout.expected
+ echo "Merged 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
+ fi
+ test_done "$testroot" "$ret"
+}
+
run_test test_cherrypick_basic
run_test test_cherrypick_root_commit
run_test test_cherrypick_into_work_tree_with_conflicts
@@ -740,3 +787,4 @@ run_test test_cherrypick_added_submodule
run_test test_cherrypick_conflict_wt_file_vs_repo_submodule
run_test test_cherrypick_modified_symlinks
run_test test_cherrypick_symlink_conflicts
+run_test test_cherrypick_with_path_prefix_and_empty_tree