[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: More git workflow



On Sun, Apr 15, 2018 at 03:38:11PM -0500, Dirk Eddelbuettel wrote:
> On 15 April 2018 at 22:25, Sébastien Villemot wrote:
> | On Sun, Apr 15, 2018 at 02:58:30PM -0500, Dirk Eddelbuettel wrote:
> | 
> | > I currently have two questions I can't answer but which may be easy pickings
> | > for someone here:
> | > 
> | > - I just had to do an 'out of sequence' package with a security patch for
> | >   stable (uploaded, DSA forthcoming)
> | > 
> | >   What is the best way to get that into the proper place in the git repo?
> | >   Re-import by dsc?
> | 
> | I usually deal with this situation by creating a git branch (with the same name
> | as the targeted Debian stable release, e.g. "stretch"), which starts from the
> | git tag corresponding to the version initially in stable. Then you can work on
> | that branch as you would on master, except that you have to use the
> | --git-debian-branch (or --debian-branch, depends on the tool) option of gbp to
> | specify that you are working there.
> | 
> | For importing an existing .dsc, you could do:
> | 
> |   gbp import-dsc --debian-branch=stretch ${DSC_FILE}
> 
> That is nice.  Can that also 'hook' the branch to a particular commit?

No. You have first to create the "stretch" branch by hand using regular git tools.
Typically:

  git branch stretch ${TAG_OR_COMMIT_ID}

-- 
⢀⣴⠾⠻⢶⣦⠀  Sébastien Villemot
⣾⠁⢠⠒⠀⣿⡁  Debian Developer
⢿⡄⠘⠷⠚⠋⠀  http://sebastien.villemot.name
⠈⠳⣄⠀⠀⠀⠀  http://www.debian.org

Attachment: signature.asc
Description: PGP signature


Reply to: