chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: After downloading .debian.* files, save them in `..', too
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 824e9d1b3ccaaf010c25e4102bf6d3e2e9d04655..eae6f24bde3895f21cf05a7b0e62869b24c821b9 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2083,11
+2083,9
@@
sub generate_commits_from_dsc () {
complete_file_from_dsc('.', $fi)
or next;
complete_file_from_dsc('.', $fi)
or next;
- if (is_orig_file_in_dsc($f, \@dfi)) {
- link $f, "../../../../$f"
- or $!==&EEXIST
- or die "$f $!";
- }
+ link $f, "../../../../$f"
+ or $!==&EEXIST
+ or die "$f $!";
}
# We unpack and record the orig tarballs first, so that we only
}
# We unpack and record the orig tarballs first, so that we only
@@
-2843,8
+2841,10
@@
END
};
if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
};
if (parse_cfg_bool 'rewrite-map-enable', 'true', $rewrite_enable) {
- my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
- $mapref = $lrf.'/'.$rewritemap;
+ if (!defined $mapref) {
+ my $lrf = $do_fetch->("rewrite map", $rewritemap) or return;
+ $mapref = $lrf.'/'.$rewritemap;
+ }
my $rewritemapdata = git_cat_file $mapref.':map';
if (defined $rewritemapdata
&& $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
my $rewritemapdata = git_cat_file $mapref.':map';
if (defined $rewritemapdata
&& $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
@@
-6103,6
+6103,8
@@
Specify +$specbranch to overwrite, discarding existing history
END
if $oldhash && !$force;
END
if $oldhash && !$force;
+ notpushing();
+
my @dfi = dsc_files_info();
foreach my $fi (@dfi) {
my $f = $fi->{Filename};
my @dfi = dsc_files_info();
foreach my $fi (@dfi) {
my $f = $fi->{Filename};