All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Announce: unset GIT_PAGER and add minimal usage in header
@ 2018-05-30 23:27 Stefan Beller
  0 siblings, 0 replies; only message in thread
From: Stefan Beller @ 2018-05-30 23:27 UTC (permalink / raw)
  To: gitster; +Cc: git, Stefan Beller

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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2018-05-30 23:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-30 23:27 [PATCH] Announce: unset GIT_PAGER and add minimal usage in header Stefan Beller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.