summaryrefslogtreecommitdiff
path: root/dgit-badcommit-fixup
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-06 16:16:33 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-06 16:16:37 +0000
commit7e4b51864b864f89089828d9a53b042a7f810177 (patch)
tree4e9b1cf68ee921818ab29e7f264b2f24869cdbd3 /dgit-badcommit-fixup
parent86cbeb5e4396d0722aaf3049cc01d084117bb8a4 (diff)
dgit-badcommit-fixup: Remove failing approach
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit-badcommit-fixup')
-rwxr-xr-xdgit-badcommit-fixup70
1 files changed, 0 insertions, 70 deletions
diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup
index f507e48..08b6e37 100755
--- a/dgit-badcommit-fixup
+++ b/dgit-badcommit-fixup
@@ -104,72 +104,6 @@ sub rewrite_commit ($) {
return $newobj;
}
-sub rewrite_commit_adddummy ($$$) {
- my ($ref, $veryold, $old) = @_;
-
- die "$bare ?" unless $bare eq 'true';
-
- my $td = 'dgit-broken-fixup.tmp';
- runcmd qw(rm -rf), $td;
- mkdir $td, 0700 or die "$td $!";
- chdir $td or die $!;
- runcmd qw(git init -q);
- runcmd qw(git config gc.auto 0);
- runcmd qw(rm -rf .git/objects);
- symlink "../../objects", ".git/objects" or die $!;
- runcmd qw(git checkout -q), $old;
-
- open C, "debian/changelog" or die $!;
- my $clog = do {
- local $/ = undef;
- <C>;
- };
- C->error and die $!;
- close C or die $!;
- defined $clog or die $!;
-
- $!=0; $?=0;
- my $v = `dpkg-parsechangelog`;
- die "$ref $veryold $old $? $!" if $?;
- $v =~ m/^Source: (\S+)$/m or die "$ref $veryold $old ?";
- my $pkg = $1;
- $v =~ m/^Version: (\S+)$/m or die "$ref $veryold $old ?";
- my $vsn = $1;
- $vsn .= "+~dgitfix";
-
- open C, ">", "debian/changelog" or die $!;
- print C <<END;
-$pkg ($vsn) UNRELEASED; urgency=low
-
- * Additional commit, with slightly incremented version number,
- to override bad commits generated by dgit due to #849041.
- * No changes to the package.
- * Not uploaded anywhere.
-
- -- Ian Jackson <ijackson\@chiark.greenend.org.uk> Thu, 05 Jan 2017 17:58:21 +0000
-
-END
- print C $clog or die $!;
- close C or die $!;
-
- runcmd qw(git commit -q),
- '--author=Ian Jackson <ijackson@chiark.greenend.org.uk>',
- qw(-m), 'Dummy changelog entry to work around #849041 fallout',
- qw(debian/changelog);
-
- $!=0; $?=0;
- my $new = `git rev-parse HEAD`;
- die "$? $!" if $?;
- chomp $new or die;
-
- chdir '..' or die $!;
- runcmd qw(rm -rf), $td;
-
- $count{dummyadded}++;
-
- return $new;
-}
-
sub rewrite_tag ($) {
my ($obj) = @_;
$_ = getobj $obj, 'tag';
@@ -204,10 +138,6 @@ foreach my $rline (split /\n/, $refs) {
my $rewrite;
if ($type eq 'commit') {
$rewrite = rewrite_commit($obj);
- if ($refname =~ m{^refs/dgit/[^/]+$} &&
- $rewrite ne $obj) {
- $rewrite = rewrite_commit_adddummy $refname, $obj, $rewrite;
- }
} elsif ($type eq 'tag') {
$rewrite = rewrite_tag($obj);
} else {