Merge branch 'master' into entr-fswatcher

Author: jonas

.travis.yml

@@ -1,5 +1,4 @@
 language: c
-
 sudo: false
 
 addons:
@@ -10,10 +9,8 @@ addons:
     - valgrind
 
 env:
-  global:
-  matrix:
-    - TRAVIS_TIG=autoconf
-    - TRAVIS_TIG=config
+  - TIG_BUILD=autoconf
+  - TIG_BUILD=config.make
 
 compiler:
   - gcc
@@ -23,6 +20,14 @@ script: tools/travis.sh
 
 matrix:
   include:
+  - env: TIG_BUILD=valgrind
+    script: tools/travis.sh
+  - env: TIG_BUILD=address-sanitizer
+    compiler: clang
+    # LeakSanitizer requires ptrace capabilities
+    # https://github.com/travis-ci/travis-ci/issues/9033
+    sudo: required
+    script: tools/travis.sh
   - if: branch = master
     os: osx
     env:

Makefile

@@ -274,7 +274,7 @@ COMPAT_CPPFLAGS += -DNO_WORDEXP
 COMPAT_OBJS += compat/wordexp.o
 endif
 
-COMPAT_OBJS += compat/hashtab.o compat/wcwidth.o
+COMPAT_OBJS += compat/hashtab.o compat/utf8proc.o
 
 override CPPFLAGS += $(COMPAT_CPPFLAGS)
 
@@ -316,6 +316,7 @@ TIG_OBJS = \
 	src/stash.o \
 	src/grep.o \
 	src/ui.o \
+	src/apps.o \
 	$(GRAPH_OBJS) \
 	$(COMPAT_OBJS)
 
@@ -324,7 +325,7 @@ src/tig: $(TIG_OBJS)
 TEST_GRAPH_OBJS = test/tools/test-graph.o src/string.o src/util.o src/io.o $(GRAPH_OBJS) $(COMPAT_OBJS)
 test/tools/test-graph: $(TEST_GRAPH_OBJS)
 
-DOC_GEN_OBJS = tools/doc-gen.o src/string.o src/types.o src/util.o src/request.o compat/wcwidth.o
+DOC_GEN_OBJS = tools/doc-gen.o src/string.o src/types.o src/util.o src/request.o $(COMPAT_OBJS)
 tools/doc-gen: $(DOC_GEN_OBJS)
 
 OBJS = $(sort $(TIG_OBJS) $(TEST_GRAPH_OBJS) $(DOC_GEN_OBJS))

NEWS.adoc

@@ -1,6 +1,33 @@
 Release notes
 =============
 
+master
+------
+
+Improvements:
+
+ - Add 'send-child-enter' option to control interaction with child views. (#791)
+ - Update make config defaults for Cygwin to ncurses6. (GH #792)
+ - Build against netbsd-curses. (GH #789)
+ - Change the blame view to render more like `git blame`. (GH #812)
+ - Improve worktree and submodule support. (GH #459, #781, #783)
+ - Support running Tig via a Git alias. (GH #763)
+ - Use ISO-8601 letters for short relative dates. (GH #759, #760)
+ - Change date formatting to show timezones by default. (GH #428, #811)
+ - Use utf8proc to handle Unicode characters. (GH #827)
+
+Bug fixes:
+
+ - Fix `file(1)` argument on Linux used for resolving encodings. (GH #788)
+ - Fix underflow in the file search. (GH #800, #801)
+ - Fix line numbers in grep view when scrolled. (GH #813)
+ - Pass command line args through to the stage view. (GH #569, #823)
+ - Fix resource leak. (GH #780)
+ - Fix various compiler warnings and pointer arithmetic. (GH #799, #803)
+ - Workaround potential null pointer dereferences. (GH #824)
+ - Bind to single and double quotes by using the *<SingleQuote>* and
+   *<DoubleQuote>* key mappings. (GH #821)
+
 tig-2.3.3
 ---------
 

README.adoc

@@ -2,7 +2,8 @@ Tig: text-mode interface for Git
 ================================
 :docext: adoc
 
-image:https://secure.travis-ci.org/jonas/tig.svg?branch=master[Build Status,link=http://travis-ci.org/jonas/tig]
+image:https://secure.travis-ci.org/jonas/tig.svg?branch=master[Travis Build,link=https://travis-ci.org/jonas/tig]
+image:https://ci.appveyor.com/api/projects/status/jxt1uf52o7r0a8r7/branch/master?svg=true[AppVeyor Build,link=https://ci.appveyor.com/project/fonseca/tig]
 image:https://badges.gitter.im/Join%20Chat.svg[Join Chat,link="https://gitter.im/jonas/tig?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
 
 What is Tig?

appveyor.yml

@@ -0,0 +1,16 @@
+environment:
+  matrix:
+  - TARGET: cygwin64
+    ARCH: x86_64
+
+install:
+ - cmd: C:\%TARGET%\setup-%ARCH%.exe -qgnNdO -l C:\%TARGET%\var\cache\setup -R C:\%TARGET% -s http://cygwin.mirror.constant.com -P git -P gcc-code -P make -P automake -P libiconv-devel -P libncurses-devel
+ - cmd: SET PATH=C:\%TARGET%\bin;%PATH%
+
+build_script:
+ - make configure
+ - sh configure
+ - make
+
+test_script:
+ - make test

compat/hashtab.c

@@ -1,6 +1,5 @@
 /* An expandable hash tables datatype.
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 1999-2018 Free Software Foundation, Inc.
    Contributed by Vladimir Makarov ([email protected]).
 
 This file is part of the libiberty library.
@@ -729,7 +728,7 @@ htab_remove_elt_with_hash (htab_t htab, PTR element, hashval_t hash)
   PTR *slot;
 
   slot = htab_find_slot_with_hash (htab, element, hash, NO_INSERT);
-  if (*slot == HTAB_EMPTY_ENTRY)
+  if (!slot || *slot == HTAB_EMPTY_ENTRY)
     return;
 
   if (htab->del_f)
@@ -965,17 +964,17 @@ iterative_hash (const PTR k_in /* the key */,
   c += length;
   switch(len)              /* all the case statements fall through */
     {
-    case 11: c+=((hashval_t)k[10]<<24);
-    case 10: c+=((hashval_t)k[9]<<16);
-    case 9 : c+=((hashval_t)k[8]<<8);
+    case 11: c+=((hashval_t)k[10]<<24);	/* fall through */
+    case 10: c+=((hashval_t)k[9]<<16);	/* fall through */
+    case 9 : c+=((hashval_t)k[8]<<8);	/* fall through */
       /* the first byte of c is reserved for the length */
-    case 8 : b+=((hashval_t)k[7]<<24);
-    case 7 : b+=((hashval_t)k[6]<<16);
-    case 6 : b+=((hashval_t)k[5]<<8);
-    case 5 : b+=k[4];
-    case 4 : a+=((hashval_t)k[3]<<24);
-    case 3 : a+=((hashval_t)k[2]<<16);
-    case 2 : a+=((hashval_t)k[1]<<8);
+    case 8 : b+=((hashval_t)k[7]<<24);	/* fall through */
+    case 7 : b+=((hashval_t)k[6]<<16);	/* fall through */
+    case 6 : b+=((hashval_t)k[5]<<8);	/* fall through */
+    case 5 : b+=k[4];			/* fall through */
+    case 4 : a+=((hashval_t)k[3]<<24);	/* fall through */
+    case 3 : a+=((hashval_t)k[2]<<16);	/* fall through */
+    case 2 : a+=((hashval_t)k[1]<<8);	/* fall through */
     case 1 : a+=k[0];
       /* case 0: nothing left to add */
     }