chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug handling our synthetic merges when we see them in the remote suite branch.
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 406589a8eb654e3d2a6446dbf4234577a133dba2..c0c7b8df4d23cfec766dd346035964d2b7715d85 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-68,7
+68,7
@@
our $debug = 0;
open DEBUG, ">/dev/null" or die $!;
our $remotename = 'dgit';
open DEBUG, ">/dev/null" or die $!;
our $remotename = 'dgit';
-our
$ourdscfield = 'Vcs-Dgit-Master'
;
+our
@ourdscfield = qw(Dgit Vcs-Dgit-Master)
;
our $branchprefix = 'dgit';
our $csuite;
our $branchprefix = 'dgit';
our $csuite;
@@
-488,7
+488,7
@@
sub mktree_in_ud_from_only_subdir () {
$dirs[0] =~ m#^([^/]+)/\.$# or die;
my $dir = $1;
chdir $dir or die "$dir $!";
$dirs[0] =~ m#^([^/]+)/\.$# or die;
my $dir = $1;
chdir $dir or die "$dir $!";
-
die
if stat '.git';
+
fail "source package contains .git directory"
if stat '.git';
die $! unless $!==&ENOENT;
runcmd qw(git init -q);
rmtree('.git/objects');
die $! unless $!==&ENOENT;
runcmd qw(git init -q);
rmtree('.git/objects');
@@
-591,12
+591,9
@@
Last allegedly pushed/uploaded: $oversion (newer or same)
$later_warning_msg
END
$outputhash = $upload_hash;
$later_warning_msg
END
$outputhash = $upload_hash;
- } elsif ($outputhash ne $upload_hash) {
- fail "version in archive ($cversion)".
- " is same as version in git".
- " to-be-uploaded (upload/) branch ($oversion)".
- " but archive version hash no commit hash?!";
- }
+ } else {
+ $outputhash = $upload_hash;
+ }
}
chdir '../../../..' or die $!;
runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
}
chdir '../../../..' or die $!;
runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
@@
-644,7
+641,10
@@
sub fetch_from_archive () {
# ensures that lrref() is what is actually in the archive,
# one way or another
get_archive_dsc() or return 0;
# ensures that lrref() is what is actually in the archive,
# one way or another
get_archive_dsc() or return 0;
- $dsc_hash = $dsc->{$ourdscfield};
+ foreach my $field (@ourdscfield) {
+ $dsc_hash = $dsc->{$field};
+ last if defined $dsc_hash;
+ }
if (defined $dsc_hash) {
$dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
$dsc_hash = $&;
if (defined $dsc_hash) {
$dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
$dsc_hash = $&;
@@
-832,7
+832,7
@@
sub dopush () {
# runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
# map { lref($_).":".rref($_) }
# (uploadbranch());
# runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
# map { lref($_).":".rref($_) }
# (uploadbranch());
- $dsc->{$ourdscfield} = rev_parse('HEAD');
+ $dsc->{$ourdscfield
[0]
} = rev_parse('HEAD');
$dsc->save("../$dscfn.tmp") or die $!;
if (!$changesfile) {
my $multi = "../${package}_${cversion}_multi.changes";
$dsc->save("../$dscfn.tmp") or die $!;
if (!$changesfile) {
my $multi = "../${package}_${cversion}_multi.changes";
@@
-1064,7
+1064,7
@@
sub build_source {
check_not_dirty();
my $clogp = parsechangelog();
$package = getfield $clogp, 'Source';
check_not_dirty();
my $clogp = parsechangelog();
$package = getfield $clogp, 'Source';
-
my
$isuite = getfield $clogp, 'Distribution';
+ $isuite = getfield $clogp, 'Distribution';
$version = getfield $clogp, 'Version';
$sourcechanges = "${package}_${version}_source.changes";
$dscfn = dscfn($version);
$version = getfield $clogp, 'Version';
$sourcechanges = "${package}_${version}_source.changes";
$dscfn = dscfn($version);