From: Junio C Hamano <junio@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [GIT PULL] sh updates for 2.6.25
Date: Wed, 16 Apr 2008 13:02:42 -0700 [thread overview]
Message-ID: <7vve2hpnz1.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: alpine.LFD.1.00.0804151222350.2879@woody.linux-foundation.org
Linus Torvalds <torvalds@linux-foundation.org> writes:
> Ahh, looks like a git-am buglet then. It will indeed turn an empty subject
> line into an empty first line.
>
> We should run "git stripspace" on the whole thing, so maybe a patch
> something like the appended will help.
>
> NOTE! Totally untested! Beware the patch!
The basic idea is very sound and as usual your patch deletes more lines
than it adds, which always impresses me. I wish all our patches are like
this.
> @@ -388,6 +383,7 @@ do
> ;;
> esac
> esac
> + FIRSTLINE=$(head -1 "$dotest/final-commit")
>
> resume=
> if test "$interactive" = t
> @@ -408,7 +404,6 @@ do
> [aA]*) action=yes interactive= ;;
> [nN]*) action=skip ;;
> [eE]*) git_editor "$dotest/final-commit"
> - SUBJECT=$(reread_subject "$dotest/final-commit")
This needs to be replaced with re-assignment to FIRSTLINE, as the user may
have fixed the title in the editor; otherwise...
> @@ -431,7 +426,7 @@ do
> stop_here $this
> fi
>
> - printf 'Applying %s\n' "$SUBJECT"
> + printf 'Applying %s\n' "$FIRSTLINE"
... this would surprise the user who expects us to give the report with
the updated title.
next prev parent reply other threads:[~2008-04-16 20:03 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20080415172333.GA29489@linux-sh.org>
2008-04-15 18:01 ` [GIT PULL] sh updates for 2.6.25 Linus Torvalds
2008-04-15 18:18 ` Linus Torvalds
2008-04-15 18:30 ` Paul Mundt
2008-04-15 19:56 ` Linus Torvalds
2008-04-16 18:54 ` Alex Riesen
2008-04-16 20:02 ` Junio C Hamano [this message]
2008-04-16 20:17 ` Linus Torvalds
2008-04-15 18:41 ` Junio C Hamano
2008-04-15 18:43 ` Jakub Narebski
2008-04-16 0:37 ` Miklos Vajna
2008-04-16 1:06 ` [PATCH] format-patch: Make sure the subject is always a one-liner Miklos Vajna
2008-04-16 3:25 ` [GIT PULL] sh updates for 2.6.25 Junio C Hamano
2008-04-16 8:44 ` Miklos Vajna
2008-04-16 19:58 ` Re* " Junio C Hamano
2008-04-16 20:22 ` Jakub Narebski
2008-04-17 21:38 ` Miklos Vajna
2008-04-27 19:04 ` David Woodhouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vve2hpnz1.fsf@gitster.siamese.dyndns.org \
--to=junio@pobox.com \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).