git
8 years agobuiltin/apply: remove whitespace_option arg from set_default_whitespace_mode()
Christian Couder [Tue, 24 May 2016 08:11:14 +0000 (10:11 +0200)] 
builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()

A previous change has move the whitespace_option variable from cmd_apply
into 'struct apply_state', so that we can now avoid passing it separately
to set_default_whitespace_mode().

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'whitespace_option' into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:13 +0000 (10:11 +0200)] 
builtin/apply: move 'whitespace_option' into 'struct apply_state'

This will enable further refactoring, and it is more coherent and
simpler if all the option_parse_*() functions are passed a
'struct apply_state' instance in opt->value.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'whitespace_error' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:12 +0000 (10:11 +0200)] 
builtin/apply: move 'whitespace_error' global into 'struct apply_state'

To libify the apply functionality the 'whitespace_error' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'root' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:11 +0000 (10:11 +0200)] 
builtin/apply: move 'root' global into 'struct apply_state'

To libify the apply functionality the 'root' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'p_value_known' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:10 +0000 (10:11 +0200)] 
builtin/apply: move 'p_value_known' global into 'struct apply_state'

To libify the apply functionality the 'p_value_known' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'p_value' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:09 +0000 (10:11 +0200)] 
builtin/apply: move 'p_value' global into 'struct apply_state'

To libify the apply functionality the 'p_value' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'has_include' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:08 +0000 (10:11 +0200)] 
builtin/apply: move 'has_include' global into 'struct apply_state'

To libify the apply functionality the 'has_include' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'limit_by_name' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:07 +0000 (10:11 +0200)] 
builtin/apply: move 'limit_by_name' global into 'struct apply_state'

To libify the apply functionality the 'limit_by_name' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'patch_input_file' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:06 +0000 (10:11 +0200)] 
builtin/apply: move 'patch_input_file' global into 'struct apply_state'

To libify the apply functionality the 'patch_input_file' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'apply' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:05 +0000 (10:11 +0200)] 
builtin/apply: move 'apply' global into 'struct apply_state'

To libify the apply functionality the 'apply' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'p_context' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:04 +0000 (10:11 +0200)] 
builtin/apply: move 'p_context' global into 'struct apply_state'

To libify the apply functionality the 'p_context' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'fake_ancestor' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:03 +0000 (10:11 +0200)] 
builtin/apply: move 'fake_ancestor' global into 'struct apply_state'

To libify the apply functionality the 'fake_ancestor' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

By the way remove a comment about '--index-info' that was renamed
'--build-fake-ancestor' in commit 26b28007689d27a921ea90e5a29fc8eb74b0d297
(apply: get rid of --index-info in favor of --build-fake-ancestor,
Sep 17 2007).

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'line_termination' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:02 +0000 (10:11 +0200)] 
builtin/apply: move 'line_termination' global into 'struct apply_state'

To libify the apply functionality the 'line_termination' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'unsafe_paths' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:01 +0000 (10:11 +0200)] 
builtin/apply: move 'unsafe_paths' global into 'struct apply_state'

To libify the apply functionality the 'unsafe_paths' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'no_add' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:11:00 +0000 (10:11 +0200)] 
builtin/apply: move 'no_add' global into 'struct apply_state'

To libify the apply functionality the 'no_add' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'threeway' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:10:59 +0000 (10:10 +0200)] 
builtin/apply: move 'threeway' global into 'struct apply_state'

To libify the apply functionality the 'threeway' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'summary' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:10:58 +0000 (10:10 +0200)] 
builtin/apply: move 'summary' global into 'struct apply_state'

To libify the apply functionality the 'summary' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'numstat' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:10:57 +0000 (10:10 +0200)] 
builtin/apply: move 'numstat' global into 'struct apply_state'

To libify the apply functionality the 'numstat' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'diffstat' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:10:56 +0000 (10:10 +0200)] 
builtin/apply: move 'diffstat' global into 'struct apply_state'

To libify the apply functionality the 'diffstat' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'cached' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:10:55 +0000 (10:10 +0200)] 
builtin/apply: move 'cached' global into 'struct apply_state'

To libify the apply functionality the 'cached' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'allow_overlap' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:10:54 +0000 (10:10 +0200)] 
builtin/apply: move 'allow_overlap' global into 'struct apply_state'

To libify the apply functionality the 'allow_overlap' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'update_index' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:10:53 +0000 (10:10 +0200)] 
builtin/apply: move 'update_index' global into 'struct apply_state'

To libify the apply functionality the 'update_index' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'apply_verbosely' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:10:52 +0000 (10:10 +0200)] 
builtin/apply: move 'apply_verbosely' global into 'struct apply_state'

To libify the apply functionality the 'apply_verbosely' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'apply_with_reject' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:10:51 +0000 (10:10 +0200)] 
builtin/apply: move 'apply_with_reject' global into 'struct apply_state'

To libify the apply functionality the 'apply_with_reject' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'apply_in_reverse' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:10:50 +0000 (10:10 +0200)] 
builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'

To libify the apply functionality the 'apply_in_reverse' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'check_index' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:10:49 +0000 (10:10 +0200)] 
builtin/apply: move 'check_index' global into 'struct apply_state'

To libify the apply functionality the 'check_index' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'check' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:10:48 +0000 (10:10 +0200)] 
builtin/apply: move 'check' global into 'struct apply_state'

To libify the apply functionality the 'check' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'unidiff_zero' global into 'struct apply_state'
Christian Couder [Tue, 24 May 2016 08:10:47 +0000 (10:10 +0200)] 
builtin/apply: move 'unidiff_zero' global into 'struct apply_state'

To libify the apply functionality the 'unidiff_zero' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'state' init into init_apply_state()
Christian Couder [Tue, 24 May 2016 08:10:46 +0000 (10:10 +0200)] 
builtin/apply: move 'state' init into init_apply_state()

When the apply functionality will be libified, the 'struct apply_state'
will be used by different pieces of code.

To properly initialize a 'struct apply_state', let's provide a nice
and easy to use init_apply_state() function.

Let's also provide clear_apply_state() to release memory used by
'struct apply_state' members, so that a 'struct apply_state' instance
can be easily reused without leaking memory.

Note that clear_apply_state() does nothing for now, but it will later.

While at it, let's rename 'prefix_' parameter to 'prefix'.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: introduce 'struct apply_state' to start libifying
Christian Couder [Wed, 11 May 2016 13:16:19 +0000 (15:16 +0200)] 
builtin/apply: introduce 'struct apply_state' to start libifying

Currently commands that want to use the apply functionality have to launch
a "git apply" process which can be bad for performance.

Let's start libifying the apply functionality and to do that we first need
to get rid of the global variables in "builtin/apply.c".

This patch introduces "struct apply_state" into which all the previously
global variables will be moved. A new parameter called "state" that is a
pointer to the "apply_state" structure will come at the beginning of the
helper functions that need it and will be passed around the call chain.

To start let's move the "prefix" and "prefix_length" global variables into
"struct apply_state".

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'read_stdin' global into cmd_apply()
Christian Couder [Wed, 11 May 2016 13:16:18 +0000 (15:16 +0200)] 
builtin/apply: move 'read_stdin' global into cmd_apply()

The 'read_stdin' variable doesn't need to be static and global to the
file. It can be local to cmd_apply(), so let's move it there.

This will make it easier to libify the apply functionality.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: move 'options' variable into cmd_apply()
Christian Couder [Wed, 11 May 2016 13:16:17 +0000 (15:16 +0200)] 
builtin/apply: move 'options' variable into cmd_apply()

The 'options' variable doesn't need to be static and global to the
file. It can be local to cmd_apply(), so let's move it there.

This will make it easier to libify the apply functionality.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: extract line_by_line_fuzzy_match() from match_fragment()
Christian Couder [Wed, 11 May 2016 13:16:16 +0000 (15:16 +0200)] 
builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()

The match_fragment() function is very big and contains a big special case
algorithm that does line by line fuzzy matching. So let's extract this
algorithm in a separate line_by_line_fuzzy_match() function.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: avoid local variable shadowing 'len' parameter
Christian Couder [Wed, 11 May 2016 13:16:15 +0000 (15:16 +0200)] 
builtin/apply: avoid local variable shadowing 'len' parameter

This is just a cleanup to avoid errors when compiling with -Wshadow and
to make it safer to later move global variables into a "state" struct.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: avoid parameter shadowing 'linenr' global
Christian Couder [Wed, 11 May 2016 13:16:14 +0000 (15:16 +0200)] 
builtin/apply: avoid parameter shadowing 'linenr' global

Let's just rename the global 'state_linenr' as it will become
'state->linenr' in a following patch.

This also avoid errors when compiling with -Wshadow and makes
it safer to later move global variables into a "state" struct.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: avoid parameter shadowing 'p_value' global
Christian Couder [Wed, 11 May 2016 13:16:13 +0000 (15:16 +0200)] 
builtin/apply: avoid parameter shadowing 'p_value' global

Let's just rename the global 'state_p_value' as it will become
'state->p_value' in a following patch.

This also avoid errors when compiling with -Wshadow and makes
it safer to later move global variables into a "state" struct.

Helped-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agobuiltin/apply: make gitdiff_verify_name() return void
Christian Couder [Wed, 11 May 2016 13:16:12 +0000 (15:16 +0200)] 
builtin/apply: make gitdiff_verify_name() return void

As the value returned by gitdiff_verify_name() is put into the
same variable that is passed as a parameter to this function,
it is simpler to pass the address of the variable and have
gitdiff_verify_name() change the variable itself.

This also makes it possible to later have this function return
-1 instead of die()ing in case of error.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoEleventh batch for 2.9
Junio C Hamano [Tue, 10 May 2016 20:46:57 +0000 (13:46 -0700)] 
Eleventh batch for 2.9

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'svn/bad-ref' of git://bogomips.org/git-svn
Junio C Hamano [Tue, 10 May 2016 20:40:57 +0000 (13:40 -0700)] 
Merge branch 'svn/bad-ref' of git://bogomips.org/git-svn

* 'svn/bad-ref' of git://bogomips.org/git-svn:
  Git/SVN: die when there is no commit metadata

8 years agoMerge branch 'sk/gitweb-highlight-encoding'
Junio C Hamano [Tue, 10 May 2016 20:40:33 +0000 (13:40 -0700)] 
Merge branch 'sk/gitweb-highlight-encoding'

Some multi-byte encoding can have a backslash byte as a later part
of one letter, which would confuse "highlight" filter used in
gitweb.

* sk/gitweb-highlight-encoding:
  gitweb: apply fallback encoding before highlight

8 years agoMerge branch 'sb/clean-test-fix'
Junio C Hamano [Tue, 10 May 2016 20:40:32 +0000 (13:40 -0700)] 
Merge branch 'sb/clean-test-fix'

* sb/clean-test-fix:
  t7300: mark test with SANITY

8 years agoMerge branch 'rn/glossary-typofix'
Junio C Hamano [Tue, 10 May 2016 20:40:31 +0000 (13:40 -0700)] 
Merge branch 'rn/glossary-typofix'

* rn/glossary-typofix:
  Documentation: fix typo 'In such these cases'

8 years agoMerge branch 'ls/travis-submitting-patches'
Junio C Hamano [Tue, 10 May 2016 20:40:30 +0000 (13:40 -0700)] 
Merge branch 'ls/travis-submitting-patches'

* ls/travis-submitting-patches:
  Documentation: add setup instructions for Travis CI

8 years agoMerge branch 'js/close-packs-before-gc'
Junio C Hamano [Tue, 10 May 2016 20:40:30 +0000 (13:40 -0700)] 
Merge branch 'js/close-packs-before-gc'

* js/close-packs-before-gc:
  t5510: run auto-gc in the foreground

8 years agoMerge branch 'ew/normal-to-e'
Junio C Hamano [Tue, 10 May 2016 20:40:29 +0000 (13:40 -0700)] 
Merge branch 'ew/normal-to-e'

* ew/normal-to-e:
  .mailmap: update to my shorter email address

8 years agoMerge branch 'ls/p4-lfs'
Junio C Hamano [Tue, 10 May 2016 20:40:29 +0000 (13:40 -0700)] 
Merge branch 'ls/p4-lfs'

Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.

* ls/p4-lfs:
  git-p4: fix Git LFS pointer parsing
  travis-ci: express Linux/OS X dependency versions more clearly
  travis-ci: update Git-LFS and P4 to the latest version

8 years agoMerge branch 'sb/misc-cleanups'
Junio C Hamano [Tue, 10 May 2016 20:40:29 +0000 (13:40 -0700)] 
Merge branch 'sb/misc-cleanups'

* sb/misc-cleanups:
  submodule-config: don't shadow `cache`
  config.c: drop local variable

8 years agoMerge branch 'ew/doc-split-pack-disables-bitmap'
Junio C Hamano [Tue, 10 May 2016 20:40:28 +0000 (13:40 -0700)] 
Merge branch 'ew/doc-split-pack-disables-bitmap'

Doc update.

* ew/doc-split-pack-disables-bitmap:
  pack-objects: warn on split packs disabling bitmaps

8 years agoGit/SVN: die when there is no commit metadata
Christian Couder [Sat, 7 May 2016 06:58:43 +0000 (08:58 +0200)] 
Git/SVN: die when there is no commit metadata

When passing a bad --trunk option to `git svn clone`, like for example the
same URL that we are cloning:

  C:\Windows\system32>git svn clone
  https://mycompany.svn.beanstalkapp.com/myproject --no-metadata -A
  c:\temp\svn_to_git_users.txt
  --trunk=https://mycompany.svn.beanstalkapp.com/myproject
  --tags=https://mycompany.svn.beanstalkapp.com/myproject/tags
  --branches=https://mycompany.svn.beanstalkapp.com/myproject/branches
  c:\code\Git_myproject

One gets an "Use of uninitialized value $u in substitution (s///)" error:

  [...]
  W: +empty_dir: branches/20080918_DBDEPLOY/vendor/src/csharp/MS WCSF
  Contrib/src/Services
  W: +empty_dir: branches/20080918_DBDEPLOY/vendor/src/csharp/RealWorldControls/References
  r530 = c276e3b039d8e38759c6fb17443349732552d7a2 (refs/remotes/origin/trunk)
  Found possible branch point:
  https://mycompany.svn.beanstalkapp.com/myproject/trunk =>
  https://mycompany.svn.beanstalkapp.com/myproject/branches/20080918_DBDEPLOY,
  529
  Use of uninitialized value $u in substitution (s///) at
  /mingw32/share/perl5/site_perl/Git/SVN.pm line 101.
  Use of uninitialized value $u in concatenation (.) or string at
  /mingw32/share/perl5/site_perl/Git/SVN.pm line 101.
  refs/remotes/origin/trunk:
  'https://mycompany.svn.beanstalkapp.com/myproject' not found in ''
  C:\Windows\system32>

Let's fix that by just die()ing when we have an uninitialized value because we
cannot get commit metadata from a ref.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Eric Wong <e@80x24.org>
8 years agoSync with maint
Junio C Hamano [Fri, 6 May 2016 21:53:45 +0000 (14:53 -0700)] 
Sync with maint

* maint:
  Almost ready for 2.8.3

8 years agoAlmost ready for 2.8.3
Junio C Hamano [Fri, 6 May 2016 21:53:36 +0000 (14:53 -0700)] 
Almost ready for 2.8.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'sb/submodule-path-misc-bugs' into maint
Junio C Hamano [Fri, 6 May 2016 21:53:24 +0000 (14:53 -0700)] 
Merge branch 'sb/submodule-path-misc-bugs' into maint

"git submodule" reports the paths of submodules the command
recurses into, but this was incorrect when the command was not run
from the root level of the superproject.

* sb/submodule-path-misc-bugs:
  t7407: make expectation as clear as possible
  submodule update: test recursive path reporting from subdirectory
  submodule update: align reporting path for custom command execution
  submodule status: correct path handling in recursive submodules
  submodule update --init: correct path handling in recursive submodules
  submodule foreach: correct path display in recursive submodules

8 years agoMerge branch 'ky/imap-send-openssl-1.1.0' into maint
Junio C Hamano [Fri, 6 May 2016 21:53:24 +0000 (14:53 -0700)] 
Merge branch 'ky/imap-send-openssl-1.1.0' into maint

Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs
we use in imap-send, which has been adjusted for the change.

* ky/imap-send-openssl-1.1.0:
  configure: remove checking for HMAC_CTX_cleanup
  imap-send: avoid deprecated TLSv1_method()
  imap-send: check NULL return of SSL_CTX_new()
  imap-send: use HMAC() function provided by OpenSSL

8 years agoMerge branch 'js/replace-edit-use-editor-configuration' into maint
Junio C Hamano [Fri, 6 May 2016 21:53:24 +0000 (14:53 -0700)] 
Merge branch 'js/replace-edit-use-editor-configuration' into maint

"git replace -e" did not honour "core.editor" configuration.

* js/replace-edit-use-editor-configuration:
  replace --edit: respect core.editor

8 years agoMerge branch 'cc/apply' into maint
Junio C Hamano [Fri, 6 May 2016 21:53:23 +0000 (14:53 -0700)] 
Merge branch 'cc/apply' into maint

Minor code clean-up.

* cc/apply:
  builtin/apply: free patch when parse_chunk() fails
  builtin/apply: handle parse_binary() failure
  apply: remove unused call to free() in gitdiff_{old,new}name()
  builtin/apply: get rid of useless 'name' variable

8 years agoMerge branch 'kn/for-each-tag-branch' into maint
Junio C Hamano [Fri, 6 May 2016 21:53:23 +0000 (14:53 -0700)] 
Merge branch 'kn/for-each-tag-branch' into maint

A minor documentation update.

* kn/for-each-tag-branch:
  for-each-ref: fix description of '--contains' in manpage

8 years agoTenth batch for 2.9
Junio C Hamano [Fri, 6 May 2016 21:48:26 +0000 (14:48 -0700)] 
Tenth batch for 2.9

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'jk/diff-compact-heuristic'
Junio C Hamano [Fri, 6 May 2016 21:45:46 +0000 (14:45 -0700)] 
Merge branch 'jk/diff-compact-heuristic'

Patch output from "git diff" and friends has been tweaked to be
more readable by using a blank line as a strong hint that the
contents before and after it belong to a logically separate unit.

* jk/diff-compact-heuristic:
  diff: undocument the compaction heuristic knobs for experimentation
  xdiff: implement empty line chunk heuristic
  xdiff: add recs_match helper function

8 years agoMerge branch 'ls/p4-lfs-test-fix-2.7.0'
Junio C Hamano [Fri, 6 May 2016 21:45:45 +0000 (14:45 -0700)] 
Merge branch 'ls/p4-lfs-test-fix-2.7.0'

Fix a broken test.

* ls/p4-lfs-test-fix-2.7.0:
  t9824: fix wrong reference value
  t9824: fix broken &&-chain in a subshell

8 years agoMerge branch 'bc/object-id'
Junio C Hamano [Fri, 6 May 2016 21:45:44 +0000 (14:45 -0700)] 
Merge branch 'bc/object-id'

Move from unsigned char[20] to struct object_id continues.

* bc/object-id:
  match-trees: convert several leaf functions to use struct object_id
  tree-walk: convert tree_entry_extract() to use struct object_id
  struct name_entry: use struct object_id instead of unsigned char sha1[20]
  match-trees: convert shift_tree() and shift_tree_by() to use object_id
  test-match-trees: convert to use struct object_id
  sha1-name: introduce a get_oid() function

8 years agoMerge branch 'bw/rebase-merge-entire-branch'
Junio C Hamano [Fri, 6 May 2016 21:45:44 +0000 (14:45 -0700)] 
Merge branch 'bw/rebase-merge-entire-branch'

"git rebase -m" could be asked to rebase an entire branch starting
from the root, but failed by assuming that there always is a parent
commit to the first commit on the branch.

* bw/rebase-merge-entire-branch:
  git-rebase--merge: don't include absent parent as a base

8 years agoMerge branch 'jc/drop-git-spec-in'
Junio C Hamano [Fri, 6 May 2016 21:45:44 +0000 (14:45 -0700)] 
Merge branch 'jc/drop-git-spec-in'

As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".

* jc/drop-git-spec-in:
  Makefile: remove dependency on git.spec
  Makefile: stop pretending to support rpmbuild

8 years agoMerge branch 'js/http-custom-headers'
Junio C Hamano [Fri, 6 May 2016 21:45:43 +0000 (14:45 -0700)] 
Merge branch 'js/http-custom-headers'

HTTP transport clients learned to throw extra HTTP headers at the
server, specified via http.extraHeader configuration variable.

* js/http-custom-headers:
  http: support sending custom HTTP headers

8 years agoMerge branch 'sb/clone-shallow-passthru'
Junio C Hamano [Fri, 6 May 2016 21:45:43 +0000 (14:45 -0700)] 
Merge branch 'sb/clone-shallow-passthru'

"git clone" learned "--shallow-submodules" option.

* sb/clone-shallow-passthru:
  clone: add `--shallow-submodules` flag

8 years agoMerge branch 'ld/p4-test-py3'
Junio C Hamano [Fri, 6 May 2016 21:45:42 +0000 (14:45 -0700)] 
Merge branch 'ld/p4-test-py3'

The test scripts for "git p4" (but not "git p4" implementation
itself) has been updated so that they would work even on a system
where the installed version of Python is python 3.

* ld/p4-test-py3:
  git-p4 tests: time_in_seconds should use $PYTHON_PATH
  git-p4 tests: work with python3 as well as python2
  git-p4 tests: cd to / before running python

8 years agoMerge branch 'sb/config-exit-status-list'
Junio C Hamano [Fri, 6 May 2016 21:45:42 +0000 (14:45 -0700)] 
Merge branch 'sb/config-exit-status-list'

Doc update.

* sb/config-exit-status-list:
  config doc: improve exit code listing

8 years agoSync with maint
Junio C Hamano [Tue, 3 May 2016 21:52:30 +0000 (14:52 -0700)] 
Sync with maint

* maint:
  git-multimail: update to release 1.3.0

8 years agoNinth batch for 2.9
Junio C Hamano [Tue, 3 May 2016 21:15:10 +0000 (14:15 -0700)] 
Ninth batch for 2.9

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'nf/mergetool-prompt'
Junio C Hamano [Tue, 3 May 2016 21:08:17 +0000 (14:08 -0700)] 
Merge branch 'nf/mergetool-prompt'

UI consistency improvements.

* nf/mergetool-prompt:
  difftool/mergetool: make the form of yes/no questions consistent

8 years agoMerge branch 'jd/send-email-to-whom'
Junio C Hamano [Tue, 3 May 2016 21:08:16 +0000 (14:08 -0700)] 
Merge branch 'jd/send-email-to-whom'

A question by "git send-email" to ask the identity of the sender
has been updated.

* jd/send-email-to-whom:
  send-email: fix grammo in the prompt that asks e-mail recipients

8 years agoMerge branch 'rt/string-list-lookup-cleanup'
Junio C Hamano [Tue, 3 May 2016 21:08:15 +0000 (14:08 -0700)] 
Merge branch 'rt/string-list-lookup-cleanup'

Code cleanup.

* rt/string-list-lookup-cleanup:
  string_list: use string-list API in unsorted_string_list_lookup()

8 years agoMerge branch 'jk/fix-attribute-macro-in-2.5'
Junio C Hamano [Tue, 3 May 2016 21:08:15 +0000 (14:08 -0700)] 
Merge branch 'jk/fix-attribute-macro-in-2.5'

Code fixup.

* jk/fix-attribute-macro-in-2.5:
  remote.c: spell __attribute__ correctly

8 years agoMerge branch 'sg/test-lib-simplify-expr-away'
Junio C Hamano [Tue, 3 May 2016 21:08:14 +0000 (14:08 -0700)] 
Merge branch 'sg/test-lib-simplify-expr-away'

Code cleanup.

* sg/test-lib-simplify-expr-away:
  test-lib: simplify '--option=value' parsing

8 years agoMerge branch 'nd/remove-unused'
Junio C Hamano [Tue, 3 May 2016 21:08:13 +0000 (14:08 -0700)] 
Merge branch 'nd/remove-unused'

Code cleanup.

* nd/remove-unused:
  wrapper.c: delete dead function git_mkstemps()
  dir.c: remove dead function fnmatch_icase()

8 years agoMerge branch 'js/name-rev-use-oldest-ref'
Junio C Hamano [Tue, 3 May 2016 21:08:13 +0000 (14:08 -0700)] 
Merge branch 'js/name-rev-use-oldest-ref'

"git describe --contains" often made a hard-to-justify choice of
tag to give name to a given commit, because it tried to come up
with a name with smallest number of hops from a tag, causing an old
commit whose close descendant that is recently tagged were not
described with respect to an old tag but with a newer tag.  It did
not help that its computation of "hop" count was further tweaked to
penalize being on a side branch of a merge.  The logic has been
updated to favor using the tag with the oldest tagger date, which
is a lot easier to explain to the end users: "We describe a commit
in terms of the (chronologically) oldest tag that contains the
commit."

* js/name-rev-use-oldest-ref:
  name-rev: include taggerdate in considering the best name

8 years agoMerge branch 'jd/p4-jobs-in-commit'
Junio C Hamano [Tue, 3 May 2016 21:08:12 +0000 (14:08 -0700)] 
Merge branch 'jd/p4-jobs-in-commit'

"git p4" learned to record P4 jobs in Git commit that imports from
the history in Perforce.

* jd/p4-jobs-in-commit:
  git-p4: add P4 jobs to git commit message
  git-p4: clean-up code style in tests

8 years agoMerge branch 'en/merge-fixes'
Junio C Hamano [Tue, 3 May 2016 21:08:12 +0000 (14:08 -0700)] 
Merge branch 'en/merge-fixes'

"merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.

* en/merge-fixes:
  merge-recursive: do not check working copy when creating a virtual merge base
  merge-recursive: remove duplicate code

8 years agogit-multimail: update to release 1.3.0
Matthieu Moy [Tue, 3 May 2016 08:31:42 +0000 (10:31 +0200)] 
git-multimail: update to release 1.3.0

The changes are described in CHANGES.

Contributions-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Contributions-by: Stefan Tatschner <rumpelsepp@sevenbyte.org>
Contributions-by: Simon P <simon.git@le-huit.fr>
Contributions-by: Leander Hasty <leander@1stplayable.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agot7300: mark test with SANITY
Stefan Beller [Tue, 3 May 2016 18:54:32 +0000 (11:54 -0700)] 
t7300: mark test with SANITY

The test runs `chmod 0` on a file to test a case where Git fails to
read it, but that would not work if it is run as root.

Reported-by: Jan Keromnes <janx@linux.com>
Fix-proposed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agogitweb: apply fallback encoding before highlight
Shin Kojima [Tue, 3 May 2016 13:00:51 +0000 (22:00 +0900)] 
gitweb: apply fallback encoding before highlight

Some multi-byte character encodings (such as Shift_JIS and GBK) have
characters whose final bytes is an ASCII '\' (0x5c), and they
will be displayed as funny-characters even if $fallback_encoding is
correct.  This is because `highlight` command always expects UTF-8
encoded strings from STDIN.

    $ echo 'my $v = "申";' | highlight --syntax perl | w3m -T text/html -dump
    my $v = "申";

    $ echo 'my $v = "申";' | iconv -f UTF-8 -t Shift_JIS | highlight \
        --syntax perl | iconv -f Shift_JIS -t UTF-8 | w3m -T text/html -dump

    iconv: (stdin):9:135: cannot convert
    my $v = "

This patch prepare git blob objects to be encoded into UTF-8 before
highlighting in the manner of `to_utf8` subroutine.

Signed-off-by: Shin Kojima <shin@kojima.org>
Reviewed-by: Jakub Narębski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoSync with maint
Junio C Hamano [Mon, 2 May 2016 22:50:34 +0000 (15:50 -0700)] 
Sync with maint

* maint:
  Start preparing for 2.8.3

8 years agoStart preparing for 2.8.3
Junio C Hamano [Mon, 2 May 2016 21:23:48 +0000 (14:23 -0700)] 
Start preparing for 2.8.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoMerge branch 'jk/use-write-script-more' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:14 +0000 (14:24 -0700)] 
Merge branch 'jk/use-write-script-more' into maint

Code clean-up.

* jk/use-write-script-more:
  t3404: use write_script
  t1020: do not overuse printf and use write_script
  t5532: use write_script

8 years agoMerge branch 'jc/xstrfmt-null-with-prec-0' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:14 +0000 (14:24 -0700)] 
Merge branch 'jc/xstrfmt-null-with-prec-0' into maint

Code cleanup.

* jc/xstrfmt-null-with-prec-0:
  setup.c: do not feed NULL to "%.*s" even with precision 0

8 years agoMerge branch 'ew/send-email-drop-data-dumper' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:13 +0000 (14:24 -0700)] 
Merge branch 'ew/send-email-drop-data-dumper' into maint

Code clean-up.

* ew/send-email-drop-data-dumper:
  send-email: do not load Data::Dumper

8 years agoMerge branch 'ad/cygwin-wants-rename' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:11 +0000 (14:24 -0700)] 
Merge branch 'ad/cygwin-wants-rename' into maint

On Cygwin, object creation uses the "create a temporary and then
rename it to the final name" pattern, not "create a temporary,
hardlink it to the final name and then unlink the temporary"
pattern.

This is necessary to use Git on Windows shared directories, and is
already enabled for the MinGW and plain Windows builds.  It also
has been used in Cygwin packaged versions of Git for quite a while.
See http://thread.gmane.org/gmane.comp.version-control.git/291853
($gmane/275680, $gmane/291853).

* ad/cygwin-wants-rename:
  config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES

8 years agoMerge branch 'jk/do-not-printf-NULL' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:10 +0000 (14:24 -0700)] 
Merge branch 'jk/do-not-printf-NULL' into maint

"git config" had a codepath that tried to pass a NULL to
printf("%s"), which nobody seems to have noticed.

* jk/do-not-printf-NULL:
  git_config_set_multivar_in_file: handle "unset" errors
  git_config_set_multivar_in_file: all non-zero returns are errors
  config: lower-case first word of error strings

8 years agoMerge branch 'jc/http-socks5h' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:10 +0000 (14:24 -0700)] 
Merge branch 'jc/http-socks5h' into maint

The socks5:// proxy support added back in 2.6.4 days was not aware
that socks5h:// proxies behave differently.

* jc/http-socks5h:
  http: differentiate socks5:// and socks5h://

8 years agoMerge branch 'ky/imap-send' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:09 +0000 (14:24 -0700)] 
Merge branch 'ky/imap-send' into maint

Support for CRAM-MD5 authentication method in "git imap-send" did
not work well.

* ky/imap-send:
  imap-send: fix CRAM-MD5 response calculation
  imap-send: check for NOLOGIN capability only when using LOGIN command

8 years agoMerge branch 'ad/commit-have-m-option' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:09 +0000 (14:24 -0700)] 
Merge branch 'ad/commit-have-m-option' into maint

"git commit" misbehaved in a few minor ways when an empty message
is given via -m '', all of which has been corrected.

* ad/commit-have-m-option:
  commit: do not ignore an empty message given by -m ''
  commit: --amend -m '' silently fails to wipe message

8 years agoMerge branch 'sb/submodule-helper-clone-regression-fix' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:08 +0000 (14:24 -0700)] 
Merge branch 'sb/submodule-helper-clone-regression-fix' into maint

A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident.  This has
been corrected.

* sb/submodule-helper-clone-regression-fix:
  submodule--helper, module_clone: catch fprintf failure
  submodule--helper: do not borrow absolute_path() result for too long
  submodule--helper, module_clone: always operate on absolute paths
  submodule--helper clone: create the submodule path just once
  submodule--helper: fix potential NULL-dereference
  recursive submodules: test for relative paths

8 years agoMerge branch 'jk/branch-shortening-funny-symrefs' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:07 +0000 (14:24 -0700)] 
Merge branch 'jk/branch-shortening-funny-symrefs' into maint

A change back in version 2.7 to "git branch" broke display of a
symbolic ref in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).

* jk/branch-shortening-funny-symrefs:
  branch: fix shortening of non-remote symrefs

8 years agoMerge branch 'es/format-patch-doc-hide-no-patch' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:06 +0000 (14:24 -0700)] 
Merge branch 'es/format-patch-doc-hide-no-patch' into maint

"git format-patch --help" showed `-s` and `--no-patch` as if these
are valid options to the command.  We already hide `--patch` option
from the documentation, because format-patch is about showing the
diff, and the documentation now hides these options as well.

* es/format-patch-doc-hide-no-patch:
  git-format-patch.txt: don't show -s as shorthand for multiple options

8 years agoMerge branch 'ky/branch-m-worktree' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:05 +0000 (14:24 -0700)] 
Merge branch 'ky/branch-m-worktree' into maint

When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.

* ky/branch-m-worktree:
  set_worktree_head_symref(): fix error message
  branch -m: update all per-worktree HEADs
  refs: add a new function set_worktree_head_symref

8 years agoMerge branch 'ky/branch-d-worktree' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:05 +0000 (14:24 -0700)] 
Merge branch 'ky/branch-d-worktree' into maint

When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree

* ky/branch-d-worktree:
  branch -d: refuse deleting a branch which is currently checked out

8 years agoMerge branch 'jk/check-repository-format' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:04 +0000 (14:24 -0700)] 
Merge branch 'jk/check-repository-format' into maint

The repository set-up sequence has been streamlined (the biggest
change is that there is no longer git_config_early()), so that we
do not attempt to look into refs/* when we know we do not have a
Git repository.

* jk/check-repository-format:
  verify_repository_format: mark messages for translation
  setup: drop repository_format_version global
  setup: unify repository version callbacks
  init: use setup.c's repo version verification
  setup: refactor repo format reading and verification
  config: drop git_config_early
  check_repository_format_gently: stop using git_config_early
  lazily load core.sharedrepository
  wrap shared_repository global in get/set accessors
  setup: document check_repository_format()

8 years agoMerge branch 'ew/send-email-readable-message-id' into maint
Junio C Hamano [Mon, 2 May 2016 21:24:04 +0000 (14:24 -0700)] 
Merge branch 'ew/send-email-readable-message-id' into maint

"git send-email" now uses a more readable timestamps when
formulating a message ID.

* ew/send-email-readable-message-id:
  send-email: more meaningful Message-ID

8 years ago.mailmap: update to my shorter email address
Eric Wong [Mon, 2 May 2016 19:31:21 +0000 (19:31 +0000)] 
.mailmap: update to my shorter email address

Following f916ab0ccc ("send-email: more meaningful Message-ID"),
my own email address is too long :x

While I could have an even shorter address by one character with
"yhbt.net", "80x24.org" is more representative of my
hacking-related pursuits.

Signed-off-by: Eric Wong <e@80x24.org>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoDocumentation: fix typo 'In such these cases'
René Nyffenegger [Mon, 2 May 2016 07:38:20 +0000 (09:38 +0200)] 
Documentation: fix typo 'In such these cases'

Signed-off-by: René Nyffenegger <mail@renenyffenegger.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
8 years agoDocumentation: add setup instructions for Travis CI
Lars Schneider [Mon, 2 May 2016 08:12:12 +0000 (10:12 +0200)] 
Documentation: add setup instructions for Travis CI

Also change UK english "behaviour" to US english "behavior".

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>