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:
3f6aad2
)
quilt fixup: Break out quilt_fixup_linkorigs (nfc)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 21 Aug 2015 12:08:23 +0000
(13:08 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 21 Aug 2015 16:28:07 +0000
(17:28 +0100)
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index 4675944fc3c30a4400c0ea741f8f8b79fa9c9919..92e48a0726b7e9b6759b7aae5cfba86d0bb5bbc9 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2774,6
+2774,18
@@
sub quilt_fixup_mkwork ($) {
runcmd @git, qw(reset --hard), $headref;
}
runcmd @git, qw(reset --hard), $headref;
}
+sub quilt_fixup_linkorigs ($$) {
+ my ($upstreamversion, $fn) = @_;
+ # calls $fn->($leafname);
+
+ foreach my $f (<../../../../*>) { #/){
+ my $b=$f; $b =~ s{.*/}{};
+ next unless is_orig_file $b, srcfn $upstreamversion,'';
+ link_ltarget $f, $b or die "$b $!";
+ $fn->($b);
+ }
+}
+
sub quilt_fixup_multipatch ($$$) {
my ($clogp, $headref, $upstreamversion) = @_;
sub quilt_fixup_multipatch ($$$) {
my ($clogp, $headref, $upstreamversion) = @_;
@@
-2844,12
+2856,7
@@
END
print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
};
print $fakedsc " ".$md->hexdigest." $size $b\n" or die $!;
};
- foreach my $f (<../../../../*>) { #/){
- my $b=$f; $b =~ s{.*/}{};
- next unless is_orig_file $b, srcfn $upstreamversion,'';
- link_ltarget $f, $b or die "$b $!";
- $dscaddfile->($b);
- }
+ quilt_fixup_linkorigs($upstreamversion, $dscaddfile);
my @files=qw(debian/source/format debian/rules);
foreach my $maybe (qw(debian/patches debian/source/options)) {
my @files=qw(debian/source/format debian/rules);
foreach my $maybe (qw(debian/patches debian/source/options)) {