summaryrefslogtreecommitdiff
path: root/git-fmt-merge-msg.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-26 05:54:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-28 23:22:00 (GMT)
commit05dd8e2ee2ecba1b4ef1dbbde5c81281152604b4 (patch)
treea47668b32b27c0244faa7a9c186fad14f83c6b07 /git-fmt-merge-msg.perl
parent3e03aaf523331d4f3e92e680f75e6053d1813b64 (diff)
downloadgit-05dd8e2ee2ecba1b4ef1dbbde5c81281152604b4.zip
git-05dd8e2ee2ecba1b4ef1dbbde5c81281152604b4.tar.gz
git-05dd8e2ee2ecba1b4ef1dbbde5c81281152604b4.tar.bz2
Fix default pull not to do an unintended Octopus.
The refspecs specified in the .git/remotes/<remote> on the "Pull: " lines are for fetching multiple heads in one go, but most of the time making an Octopus out of them is not what is wanted. Make git-fetch leave the marker in .git/FETCH_HEAD file so that later stages can tell which heads are for merging and which are not. Tom Prince made me realize how stupid the original behaviour was. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-fmt-merge-msg.perl')
-rwxr-xr-xgit-fmt-merge-msg.perl4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index f0f3100..778388e 100755
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@ -31,6 +31,8 @@ while (<>) {
my ($bname, $tname, $gname, $src);
chomp;
s/^[0-9a-f]* //;
+ next if (/^not-for-merge/);
+ s/^ //;
if (s/ of (.*)$//) {
$src = $1;
} else {
@@ -86,7 +88,7 @@ for my $src (@src) {
$src{$src}{GENERIC});
my $this = join(', ', @this);
if ($src ne '.') {
- $this .= " from $src";
+ $this .= " of $src";
}
push @msg, $this;
}