chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Break out commit_admin (nfc)
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 6fd8f7d768fc7058e4db69f5000f33e7f4b01dee..9d8f9d428e4f6752fe247ecc2133f91b0b47e9b0 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-976,6
+976,12
@@
sub prep_ud () {
mkdir $ud or die $!;
}
mkdir $ud or die $!;
}
+sub mktree_in_ud_here () {
+ runcmd qw(git init -q);
+ rmtree('.git/objects');
+ symlink '../../../../objects','.git/objects' or die $!;
+}
+
sub mktree_in_ud_from_only_subdir () {
# changes into the subdir
my (@dirs) = <*/.>;
sub mktree_in_ud_from_only_subdir () {
# changes into the subdir
my (@dirs) = <*/.>;
@@
-984,10
+990,7
@@
sub mktree_in_ud_from_only_subdir () {
my $dir = $1;
changedir $dir;
fail "source package contains .git directory" if stat_exists '.git';
my $dir = $1;
changedir $dir;
fail "source package contains .git directory" if stat_exists '.git';
- die $! unless $!==&ENOENT;
- runcmd qw(git init -q);
- rmtree('.git/objects');
- symlink '../../../../objects','.git/objects' or die $!;
+ mktree_in_ud_here();
runcmd @git, qw(add -Af);
my $tree = cmdoutput @git, qw(write-tree);
$tree =~ m/^\w+$/ or die "$tree ?";
runcmd @git, qw(add -Af);
my $tree = cmdoutput @git, qw(write-tree);
$tree =~ m/^\w+$/ or die "$tree ?";
@@
-1025,9
+1028,12
@@
sub dsc_files () {
map { $_->{Filename} } dsc_files_info();
}
map { $_->{Filename} } dsc_files_info();
}
-sub is_orig_file ($) {
- local ($_) = @_;
- m/\.orig(?:-\w+)?\.tar\.\w+$/;
+sub is_orig_file ($;$) {
+ local ($_) = $_[0];
+ my $base = $_[1];
+ m/\.orig(?:-\w+)?\.tar\.\w+$/ or return 0;
+ defined $base or return 1;
+ return $` eq $base;
}
sub make_commit ($) {
}
sub make_commit ($) {
@@
-1360,6
+1366,12
@@
sub check_not_dirty () {
}
}
}
}
+sub commit_admin ($) {
+ my ($m) = @_;
+ progress "$m";
+ runcmd_ordryrun_local @git, qw(commit -m), $m;
+}
+
sub commit_quilty_patch () {
my $output = cmdoutput @git, qw(status --porcelain);
my %adds;
sub commit_quilty_patch () {
my $output = cmdoutput @git, qw(status --porcelain);
my %adds;
@@
-1374,9
+1386,7
@@
sub commit_quilty_patch () {
return;
}
runcmd_ordryrun_local @git, qw(add), sort keys %adds;
return;
}
runcmd_ordryrun_local @git, qw(add), sort keys %adds;
- my $m = "Commit Debian 3.0 (quilt) metadata";
- progress "$m";
- runcmd_ordryrun_local @git, qw(commit -m), $m;
+ commit_admin "Commit Debian 3.0 (quilt) metadata";
}
sub madformat ($) {
}
sub madformat ($) {