Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tig for openSUSE:Factory checked in at 2021-06-09 21:52:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tig (Old) and /work/SRC/openSUSE:Factory/.tig.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tig" Wed Jun 9 21:52:18 2021 rev:48 rq:898266 version:2.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/tig/tig.changes 2021-03-30 21:05:50.809076957 +0200 +++ /work/SRC/openSUSE:Factory/.tig.new.32437/tig.changes 2021-06-09 21:52:35.854506342 +0200 @@ -1,0 +2,16 @@ +Mon Jun 7 18:23:09 UTC 2021 - Michael Vetter <[email protected]> + +- Update to 2.5.4: + Improvements: + * Add FreeBSD installation instructions. (#1093) + * Add TIG_EDITOR environment variable to configure editor. (#889, #1098) + * Enable mailmap by default to match git log's behaviour. (#1104, #1105) + * Enable tilde expansion for diff-highlight. (#1107) + Bug fixes: + * Escape variables with %% in external commands. (#1091, #1095) + * Fix parsing of -L argument. (#1100) + * Bugfix: smart-case does not work when search term contains a space. (#1108) + * Use ncursesw by default on Linux. (#920) + * Replace obsolete macro `AC_CONFIG_HEADER' in configure.ac. + +------------------------------------------------------------------- Old: ---- tig-2.5.3.tar.gz New: ---- tig-2.5.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tig.spec ++++++ --- /var/tmp/diff_new_pack.UYR0px/_old 2021-06-09 21:52:36.254507055 +0200 +++ /var/tmp/diff_new_pack.UYR0px/_new 2021-06-09 21:52:36.254507055 +0200 @@ -17,7 +17,7 @@ Name: tig -Version: 2.5.3 +Version: 2.5.4 Release: 0 Summary: An ncurses-based text-mode interface for git License: GPL-2.0-or-later ++++++ tig-2.5.3.tar.gz -> tig-2.5.4.tar.gz ++++++ ++++ 7344 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/INSTALL.adoc new/tig-2.5.4/INSTALL.adoc --- old/tig-2.5.3/INSTALL.adoc 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/INSTALL.adoc 2021-06-05 18:08:31.000000000 +0200 @@ -6,8 +6,8 @@ repository http://github.com/jonas/tig[git://github.com/jonas/tig.git]. The latest version is: -https://github.com/jonas/tig/releases/download/tig-2.5.3/tig-2.5.3.tar.gz[tig-2.5.3] -https://github.com/jonas/tig/releases/download/tig-2.5.3/tig-2.5.3.tar.gz.sha256[(sha256)] +https://github.com/jonas/tig/releases/download/tig-2.5.4/tig-2.5.4.tar.gz[tig-2.5.4] +https://github.com/jonas/tig/releases/download/tig-2.5.4/tig-2.5.4.tar.gz.sha256[(sha256)] *Note:* Do not use the tar.gz file for version 2.0 because it will fail to compile due to issue https://github.com/jonas/tig/pull/283[#283] and @@ -26,9 +26,10 @@ Additional build options can be defined in the `config.make` file, which is loaded automatically when running `make` if it exists. By default, -`contrib/config.make-$kernel_name` is loaded if it exists (currently only -available for macOS [`Darwin`] and Cygwin). See `contrib/config.make` for -example build options. +`contrib/config.make-$kernel_name` is loaded if it exists (currently +available for Linux, macOS [`Darwin`] and Cygwin but Linux users should +prefer the `configure` script). See `contrib/config.make` for example build +options. Documentation files, such as manpages, are distributed in the release tarballs, and can be installed using: @@ -97,9 +98,16 @@ Installation using Nix ---------------------- -You can use link:https://nixos.org/nix/[Nix] to install Tig on NixOS, or any Linux/OSX distribution with Nix installed: +You can use link:https://nixos.org/nix/[Nix] to install Tig on NixOS, or any Linux/macOS distribution with Nix installed: $ nix-env -i tig + +Installation on FreeBSD +----------------------- + +You can use link:https://man.freebsd.org/pkg/8[pkg] to install Tig on FreeBSD: + + $ pkg install tig Installation on Windows ----------------------- @@ -120,7 +128,7 @@ ------------------- Build settings are read from the file `config.make` and for certain systems also -from `contrib/config.make-$kernel`. An example of the latter is Mac OS X, where +from `contrib/config.make-$kernel`. An example of the latter is macOS, where `contrib/config.make-Darwin` provides out-of-the-box configuration for using the system ncurses library and linking with the iconv library. This makes it easy to configure the build without having to use the `configure` script. As a side diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/INSTALL.html new/tig-2.5.4/INSTALL.html --- old/tig-2.5.3/INSTALL.html 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/INSTALL.html 2021-06-05 18:08:31.000000000 +0200 @@ -742,8 +742,8 @@ <div class="paragraph"><p>Download a tarball from <a href="https://github.com/jonas/tig/releases";>https://github.com/jonas/tig/releases</a> or clone the Tig repository <a href="http://github.com/jonas/tig";>git://github.com/jonas/tig.git</a>.</p></div> <div class="paragraph"><p>The latest version is: -<a href="https://github.com/jonas/tig/releases/download/tig-2.5.3/tig-2.5.3.tar.gz";>tig-2.5.3</a> -<a href="https://github.com/jonas/tig/releases/download/tig-2.5.3/tig-2.5.3.tar.gz.sha256";>(sha256)</a></p></div> +<a href="https://github.com/jonas/tig/releases/download/tig-2.5.4/tig-2.5.4.tar.gz";>tig-2.5.4</a> +<a href="https://github.com/jonas/tig/releases/download/tig-2.5.4/tig-2.5.4.tar.gz.sha256";>(sha256)</a></p></div> <div class="paragraph"><p><strong>Note:</strong> Do not use the tar.gz file for version 2.0 because it will fail to compile due to issue <a href="https://github.com/jonas/tig/pull/283";>#283</a> and <a href="https://github.com/jonas/tig/issues/337";>#337</a></p></div> @@ -762,9 +762,10 @@ </div></div> <div class="paragraph"><p>Additional build options can be defined in the <code>config.make</code> file, which is loaded automatically when running <code>make</code> if it exists. By default, -<code>contrib/config.make-$kernel_name</code> is loaded if it exists (currently only -available for macOS [<code>Darwin</code>] and Cygwin). See <code>contrib/config.make</code> for -example build options.</p></div> +<code>contrib/config.make-$kernel_name</code> is loaded if it exists (currently +available for Linux, macOS [<code>Darwin</code>] and Cygwin but Linux users should +prefer the <code>configure</code> script). See <code>contrib/config.make</code> for example build +options.</p></div> <div class="paragraph"><p>Documentation files, such as manpages, are distributed in the release tarballs, and can be installed using:</p></div> <div class="literalblock"> @@ -841,7 +842,7 @@ <div class="sect1"> <h2 id="_installation_using_nix">Installation using Nix</h2> <div class="sectionbody"> -<div class="paragraph"><p>You can use <a href="https://nixos.org/nix/";>Nix</a> to install Tig on NixOS, or any Linux/OSX distribution with Nix installed:</p></div> +<div class="paragraph"><p>You can use <a href="https://nixos.org/nix/";>Nix</a> to install Tig on NixOS, or any Linux/macOS distribution with Nix installed:</p></div> <div class="literalblock"> <div class="content"> <pre><code>$ nix-env -i tig</code></pre> @@ -849,6 +850,16 @@ </div> </div> <div class="sect1"> +<h2 id="_installation_on_freebsd">Installation on FreeBSD</h2> +<div class="sectionbody"> +<div class="paragraph"><p>You can use <a href="https://man.freebsd.org/pkg/8";>pkg</a> to install Tig on FreeBSD:</p></div> +<div class="literalblock"> +<div class="content"> +<pre><code>$ pkg install tig</code></pre> +</div></div> +</div> +</div> +<div class="sect1"> <h2 id="_installation_on_windows">Installation on Windows</h2> <div class="sectionbody"> <div class="paragraph"><p>Easiest way is to install <a href="https://gitforwindows.org/";>Git-for-Windows</a>. As @@ -866,7 +877,7 @@ <h2 id="_build_configuration">Build configuration</h2> <div class="sectionbody"> <div class="paragraph"><p>Build settings are read from the file <code>config.make</code> and for certain systems also -from <code>contrib/config.make-$kernel</code>. An example of the latter is Mac OS X, where +from <code>contrib/config.make-$kernel</code>. An example of the latter is macOS, where <code>contrib/config.make-Darwin</code> provides out-of-the-box configuration for using the system ncurses library and linking with the iconv library. This makes it easy to configure the build without having to use the <code>configure</code> script. As a side @@ -1015,7 +1026,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-03-07 11:29:01 CET + 2021-06-05 18:08:08 CEST </div> </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/Makefile new/tig-2.5.4/Makefile --- old/tig-2.5.3/Makefile 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/Makefile 2021-06-05 18:08:31.000000000 +0200 @@ -2,7 +2,7 @@ # The last tagged version. Can be overridden either by the version from # git or from the value of the DIST_VERSION environment variable. -VERSION = 2.5.3 +VERSION = 2.5.4 all: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/NEWS.adoc new/tig-2.5.4/NEWS.adoc --- old/tig-2.5.3/NEWS.adoc 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/NEWS.adoc 2021-06-05 18:08:31.000000000 +0200 @@ -1,6 +1,24 @@ Release notes ============= +tig-2.5.4 +--------- + +Improvements: + + - Add FreeBSD installation instructions. (#1093) + - Add TIG_EDITOR environment variable to configure editor. (#889, #1098) + - Enable mailmap by default to match git log's behaviour. (#1104, #1105) + - Enable tilde expansion for diff-highlight. (#1107) + +Bug fixes: + + - Escape variables with %% in external commands. (#1091, #1095) + - Fix parsing of -L argument. (#1100) + - Bugfix: smart-case does not work when search term contains a space. (#1108) + - Use ncursesw by default on Linux. (#920) + - Replace obsolete macro `AC_CONFIG_HEADER' in configure.ac. + tig-2.5.3 --------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/NEWS.html new/tig-2.5.4/NEWS.html --- old/tig-2.5.3/NEWS.html 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/NEWS.html 2021-06-05 18:08:31.000000000 +0200 @@ -738,6 +738,62 @@ </div> <div id="content"> <div class="sect1"> +<h2 id="_tig_2_5_4">tig-2.5.4</h2> +<div class="sectionbody"> +<div class="paragraph"><p>Improvements:</p></div> +<div class="ulist"><ul> +<li> +<p> +Add FreeBSD installation instructions. (#1093) +</p> +</li> +<li> +<p> +Add TIG_EDITOR environment variable to configure editor. (#889, #1098) +</p> +</li> +<li> +<p> +Enable mailmap by default to match git log’s behaviour. (#1104, #1105) +</p> +</li> +<li> +<p> +Enable tilde expansion for diff-highlight. (#1107) +</p> +</li> +</ul></div> +<div class="paragraph"><p>Bug fixes:</p></div> +<div class="ulist"><ul> +<li> +<p> +Escape variables with %% in external commands. (#1091, #1095) +</p> +</li> +<li> +<p> +Fix parsing of -L argument. (#1100) +</p> +</li> +<li> +<p> +Bugfix: smart-case does not work when search term contains a space. (#1108) +</p> +</li> +<li> +<p> +Use ncursesw by default on Linux. (#920) +</p> +</li> +<li> +<p> +Replace obsolete macro ‘AC_CONFIG_HEADER’ in configure.ac. +</p> +</li> +</ul></div> +</div> +</div> +<div class="sect1"> <h2 id="_tig_2_5_3">tig-2.5.3</h2> <div class="sectionbody"> <div class="paragraph"><p>Bug fixes:</p></div> @@ -4596,7 +4652,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-03-07 11:29:01 CET + 2021-06-05 18:08:08 CEST </div> </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/config.h.in new/tig-2.5.4/config.h.in --- old/tig-2.5.3/config.h.in 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/config.h.in 2021-06-05 18:08:31.000000000 +0200 @@ -35,9 +35,6 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - /* Define to 1 if you have the `mkstemps' function. */ #undef HAVE_MKSTEMPS @@ -77,6 +74,9 @@ /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the <stdio.h> header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H @@ -137,5 +137,7 @@ /* minor version of installed readline library */ #undef RL_VERSION_MINOR -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/configure.ac new/tig-2.5.4/configure.ac --- old/tig-2.5.3/configure.ac 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/configure.ac 2021-06-05 18:08:31.000000000 +0200 @@ -1,7 +1,7 @@ AC_INIT([tig],[0],[[email protected]],[tig]) AC_LANG([C]) -AC_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR(src) dnl Document where we keep our .m4 file. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/contrib/config.make-Darwin new/tig-2.5.4/contrib/config.make-Darwin --- old/tig-2.5.3/contrib/config.make-Darwin 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/contrib/config.make-Darwin 2021-06-05 18:08:31.000000000 +0200 @@ -1,4 +1,4 @@ -# Example configuration for Darwin / Mac OS X. +# Example configuration for Darwin / macOS. # Work-around for Homebrew-based xmlto. export XML_CATALOG_FILES=/usr/local/etc/xml/catalog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/contrib/config.make-Linux new/tig-2.5.4/contrib/config.make-Linux --- old/tig-2.5.3/contrib/config.make-Linux 1970-01-01 01:00:00.000000000 +0100 +++ new/tig-2.5.4/contrib/config.make-Linux 2021-06-05 18:08:31.000000000 +0200 @@ -0,0 +1,8 @@ +# Example configuration for Linux. +# +# Use ncursesw. + +TIG_NCURSES = -lncursesw +TIG_CPPFLAGS = -DHAVE_NCURSESW_CURSES_H + +# vim: ft=make: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/doc/tig.1 new/tig-2.5.4/doc/tig.1 --- old/tig-2.5.3/doc/tig.1 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/doc/tig.1 2021-06-05 18:08:31.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: tig .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2021 +.\" Date: 06/05/2021 .\" Manual: Tig Manual -.\" Source: Tig 2.5.3 +.\" Source: Tig 2.5.4 .\" Language: English .\" -.TH "TIG" "1" "03/07/2021" "Tig 2\&.5\&.3" "Tig Manual" +.TH "TIG" "1" "06/05/2021" "Tig 2\&.5\&.4" "Tig Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -426,6 +426,11 @@ .RS 4 Open Tig without rendering anything to the terminal\&. This force Ncurses to write to /dev/null\&. The main use is for automated testing of Tig\&. .RE +.PP +TIG_EDITOR +.RS 4 +The editor command to use when visiting files\&. This environment variable overrides $GIT_EDITOR, $EDITOR and $VISUAL, so it allows to use a different editor from the one Git uses\&. +.RE .SH "FILES" .PP \fI$XDG_CONFIG_HOME/tig/config\fR, \fI~/\&.config/tig/config\fR, \fI~/\&.tigrc\fR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/doc/tig.1.adoc new/tig-2.5.4/doc/tig.1.adoc --- old/tig-2.5.3/doc/tig.1.adoc 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/doc/tig.1.adoc 2021-06-05 18:08:31.000000000 +0200 @@ -235,6 +235,11 @@ Open Tig without rendering anything to the terminal. This force Ncurses to write to /dev/null. The main use is for automated testing of Tig. +TIG_EDITOR:: + The editor command to use when visiting files. This environment + variable overrides $GIT_EDITOR, $EDITOR and $VISUAL, so it allows + to use a different editor from the one Git uses. + FILES ----- '$XDG_CONFIG_HOME/tig/config':: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/doc/tig.1.html new/tig-2.5.4/doc/tig.1.html --- old/tig-2.5.3/doc/tig.1.html 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/doc/tig.1.html 2021-06-05 18:08:31.000000000 +0200 @@ -1087,6 +1087,16 @@ to write to /dev/null. The main use is for automated testing of Tig. </p> </dd> +<dt class="hdlist1"> +TIG_EDITOR +</dt> +<dd> +<p> + The editor command to use when visiting files. This environment + variable overrides $GIT_EDITOR, $EDITOR and $VISUAL, so it allows + to use a different editor from the one Git uses. +</p> +</dd> </dl></div> </div> </div> @@ -1190,7 +1200,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-03-07 11:29:01 CET + 2021-06-05 18:08:08 CEST </div> </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/doc/tigmanual.7 new/tig-2.5.4/doc/tigmanual.7 --- old/tig-2.5.3/doc/tigmanual.7 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/doc/tigmanual.7 2021-06-05 18:08:31.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: tigmanual .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2021 +.\" Date: 06/05/2021 .\" Manual: Tig Manual -.\" Source: Tig 2.5.3 +.\" Source: Tig 2.5.4 .\" Language: English .\" -.TH "TIGMANUAL" "7" "03/07/2021" "Tig 2\&.5\&.3" "Tig Manual" +.TH "TIGMANUAL" "7" "06/05/2021" "Tig 2\&.5\&.4" "Tig Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/doc/tigrc.5 new/tig-2.5.4/doc/tigrc.5 --- old/tig-2.5.3/doc/tigrc.5 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/doc/tigrc.5 2021-06-05 18:08:31.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: tigrc .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/07/2021 +.\" Date: 06/05/2021 .\" Manual: Tig Manual -.\" Source: Tig 2.5.3 +.\" Source: Tig 2.5.4 .\" Language: English .\" -.TH "TIGRC" "5" "03/07/2021" "Tig 2\&.5\&.3" "Tig Manual" +.TH "TIGRC" "5" "06/05/2021" "Tig 2\&.5\&.4" "Tig Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -82,7 +82,7 @@ .PP \fIcore\&.editor\fR .RS 4 -The editor command\&. Can be overridden by setting GIT_EDITOR\&. +The editor command\&. Can be overridden by setting TIG_EDITOR or GIT_EDITOR\&. .RE .PP \fIcore\&.worktree\fR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/doc/tigrc.5.adoc new/tig-2.5.4/doc/tigrc.5.adoc --- old/tig-2.5.3/doc/tigrc.5.adoc 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/doc/tigrc.5.adoc 2021-06-05 18:08:31.000000000 +0200 @@ -67,7 +67,8 @@ 'core.editor':: - The editor command. Can be overridden by setting GIT_EDITOR. + The editor command. Can be overridden by setting TIG_EDITOR or + GIT_EDITOR. 'core.worktree':: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/doc/tigrc.5.html new/tig-2.5.4/doc/tigrc.5.html --- old/tig-2.5.3/doc/tigrc.5.html 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/doc/tigrc.5.html 2021-06-05 18:08:31.000000000 +0200 @@ -813,7 +813,8 @@ </dt> <dd> <p> - The editor command. Can be overridden by setting GIT_EDITOR. + The editor command. Can be overridden by setting TIG_EDITOR or + GIT_EDITOR. </p> </dd> <dt class="hdlist1"> @@ -2889,7 +2890,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-03-05 19:11:58 CET + 2021-06-05 18:08:08 CEST </div> </div> </body> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/src/apps.c new/tig-2.5.4/src/apps.c --- old/tig-2.5.3/src/apps.c 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/src/apps.c 2021-06-05 18:08:31.000000000 +0200 @@ -57,19 +57,22 @@ static bool app_diff_highlight_path_search(char *dest, size_t destlen, const char *query) { + const char *env_path = getenv("PATH"); + char env_path_plus[SIZEOF_MED_STR]; + char exec_path[SIZEOF_STR]; + if (!query || !*query) return false; + if (strchr(query, '~')) + return path_expand(dest, destlen, query); + if (strchr(query, '/')) { /* can only be interpreted as a fully qualified path */ string_ncopy_do(dest, destlen, query, strlen(query)); return true; } - const char *env_path = getenv("PATH"); - char env_path_plus[SIZEOF_MED_STR]; - char exec_path[SIZEOF_STR]; - if (!env_path || !*env_path) env_path = _PATH_DEFPATH; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/src/argv.c new/tig-2.5.4/src/argv.c --- old/tig-2.5.3/src/argv.c 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/src/argv.c 2021-06-05 18:08:31.000000000 +0200 @@ -335,9 +335,10 @@ while (arg) { const char *var = strstr(arg, "%("); + const char *esc = var > arg && *(var - 1) == '%' ? var - 1 : NULL; const char *closing = var ? strchr(var, ')') : NULL; - const char *next = closing ? closing + 1 : NULL; - const int len = var ? var - arg : strlen(arg); + const char *next = esc > arg ? esc : closing ? closing + 1 : NULL; + const int len = var && !esc ? var - arg : esc > arg ? esc - arg : next ? next - ++arg : strlen(arg); if (var && !closing) return false; @@ -345,7 +346,7 @@ if (len && !string_format_from(format->buf, &format->bufpos, "%.*s", len, arg)) return false; - if (var && !format_expand_arg(format, var, next)) + if (var && !esc && !format_expand_arg(format, var, next)) return false; arg = next; @@ -576,6 +577,7 @@ "--grep=", "-G", "-S", + "-L", }; size_t arglen = strlen(arg); bool graph = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/src/display.c new/tig-2.5.4/src/display.c --- old/tig-2.5.3/src/display.c 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/src/display.c 2021-06-05 18:08:31.000000000 +0200 @@ -132,7 +132,9 @@ const char *editor; int argc = 0; - editor = getenv("GIT_EDITOR"); + editor = getenv("TIG_EDITOR"); + if (!editor) + editor = getenv("GIT_EDITOR"); if (!editor && *opt_editor) editor = opt_editor; if (!editor) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/src/log.c new/tig-2.5.4/src/log.c --- old/tig-2.5.3/src/log.c 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/src/log.c 2021-06-05 18:08:31.000000000 +0200 @@ -65,8 +65,8 @@ { const char *log_argv[] = { "git", "log", encoding_arg, commit_order_arg(), "--cc", - "--stat", "%(logargs)", "%(cmdlineargs)", "%(revargs)", - "--no-color", "--", "%(fileargs)", NULL + "--stat", use_mailmap_arg(), "%(logargs)", "%(cmdlineargs)", + "%(revargs)", "--no-color", "--", "%(fileargs)", NULL }; return begin_update(view, NULL, log_argv, flags); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/src/options.c new/tig-2.5.4/src/options.c --- old/tig-2.5.3/src/options.c 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/src/options.c 2021-06-05 18:08:31.000000000 +0200 @@ -144,7 +144,7 @@ const char * use_mailmap_arg() { - return opt_mailmap ? "--use-mailmap" : ""; + return opt_mailmap ? "--use-mailmap" : "--no-use-mailmap"; } const char * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/src/string.c new/tig-2.5.4/src/string.c --- old/tig-2.5.3/src/string.c 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/src/string.c 2021-06-05 18:08:31.000000000 +0200 @@ -320,7 +320,7 @@ break; property = utf8proc_get_property(unicode); - if (property->category & category) + if (property->category == category) return true; text += slen; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/test/main/filter-args-test new/tig-2.5.4/test/main/filter-args-test --- old/tig-2.5.3/test/main/filter-args-test 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/test/main/filter-args-test 2021-06-05 18:08:31.000000000 +0200 @@ -38,7 +38,7 @@ EOF assert_equals 'log.trace' <<EOF -git log --encoding=UTF-8 --topo-order --exclude=refs/remotes/origin/* --exclude=refs/heads/master --all --date=raw --parents --no-color --show-notes --pretty=format:commit %m %H %P%x00%an <%ae> %ad%x00%s%x00%N -- common tracer +git log --encoding=UTF-8 --topo-order --exclude=refs/remotes/origin/* --exclude=refs/heads/master --all --date=raw --parents --no-color --show-notes --pretty=format:commit %m %H %P%x00%aN <%aE> %ad%x00%s%x00%N -- common tracer EOF assert_equals 'filtered.screen' <<EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/test/tigrc/escape-var-test new/tig-2.5.4/test/tigrc/escape-var-test --- old/tig-2.5.3/test/tigrc/escape-var-test 1970-01-01 01:00:00.000000000 +0100 +++ new/tig-2.5.4/test/tigrc/escape-var-test 2021-06-05 18:08:31.000000000 +0200 @@ -0,0 +1,19 @@ +#!/bin/sh + +. libtest.sh +. libgit.sh + +tigrc <<EOF +bind generic 1 @sh -c "echo '%%(refname)=%(refname)' > $HOME/shell-command.txt" +EOF + +steps ' + 1 +' + +in_work_dir create_repo_from_tgz "$base_dir/files/scala-js-benchmarks.tgz" +test_tig + +assert_equals 'shell-command.txt' <<EOF +%(refname)=master +EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/tig.spec new/tig-2.5.4/tig.spec --- old/tig-2.5.3/tig.spec 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/tig.spec 2021-06-05 18:08:31.000000000 +0200 @@ -3,7 +3,7 @@ Summary: Tig: text-mode interface for git Name: tig -Version: 2.5.3 +Version: 2.5.4 Release: 0%{?dist} License: GPL Group: Development/Tools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tig-2.5.3/tigrc new/tig-2.5.4/tigrc --- old/tig-2.5.3/tigrc 2021-03-07 11:29:24.000000000 +0100 +++ new/tig-2.5.4/tigrc 2021-06-05 18:08:31.000000000 +0200 @@ -118,7 +118,7 @@ #set blame-options = -C -C -C # User-defined options for `tig blame` (git-blame) #set log-options = --pretty=raw # User-defined options for `tig log` (git-log) #set main-options = -n 1000 # User-defined options for `tig` (git-log) -#set mailmap = yes # Use .mailmap to show canonical name and email address +set mailmap = yes # Use .mailmap to show canonical name and email address # Misc set start-on-head = no # Start with cursor on HEAD commit
