undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix'

Browse Source 
* fix:
  git-send-email: fix version string to be valid perl
  Give the user a hint for how to continue in the case that git-am fails because it requires user intervention
This commit is contained in:
Junio C Hamano 2006-05-02 15:05:34 -07:00
commit 782b3b6aaf
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
git-am.sh
View File

@ -14,6 +14,26 @@ stop_here () {
exit 1 exit 1
} }
stop_here_user_resolve () {
cmdline=$(basename $0)
if test '' != "$interactive"
then
cmdline="$cmdline -i"
fi
if test '' != "$threeway"
then
cmdline="$cmdline -3"
fi
if test '.dotest' != "$dotest"
then
cmdline="$cmdline -d=$dotest"
fi
echo "When you have resolved this problem run \"$cmdline --resolved\"."
echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
stop_here $1
}
go_next () { go_next () {
rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \ rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
"$dotest/patch" "$dotest/info" "$dotest/patch" "$dotest/info"
@ -374,14 +394,14 @@ do
if test '' = "$changed" if test '' = "$changed"
then then
echo "No changes - did you forget update-index?" echo "No changes - did you forget update-index?"
stop_here $this stop_here_user_resolve $this
fi fi
unmerged=$(git-ls-files -u) unmerged=$(git-ls-files -u)
if test -n "$unmerged" if test -n "$unmerged"
then then
echo "You still have unmerged paths in your index" echo "You still have unmerged paths in your index"
echo "did you forget update-index?" echo "did you forget update-index?"
stop_here $this stop_here_user_resolve $this
fi fi
apply_status=0 apply_status=0
;; ;;
@ -407,7 +427,7 @@ do
if test $apply_status != 0 if test $apply_status != 0
then then
echo Patch failed at $msgnum. echo Patch failed at $msgnum.
stop_here $this stop_here_user_resolve $this
fi fi
if test -x "$GIT_DIR"/hooks/pre-applypatch if test -x "$GIT_DIR"/hooks/pre-applypatch

9
git-send-email.perl
View File

@ -291,6 +291,13 @@ sub send_message
my $to = join (",\n\t", @recipients); my $to = join (",\n\t", @recipients);
@recipients = unique_email_list(@recipients,@cc); @recipients = unique_email_list(@recipients,@cc);
my $date = strftime('%a, %d %b %Y %H:%M:%S %z', localtime($time++)); my $date = strftime('%a, %d %b %Y %H:%M:%S %z', localtime($time++));
my $gitversion = '@@GIT_VERSION@@';
if ($gitversion =~ m/..GIT_VERSION../) {
$gitversion = `git --version`;
chomp $gitversion;
# keep only what's after the last space
$gitversion =~ s/^.* //;
}
my $header = "From: $from my $header = "From: $from
To: $to To: $to
@ -299,7 +306,7 @@ Subject: $subject
Reply-To: $from Reply-To: $from
Date: $date Date: $date
Message-Id: $message_id Message-Id: $message_id
X-Mailer: git-send-email @@GIT_VERSION@@ X-Mailer: git-send-email $gitversion
"; ";
$header .= "In-Reply-To: $reply_to\n" if $reply_to; $header .= "In-Reply-To: $reply_to\n" if $reply_to;