From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Stefan Beller <sbeller@google.com>
Subject: [PATCH] Announce: unset GIT_PAGER and add minimal usage in header
Date: Wed, 30 May 2018 16:27:50 -0700 [thread overview]
Message-ID: <20180530232750.10432-1-sbeller@google.com> (raw)
When running the Announce script in a terminal, the git shortlog will
open a pager, which is confusing as it leads to omission of the rest
of the message inside the pager. Do not page the output to avoid confusion.
While at it, add a basic usage example to the header, which illustrates
how it is used. This might be useful, but the way branch and previous
are set already help a lot.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
This applies to the todo branch. Not sure if it is worth it, though.
I played around with the Announce script after I realized that the
announcement emails are not checked in, but generated on the fly.
The reason I played around with the script is the two seemingly same
points
> * Rename detection logic in "diff" family that is used in "merge" has
> learned to guess when all of x/a, x/b and x/c have moved to z/a,
> z/b and z/c, it is likely that x/d added in the meantime would also
> want to move to z/d by taking the hint that the entire directory
> 'x' moved to 'z'. A bug causing dirty files involved in a rename
> to be overwritten during merge has also been fixed as part of this
> work.
The second time it appears, it also contains:
> Incidentally, this also avoids updating a file in the
> working tree after a (non-trivial) merge whose result matches what
> our side originally had.
which made me wonder how this message comes to life.
Thanks,
Stefan
Announce | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Announce b/Announce
index 91d0ba44cca..7c573e2fc40 100755
--- a/Announce
+++ b/Announce
@@ -1,11 +1,16 @@
#!/bin/sh
# Announcement message skelton
+# usage: Meta/Announce <version to announce> <diff-against>
+# e.g. Meta/Announce v2.18.0-rc0 v2.17.0
#
+
tmpbase=/var/tmp/git-announce.$$
trap 'rm -f $tmpbase.*' 0
branch=${1?branch}
previous=${2?previous}
commit=${3-"$1"}
+GIT_PAGER=
+export GIT_PAGER
relname=$(git describe "$commit") &&
vername=$(expr "$relname" : 'v\(.*\)') || exit $?
--
2.17.0.582.gccdcbd54c44.dirty
reply other threads:[~2018-05-30 23:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20180530232750.10432-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).