diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-11-25 14:28:10 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-11-25 14:28:10 -0700 |
| commit | 6a12888cade6a88bc29be7e7616f2f8471025dfd (patch) | |
| tree | 4a163e0ee74bd51d979e86cc182f5c21e3b2da49 /debian | |
| parent | 10e4c8763183730cd8b363d6c5f162022045bb6f (diff) | |
| download | emacs-6a12888cade6a88bc29be7e7616f2f8471025dfd.tar.gz | |
d/merge-snapshot: check out the correct branch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | debian/merge-snapshot | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index c18b446d7b7..b2a6ce0a158 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +emacs-snapshot (29.1~git20221121.2) UNRELEASED; urgency=medium + + * d/merge-snapshot: check out the correct branch. + + -- Sean Whitton <spwhitton@spwhitton.name> Fri, 25 Nov 2022 14:27:41 -0700 + emacs-snapshot (29.1~git20221121.1) unstable; urgency=medium * Package git snapshot. diff --git a/debian/merge-snapshot b/debian/merge-snapshot index 8ee28d69a05..207d441407d 100755 --- a/debian/merge-snapshot +++ b/debian/merge-snapshot @@ -11,7 +11,7 @@ use Git::Wrapper; my $git = Git::Wrapper->new(getcwd); ($git->rev_parse({ abbrev_ref => 1 }, "HEAD"))[0] eq "athena/unstable" - or die "on wrong branch!"; + or $git->checkout("athena/unstable"); my ($to_merge) = $git->merge_base("melete", "origin/master"); |