delta/git.git, branch ls/travis-scriptify

travis-ci: fix "skip_branch_tip_with_tag()" string comparison

2017-09-22T01:58:29+00:00

09f5e97 ("travis-ci: skip a branch build if equal tag is present",
2017-09-17) introduced the "skip_branch_tip_with_tag" function with
a broken string comparison. Fix it!

Reported-by: SZEDER Gábor 
Signed-off-by: Lars Schneider 
Signed-off-by: Junio C Hamano

travis: dedent a few scripts that are indented overly deeply

2017-09-11T01:18:29+00:00

Signed-off-by: Junio C Hamano

travis-ci: skip a branch build if equal tag is present

2017-09-11T01:17:53+00:00

If we push a branch and a tag pointing to the HEAD of this branch,
then Travis CI would run the build twice. This wastes resources and
slows the testing.

Add a function to detect this situation and skip the build the branch
if appropriate. Invoke this function on every build.

Helped-by: Junio C Hamano 
Signed-off-by: Lars Schneider 
Signed-off-by: Junio C Hamano

travis-ci: move Travis CI code into dedicated scripts

2017-09-11T00:54:08+00:00

Most of the Travis CI commands are in the '.travis.yml'. The yml format
does not support functions and therefore code duplication is necessary
to run commands across all builds.

To fix this, add a library for common CI functions. Move all Travis CI
code into dedicated scripts and make them call the library first.

Signed-off-by: Lars Schneider 
Signed-off-by: Junio C Hamano

Prepare for 2.14.2

2017-08-23T21:36:03+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jt/t1450-fsck-corrupt-packfile' into maint

2017-08-23T21:33:52+00:00

A test update.

* jt/t1450-fsck-corrupt-packfile:
  tests: ensure fsck fails on corrupt packfiles

Merge branch 'jb/t8008-cleanup' into maint

2017-08-23T21:33:52+00:00

Code clean-up.

* jb/t8008-cleanup:
  t8008: rely on rev-parse'd HEAD instead of sha1 value

Merge branch 'jt/subprocess-handshake' into maint

2017-08-23T21:33:52+00:00

Code cleanup.

* jt/subprocess-handshake:
  sub-process: refactor handshake to common function
  Documentation: migrate sub-process docs to header
  convert: add "status=delayed" to filter process protocol
  convert: refactor capabilities negotiation
  convert: move multiple file filter error handling to separate function
  convert: put the flags field before the flag itself for consistent style
  t0021: write "OUT " only on success
  t0021: make debug log file name configurable
  t0021: keep filter log files on comparison

Merge branch 'dc/fmt-merge-msg-microcleanup' into maint

2017-08-23T21:33:52+00:00

Code cleanup.

* dc/fmt-merge-msg-microcleanup:
  fmt-merge-msg: fix coding style

Merge branch 'ah/doc-wserrorhighlight' into maint

2017-08-23T21:33:51+00:00

Doc update.

* ah/doc-wserrorhighlight:
  doc: add missing values "none" and "default" for diff.wsErrorHighlight