commit - 68a5ea4cac937b4c448ab37e3e71e76702c981649c94a93d4f6b678ada5f4561
commit + 7a0c230f5264340429de93913aca391fea4293d2cf841d9dff4ea75b1ee1b769
blob - df6f0560489010a429efe97ab2c59364e827beae09a0e649d344b3d5a46f9b58
blob + 439c74533638a4717e2b7dd052341b47136155a011c3967008eaed24fa53fce8
--- got/got.c
+++ got/got.c
error = got_error_from_errno("strdup");
goto done;
}
- error = got_ref_resolve(&branch_tip, repo, branch);
+ error = got_ref_resolve_commit_or_tag(&branch_tip, repo,
+ branch);
if (error)
goto done;
}
blob - 5d61a8330b22a88e3a88cddd4a9347918860d8ed0f96c4249a2285d1bb43a904
blob + cd02007c9fcdd2857ee24b0f547f91f888e241b8d17e3ac0a2aec1bbb801c4a2
--- include/got_reference.h
+++ include/got_reference.h
struct got_repository *, struct got_reference *);
/*
+ * Attempt to resolve a reference (symbolic or not) to an object ID,
+ * assuming the reference points at a commit or tag object. If the reference
+ * points at a tag then return the commit ID which the tag resolves to.
+ * Object types other than commit and tag result in GOT_ERR_OBJ_TYPE.
+ *
+ */
+const struct got_error *got_ref_resolve_commit_or_tag(struct got_object_id **,
+ struct got_repository *, struct got_reference *);
+
+/*
* Return a string representation of a reference.
* The caller must dispose of it with free(3).
*/
blob - 4b62391d8f00358e7ec79bba8e711847943a89964fd3874104dadfc0988a5f4d
blob + 7cd4bcffebfcf9c9e5315e98907a60af40c1b43c93288d60e165c79a3288aee4
--- lib/reference.c
+++ lib/reference.c
return ref_resolve(id, repo, ref, GOT_REF_RECURSE_MAX);
}
+const struct got_error *
+got_ref_resolve_commit_or_tag(struct got_object_id **commit_id,
+ struct got_repository *repo, struct got_reference *ref)
+{
+ const struct got_error *err = NULL;
+ struct got_object_id *obj_id;
+ struct got_tag_object *tag = NULL;
+ int obj_type;
+
+ *commit_id = NULL;
+
+ err = got_ref_resolve(&obj_id, repo, ref);
+ if (err)
+ return err;
+
+ err = got_object_get_type(&obj_type, repo, obj_id);
+ if (err)
+ goto done;
+
+ switch (obj_type) {
+ case GOT_OBJ_TYPE_COMMIT:
+ break;
+ case GOT_OBJ_TYPE_TAG:
+ /*
+ * Git allows nested tags that point to tags; keep peeling
+ * till we reach the bottom, which is always a non-tag ref.
+ */
+ do {
+ if (tag != NULL)
+ got_object_tag_close(tag);
+ err = got_object_open_as_tag(&tag, repo, obj_id);
+ if (err)
+ goto done;
+ free(obj_id);
+ obj_id = got_object_id_dup(
+ got_object_tag_get_object_id(tag));
+ if (obj_id == NULL) {
+ err = got_error_from_errno("got_object_id_dup");
+ goto done;
+ }
+ err = got_object_get_type(&obj_type, repo, obj_id);
+ if (err)
+ goto done;
+ } while (obj_type == GOT_OBJ_TYPE_TAG);
+ if (obj_type != GOT_OBJ_TYPE_COMMIT)
+ err = got_error(GOT_ERR_OBJ_TYPE);
+ break;
+ default:
+ err = got_error(GOT_ERR_OBJ_TYPE);
+ break;
+ }
+
+done:
+ if (tag)
+ got_object_tag_close(tag);
+ if (err == NULL)
+ *commit_id = obj_id;
+ else
+ free(obj_id);
+ return err;
+}
+
+
char *
got_ref_to_str(struct got_reference *ref)
{
blob - ff6243bc274cfa68daf12b32c511bb323aa99be1aa30d19608c405bea127fb27
blob + db50e2a92df94bcbe7c9a03a7d18c013686c73475c7d5c1e80de0a92e36509c9
--- regress/cmdline/merge.sh
+++ regress/cmdline/merge.sh
test_done "$testroot" "$ret"
}
+test_merge_tag() {
+ local testroot=`test_init merge_tag`
+ local commit0=`git_show_head $testroot/repo`
+ local commit0_author_time=`git_show_author_time $testroot/repo`
+
+ git -C $testroot/repo checkout -q -b newbranch
+ echo "modified delta on branch" > $testroot/repo/gamma/delta
+ git_commit $testroot/repo -m "committing to delta on newbranch"
+ local branch_commit=`git_show_branch_head $testroot/repo newbranch`
+
+ 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
+
+ # create a divergent commit
+ git -C $testroot/repo checkout -q master
+ echo "modified zeta on master" > $testroot/repo/epsilon/zeta
+ git_commit $testroot/repo -m "committing to zeta on master"
+ local master_commit=`git_show_head $testroot/repo`
+
+
+ # tag the branch
+ got tag -r $testroot/repo -c newbranch -m "1.0" 1.0 > /dev/null
+
+ # need an up-to-date work tree for 'got merge'
+ (cd $testroot/wt && got update > /dev/null)
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ echo "got update failed unexpectedly" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ (cd $testroot/wt && got merge 1.0 > $testroot/stdout)
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ echo "got merge failed unexpectedly" >&2
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ local merge_commit=`git_show_head $testroot/repo`
+
+ echo "G gamma/delta" >> $testroot/stdout.expected
+ echo -n "Merged refs/tags/1.0 into refs/heads/master: " \
+ >> $testroot/stdout.expected
+ echo $merge_commit >> $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 "modified delta on branch" > $testroot/content.expected
+ cat $testroot/wt/gamma/delta > $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ diff -u $testroot/content.expected $testroot/content
+ 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 -ne 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 $merge_commit (master)" > $testroot/stdout.expected
+ echo "commit $master_commit" >> $testroot/stdout.expected
+ echo "commit $commit0" >> $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
+
+ # We should have created a merge commit with two parents.
+ (cd $testroot/wt && got log -l1 | grep ^parent > $testroot/stdout)
+ echo "parent 1: $master_commit" > $testroot/stdout.expected
+ echo "parent 2: $branch_commit" >> $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_parseargs "$@"
run_test test_merge_basic
run_test test_merge_forward
run_test test_merge_gitconfig_author
run_test test_merge_fetched_branch
run_test test_merge_fetched_branch_remote
+run_test test_merge_tag
blob - 78b349e6bae9c66c6120197622708ea2dc26cfff4433c0f6323e24b00ff55ed9
blob + 0483db7a8b24e3f664a5ba114f8f2ba4b9694dc2e67e49988702ee90a1be2cda
--- tog/tog.c
+++ tog/tog.c
}
static const struct got_error *
-resolve_reflist_entry(struct got_object_id **commit_id,
- struct tog_reflist_entry *re, struct got_repository *repo)
-{
- const struct got_error *err = NULL;
- struct got_object_id *obj_id;
- struct got_tag_object *tag = NULL;
- int obj_type;
-
- *commit_id = NULL;
-
- err = got_ref_resolve(&obj_id, repo, re->ref);
- if (err)
- return err;
-
- err = got_object_get_type(&obj_type, repo, obj_id);
- if (err)
- goto done;
-
- switch (obj_type) {
- case GOT_OBJ_TYPE_COMMIT:
- break;
- case GOT_OBJ_TYPE_TAG:
- /*
- * Git allows nested tags that point to tags; keep peeling
- * till we reach the bottom, which is always a non-tag ref.
- */
- do {
- if (tag != NULL)
- got_object_tag_close(tag);
- err = got_object_open_as_tag(&tag, repo, obj_id);
- if (err)
- goto done;
- free(obj_id);
- obj_id = got_object_id_dup(
- got_object_tag_get_object_id(tag));
- if (obj_id == NULL) {
- err = got_error_from_errno("got_object_id_dup");
- goto done;
- }
- err = got_object_get_type(&obj_type, repo, obj_id);
- if (err)
- goto done;
- } while (obj_type == GOT_OBJ_TYPE_TAG);
- if (obj_type != GOT_OBJ_TYPE_COMMIT)
- err = got_error(GOT_ERR_OBJ_TYPE);
- break;
- default:
- err = got_error(GOT_ERR_OBJ_TYPE);
- break;
- }
-
-done:
- if (tag)
- got_object_tag_close(tag);
- if (err == NULL)
- *commit_id = obj_id;
- else
- free(obj_id);
- return err;
-}
-
-static const struct got_error *
log_ref_entry(struct tog_view **new_view, int begin_y, int begin_x,
struct tog_reflist_entry *re, struct got_repository *repo)
{
*new_view = NULL;
- err = resolve_reflist_entry(&commit_id, re, repo);
+ err = got_ref_resolve_commit_or_tag(&commit_id, repo, re->ref);
if (err)
return err;
*new_view = NULL;
- err = resolve_reflist_entry(&commit_id, re, repo);
+ err = got_ref_resolve_commit_or_tag(&commit_id, repo, re->ref);
if (err)
return err;