chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f979515
)
dgit: baredebian: Note upstream commitish source in prose
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 29 Jun 2019 01:11:49 +0000
(
02:11
+0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 29 Jun 2019 12:43:11 +0000
(13:43 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index fccf48e31d35aa775aed3ad9a5747d0d47a6b85e..831a60c5e48cf16ea15ce8fb31f26a8d126ec96f 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-5415,7
+5415,7
@@
END
my $upsversion = upstreamversion $version;
my $merge = make_commit
[ $headref, $quilt_upstream_commitish ],
-
[ +(f_ <<ENDT, $upsversion)
, <<ENDU ];
+
[ +(f_ <<ENDT, $upsversion), $quilt_upstream_commitish_message
, <<ENDU ];
Combine debian/ with upstream source for %s
ENDT
[dgit ($our_version) baredebian-merge $version $quilt_upstream_commitish_used]