commit - 5c02d2a555dc01ac06db5a47b8c81adf2bf3f8a6
commit + 4e91ef1519233965edd1bbd83f6699f669c8f9d6
blob - 06422c812cb6a86575f656e0a5293c72ed775769
blob + c408a296cf7c404394c1001c724ca9a0355c7e6a
--- got/got.1
+++ got/got.1
should be preferred over
.Cm got merge .
However, even strictly linear projects may require merge commits in order
-to merge in new versions of code imported from third-party projects on
-vendor branches.
+to merge in new versions of third-party code stored on vendor branches
+created with
+.Cm got import .
.Pp
Merge commits are commits based on multiple parent commits.
The tip commit of the work tree's current branch, which must be set with
.Ar branch
will be used as the second parent.
.Pp
+No ancestral relationship between the two branches is required.
+If the two branches have already been merged previously, only new changes
+will be merged.
+.Pp
It is not possible to create merge commits with more than two parents.
If more than one branch needs to be merged, then multiple merge commits
with two parents each can be created in sequence.
-.Pp
-The
-.Ar branch
-must share common ancestry with the work tree's current branch.
.Pp
While merging changes found on the
.Ar branch
blob - 0bf2f902eb9f9a5b3567b36615d2d0c01f8f1b80
blob + 461ac8d95dc15cc7e42528f61ab9a30e6394cb51
--- got/got.c
+++ got/got.c
struct got_object_id *yca_id;
err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
- commit_id, base_commit_id, repo, check_cancelled, NULL);
+ commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
if (err)
return err;
goto done;
err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
- old_commit_id, new_commit_id, repo, check_cancelled, NULL);
+ old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
if (err)
goto done;
base_commit_id = got_worktree_get_base_commit_id(worktree);
error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
- base_commit_id, branch_head_commit_id, repo,
+ base_commit_id, branch_head_commit_id, 1, repo,
check_cancelled, NULL);
if (error)
goto done;
if (error)
goto done;
error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
- wt_branch_tip, branch_tip, repo,
+ wt_branch_tip, branch_tip, 0, repo,
check_cancelled, NULL);
- if (error)
- goto done;
- if (yca_id == NULL) {
- error = got_error_msg(GOT_ERR_ANCESTRY,
- "specified branch shares no common ancestry "
- "with work tree's branch");
+ if (error && error->code != GOT_ERR_ANCESTRY)
goto done;
- }
if (!continue_merge) {
error = check_path_prefix(wt_branch_tip, branch_tip,
GOT_ERR_MERGE_PATH, repo);
if (error)
goto done;
- error = check_same_branch(wt_branch_tip, branch,
- yca_id, repo);
- if (error) {
- if (error->code != GOT_ERR_ANCESTRY)
+ if (yca_id) {
+ error = check_same_branch(wt_branch_tip, branch,
+ yca_id, repo);
+ if (error) {
+ if (error->code != GOT_ERR_ANCESTRY)
+ goto done;
+ error = NULL;
+ } else {
+ static char msg[512];
+ snprintf(msg, sizeof(msg),
+ "cannot create a merge commit because "
+ "%s is based on %s; %s can be integrated "
+ "with 'got integrate' instead", branch_name,
+ got_worktree_get_head_ref_name(worktree),
+ branch_name);
+ error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
goto done;
- error = NULL;
- } else {
- static char msg[512];
- snprintf(msg, sizeof(msg),
- "cannot create a merge commit because "
- "%s is based on %s; %s can be integrated "
- "with 'got integrate' instead", branch_name,
- got_worktree_get_head_ref_name(worktree),
- branch_name);
- error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
- goto done;
+ }
}
error = got_worktree_merge_prepare(&fileindex, worktree,
branch, repo);
if (error)
goto done;
print_update_progress_stats(&upa);
+ if (!upa.did_something) {
+ error = got_worktree_merge_abort(worktree, fileindex,
+ repo, update_progress, &upa);
+ if (error)
+ goto done;
+ printf("Already up-to-date\n");
+ goto done;
+ }
}
if (upa.conflicts > 0 || upa.missing > 0) {
blob - 1538d549835d34b1e9f1400e8da7166397acd4c0
blob + 617697ddc049b408054512990ba787719cfad80a
--- include/got_commit_graph.h
+++ include/got_commit_graph.h
/* Find the youngest common ancestor of two commits. */
const struct got_error *got_commit_graph_find_youngest_common_ancestor(
struct got_object_id **, struct got_object_id *, struct got_object_id *,
- struct got_repository *, got_cancel_cb, void *);
+ int, struct got_repository *, got_cancel_cb, void *);
blob - 02b48fae94b68b2e73ce447027d7d94d3be3b6c5
blob + 55b4da29492815a14efed2a3680b55d68dddbfd0
--- lib/commit_graph.c
+++ lib/commit_graph.c
const struct got_error *
got_commit_graph_find_youngest_common_ancestor(struct got_object_id **yca_id,
struct got_object_id *commit_id, struct got_object_id *commit_id2,
+ int first_parent_traversal,
struct got_repository *repo, got_cancel_cb cancel_cb, void *cancel_arg)
{
const struct got_error *err = NULL;
if (commit_ids == NULL)
return got_error_from_errno("got_object_idset_alloc");
- err = got_commit_graph_open(&graph, "/", 1);
+ err = got_commit_graph_open(&graph, "/", first_parent_traversal);
if (err)
goto done;
- err = got_commit_graph_open(&graph2, "/", 1);
+ err = got_commit_graph_open(&graph2, "/", first_parent_traversal);
if (err)
goto done;
blob - 439105b666bbf6eb9e40bf4c2cfa6b3c25e52eeb
blob + 6a928efef76409f746a25050dabef6f6c6001c95
--- lib/send.c
+++ lib/send.c
"bad object type on server for %s", refname);
err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
- my_id, their_id, repo, cancel_cb, cancel_arg);
+ my_id, their_id, 1, repo, cancel_cb, cancel_arg);
if (err)
return err;
if (yca_id == NULL)
blob - 1c7ea8430ba3f5a85df6f00f7a3587641ae683ff
blob + 1d534c5958a2e7da9413b01d8fcff42599c6f25b
--- regress/cmdline/merge.sh
+++ regress/cmdline/merge.sh
(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
+ fi
+ test_done "$testroot" "$ret"
+}
+
+test_merge_imported_branch() {
+ local testroot=`test_init merge_import`
+ local commit0=`git_show_head $testroot/repo`
+ local commit0_author_time=`git_show_author_time $testroot/repo`
+
+ # import a new sub-tree to the 'files' branch such that
+ # none of the files added here collide with existing ones
+ mkdir -p $testroot/tree/there
+ mkdir -p $testroot/tree/be/lots
+ mkdir -p $testroot/tree/files
+ echo "there should" > $testroot/tree/there/should
+ echo "be lots of" > $testroot/tree/be/lots/of
+ echo "files here" > $testroot/tree/files/here
+ got import -r $testroot/repo -b files -m 'import files' \
+ $testroot/tree > /dev/null
+
+ got checkout -b master $testroot/repo $testroot/wt > /dev/null
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ echo "got checkout failed unexpectedly" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ (cd $testroot/wt && got merge files > $testroot/stdout)
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ echo "got merge failed unexpectedly" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ local merge_commit0=`git_show_head $testroot/repo`
+ cat > $testroot/stdout.expected <<EOF
+A be/lots/of
+A files/here
+A there/should
+Merged refs/heads/files into refs/heads/master: $merge_commit0
+EOF
+ 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
+
+ # try to merge again while no new changes are available
+ (cd $testroot/wt && got merge files > $testroot/stdout)
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ echo "got merge failed unexpectedly" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+ echo "Already up-to-date" > $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
+
+ # update the 'files' branch
+ (cd $testroot/repo && git reset -q --hard master)
+ (cd $testroot/repo && git checkout -q files)
+ echo "indeed" > $testroot/repo/indeed
+ (cd $testroot/repo && git add indeed)
+ git_commit $testroot/repo -m "adding another file indeed"
+ echo "be lots and lots of" > $testroot/repo/be/lots/of
+ git_commit $testroot/repo -m "lots of changes"
+
+ (cd $testroot/wt && got update > /dev/null)
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ echo "got update failed unexpectedly" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ # we should now be able to merge more changes from files branch
+ (cd $testroot/wt && got merge files > $testroot/stdout)
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ echo "got merge failed unexpectedly" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ local merge_commit1=`git_show_branch_head $testroot/repo master`
+ cat > $testroot/stdout.expected <<EOF
+G be/lots/of
+A indeed
+Merged refs/heads/files into refs/heads/master: $merge_commit1
+EOF
+
+ 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_merge_path_prefix
run_test test_merge_missing_file
run_test test_merge_no_op
+run_test test_merge_imported_branch
