Make apply accept the -pNUM option like patch does.
[alt-git.git] / git-fmt-merge-msg.perl
blob778388e254e8ecc07494c168aec503e3bc511fb3
1 #!/usr/bin/perl -w
3 # Copyright (c) 2005 Junio C Hamano
5 # Read .git/FETCH_HEAD and make a human readable merge message
6 # by grouping branches and tags together to form a single line.
8 use strict;
10 my @src;
11 my %src;
12 sub andjoin {
13 my ($label, $labels, $stuff) = @_;
14 my $l = scalar @$stuff;
15 my $m = '';
16 if ($l == 0) {
17 return ();
19 if ($l == 1) {
20 $m = "$label$stuff->[0]";
22 else {
23 $m = ("$labels" .
24 join (', ', @{$stuff}[0..$l-2]) .
25 " and $stuff->[-1]");
27 return ($m);
30 while (<>) {
31 my ($bname, $tname, $gname, $src);
32 chomp;
33 s/^[0-9a-f]* //;
34 next if (/^not-for-merge/);
35 s/^ //;
36 if (s/ of (.*)$//) {
37 $src = $1;
38 } else {
39 # Pulling HEAD
40 $src = $_;
41 $_ = 'HEAD';
43 if (! exists $src{$src}) {
44 push @src, $src;
45 $src{$src} = {
46 BRANCH => [],
47 TAG => [],
48 GENERIC => [],
49 # &1 == has HEAD.
50 # &2 == has others.
51 HEAD_STATUS => 0,
54 if (/^branch (.*)$/) {
55 push @{$src{$src}{BRANCH}}, $1;
56 $src{$src}{HEAD_STATUS} |= 2;
58 elsif (/^tag (.*)$/) {
59 push @{$src{$src}{TAG}}, $1;
60 $src{$src}{HEAD_STATUS} |= 2;
62 elsif (/^HEAD$/) {
63 $src{$src}{HEAD_STATUS} |= 1;
65 else {
66 push @{$src{$src}{GENERIC}}, $_;
67 $src{$src}{HEAD_STATUS} |= 2;
71 my @msg;
72 for my $src (@src) {
73 if ($src{$src}{HEAD_STATUS} == 1) {
74 # Only HEAD is fetched, nothing else.
75 push @msg, $src;
76 next;
78 my @this;
79 if ($src{$src}{HEAD_STATUS} == 3) {
80 # HEAD is fetched among others.
81 push @this, andjoin('', '', ['HEAD']);
83 push @this, andjoin("branch ", "branches ",
84 $src{$src}{BRANCH});
85 push @this, andjoin("tag ", "tags ",
86 $src{$src}{TAG});
87 push @this, andjoin("commit ", "commits ",
88 $src{$src}{GENERIC});
89 my $this = join(', ', @this);
90 if ($src ne '.') {
91 $this .= " of $src";
93 push @msg, $this;
95 print "Merge ", join("; ", @msg), "\n";