commit - d8a7bd7ded08798e7d38e6706fbc540edce788f6
commit + fe3f264bd2e2cae213952619831d4719dd6d1f11
blob - dbb0f4dedea82d8900cac49dd15046480d6cc5e6
blob + 512ee415f0d588088b9c8b8480666c26b5097909
--- got/got.c
+++ got/got.c
}
error = get_author(&author, repo, worktree);
+ if (error)
+ goto done;
+
+ error = got_ref_open(&wt_branch, repo,
+ got_worktree_get_head_ref_name(worktree), 0);
+ if (error)
+ goto done;
+ error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
if (error)
goto done;
if (continue_merge) {
+ struct got_object_id *base_commit_id;
+ base_commit_id = got_worktree_get_base_commit_id(worktree);
+ if (got_object_id_cmp(wt_branch_tip, base_commit_id) != 0) {
+ error = got_error(GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
+ goto done;
+ }
error = got_worktree_merge_continue(&branch_name,
&branch_tip, &fileindex, worktree, repo);
if (error)
goto done;
}
- error = got_ref_open(&wt_branch, repo,
- got_worktree_get_head_ref_name(worktree), 0);
- if (error)
- goto done;
- error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
- if (error)
- goto done;
error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
wt_branch_tip, branch_tip, 0, repo,
check_cancelled, NULL);
blob - 3b047e438a7e4fff23c4e9f6c1ada623765a80dc
blob + 0582e35816efd0e75172f961b9d274e6c249d83d
--- include/got_error.h
+++ include/got_error.h
#define GOT_ERR_NOT_MERGING 141
#define GOT_ERR_MERGE_OUT_OF_DATE 142
#define GOT_ERR_MERGE_STAGED_PATHS 143
-#define GOT_ERR_MERGE_COMMIT_OUT_OF_DATE 143
#define GOT_ERR_MERGE_BUSY 144
#define GOT_ERR_MERGE_PATH 145
#define GOT_ERR_FILE_BINARY 146
#define GOT_ERR_UID 167
#define GOT_ERR_GID 168
#define GOT_ERR_NO_PROG 169
+#define GOT_ERR_MERGE_COMMIT_OUT_OF_DATE 170
struct got_error {
int code;
blob - 4e6234fa5cd6f8448921a97529adc9749d61dde7
blob + 387feb8883a4304158ca0f93f35832950b29002d
--- lib/error.c
+++ lib/error.c
{ GOT_ERR_MERGE_STAGED_PATHS, "work tree contains files with staged "
"changes; these changes must be unstaged before merging can "
"proceed" },
- { GOT_ERR_MERGE_COMMIT_OUT_OF_DATE, "merging cannot proceed because "
- "the work tree is no longer up-to-date; merge must be aborted "
- "and retried" },
{ GOT_ERR_MERGE_BUSY,"a merge operation is in progress in this "
"work tree and must be continued or aborted first" },
{ GOT_ERR_MERGE_PATH, "cannot merge branch which contains "
{ GOT_ERR_UID, "bad user ID" },
{ GOT_ERR_GID, "bad group ID" },
{ GOT_ERR_NO_PROG, "command not found or not accessible" },
+ { GOT_ERR_MERGE_COMMIT_OUT_OF_DATE, "merging cannot proceed because "
+ "the work tree is no longer up-to-date; merge must be aborted "
+ "and retried" },
};
static struct got_custom_error {
blob - 5ff4c0008aaff91e17805726113b20ed707f0c5a
blob + 72da154ee415535430db1d423baf6466b5241cb7
--- lib/worktree.c
+++ lib/worktree.c
collect_commitables, &cc_arg, NULL, NULL, 1, 0);
if (err)
goto done;
-
- TAILQ_FOREACH(pe, &commitable_paths, entry) {
- struct got_commitable *ct = pe->data;
- const char *ct_path = ct->in_repo_path;
-
- while (ct_path[0] == '/')
- ct_path++;
- err = check_out_of_date(ct_path, ct->status,
- ct->staged_status, ct->base_blob_id, ct->base_commit_id,
- head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
- if (err)
- goto done;
-
- }
mcm_arg.worktree = worktree;
mcm_arg.branch_name = branch_name;
blob - df6f2f9edf54a23ff9b1e9f05267a77673a4fbcf
blob + ca27e157f924c0abac516cda4f26581c04e3cc21
--- regress/cmdline/merge.sh
+++ regress/cmdline/merge.sh
(cd $testroot/wt && got log -l1 | grep ^parent > $testroot/stdout)
echo "parent 1: $master_commit" > $testroot/stdout.expected
echo "parent 2: $branch_commit3" >> $testroot/stdout.expected
+ cmp -s $testroot/stdout.expected $testroot/stdout
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
+ fi
+ test_done "$testroot" "$ret"
+}
+
+test_merge_continue_new_commit() {
+ # "got merge -c" should refuse to run if the current branch tip has
+ # changed since the merge was started, to avoid clobbering the changes.
+ local testroot=`test_init merge_continue_new_commit`
+
+ (cd $testroot/repo && git checkout -q -b newbranch)
+ echo "modified delta on branch" > $testroot/repo/gamma/delta
+ git_commit $testroot/repo -m "committing to delta on newbranch"
+
+ (cd $testroot/repo && git checkout -q master)
+ echo "modified alpha on master" > $testroot/repo/alpha
+ git_commit $testroot/repo -m "committing to alpha on master"
+
+ got checkout -b master $testroot/repo $testroot/wt > /dev/null
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ echo "got checkout failed unexpectedly" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ (cd $testroot/wt && got merge -n newbranch >/dev/null)
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ echo "got merge failed unexpectedly" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ echo "modified alpha again on master" > $testroot/repo/alpha
+ git_commit $testroot/repo -m "committing to alpha on master again"
+
+ (cd $testroot/wt && got merge -c > $testroot/stdout 2> $testroot/stderr)
+ ret=$?
+ if [ $ret -eq 0 ]; then
+ echo "got merge 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 -ne 0 ]; then
diff -u $testroot/stdout.expected $testroot/stdout
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ echo -n "got: merging cannot proceed because the work tree is no " \
+ > $testroot/stderr.expected
+ echo "longer up-to-date; merge must be aborted and retried" \
+ >> $testroot/stderr.expected
+ cmp -s $testroot/stderr.expected $testroot/stderr
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ diff -u $testroot/stderr.expected $testroot/stderr
fi
test_done "$testroot" "$ret"
}
test_parseargs "$@"
run_test test_merge_basic
run_test test_merge_continue
+run_test test_merge_continue_new_commit
run_test test_merge_abort
run_test test_merge_in_progress
run_test test_merge_path_prefix
