From: "Omar Polo" <op@omarpolo.com>
Subject: Re: allow merging tags
To: Stefan Sperling <stsp@stsp.name>
Cc: gameoftrees@openbsd.org
Date: Fri, 19 Jun 2026 00:33:57 +0200

Stefan Sperling <stsp@stsp.name> wrote:
> Make 'got merge' accept tags as merge source argument.
>  
> Reuse a tag-resolution function from tog.c, moving it to the lib directory
> such that the got command can make use of it as well.
>  
> Add test coverage.
> 
> ok?

nice, looks good to me!  ok op@

p.s. should we tweak the wording in got.1?  or shall we consider
"branch" to match tags as well in there?

> I need this for github-specific workflows used in the Plakar project.
>  
> M  got/got.c                 |    2+   1-
> M  include/got_reference.h   |   10+   0-
> M  lib/reference.c           |   63+   0-
> M  regress/cmdline/merge.sh  |  107+   0-
> M  tog/tog.c                 |    2+  64-
> 
> 5 files changed, 184 insertions(+), 65 deletions(-)
> 
> commit - 69ac886cd64b82483fbb0e3114eb447f1d2ff9e0
> commit + b15b671e96f233b655a2ea7de6d1bcc617c738b7


Thanks,
Omar Polo