delta/git.git/line-log.c, branch sb/parse-options-codeformat github.com: git/git.git Merge branch 'jk/color-diff-plain-is-context' 2015-06-11T16:29:53+00:00 Junio C Hamano gitster@pobox.com 2015-06-11T16:29:53+00:00 db65170ee5558b47355e7f9f111aecb5b152d4d9 "color.diff.plain" was a misnomer; give it 'color.diff.context' as a more logical synonym. * jk/color-diff-plain-is-context: diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT diff: accept color.diff.context as a synonym for "plain" 
"color.diff.plain" was a misnomer; give it 'color.diff.context' as
a more logical synonym.

* jk/color-diff-plain-is-context:
  diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
  diff: accept color.diff.context as a synonym for "plain"
diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT 2015-05-27T20:54:42+00:00 Jeff King peff@peff.net 2015-05-27T20:48:46+00:00 8dbf3eb6850d6d9495ace908625fe50888b111e6 The latter is a much more descriptive name (and we support "color.diff.context" now). This also updates the name of any local variables which were used to store the color. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
The latter is a much more descriptive name (and we support
"color.diff.context" now). This also updates the name of any
local variables which were used to store the color.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'mm/usage-log-l-can-take-regex' 2015-05-06T04:00:36+00:00 Junio C Hamano gitster@pobox.com 2015-05-06T04:00:36+00:00 67498507699641549094f0cbf8800f88176b50c9 Documentation fix. * mm/usage-log-l-can-take-regex: log -L: improve error message on malformed argument Documentation: change -L:<regex> to -L:<funcname> 
Documentation fix.

* mm/usage-log-l-can-take-regex:
  log -L: improve error message on malformed argument
  Documentation: change -L:<regex> to -L:<funcname>
Merge branch 'sb/line-log-plug-pairdiff-leak' 2015-05-06T04:00:25+00:00 Junio C Hamano gitster@pobox.com 2015-05-06T04:00:25+00:00 8ff1ddd71731d42e349bacdf515cefa021c4aa03 * sb/line-log-plug-pairdiff-leak: line-log.c: fix a memleak 
* sb/line-log-plug-pairdiff-leak:
  line-log.c: fix a memleak
log -L: improve error message on malformed argument 2015-04-20T18:06:10+00:00 Matthieu Moy Matthieu.Moy@imag.fr 2015-04-20T12:09:07+00:00 0269f968b7effea8a4f61f1fb0ac7e9386a9d90c The old message did not mention the :regex:file form. To avoid overly long lines, split the message into two lines (in case item->string is long, it will be the only part truncated in a narrow terminal). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
The old message did not mention the :regex:file form.

To avoid overly long lines, split the message into two lines (in case
item->string is long, it will be the only part truncated in a narrow
terminal).

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
line-log.c: fix a memleak 2015-03-31T04:59:57+00:00 Stefan Beller sbeller@google.com 2015-03-31T01:22:07+00:00 05bfc7dcaa0e99e045c326e2887dba24e58266d8 The `filepair` is assigned new memory with any iteration via process_diff_filepair, so free it before the current iteration ends. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
The `filepair` is assigned new memory with any iteration via
process_diff_filepair, so free it before the current iteration ends.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
line-log.c: make line_log_data_init() static 2015-01-15T19:05:47+00:00 Junio C Hamano gitster@pobox.com 2015-01-14T22:39:02+00:00 2b102efc8cd60730f044917d3aa68b3dd54d82d0 No external callers exist. Signed-off-by: Junio C Hamano <gitster@pobox.com> 
No external callers exist.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'tm/line-log-first-parent' 2014-11-06T18:52:37+00:00 Junio C Hamano gitster@pobox.com 2014-11-06T18:52:36+00:00 64b9326460e066a6ae598ed53f38bec8ab4e577d "git log --first-parent -L..." used to crash. * tm/line-log-first-parent: line-log: fix crash when --first-parent is used 
"git log --first-parent -L..." used to crash.

* tm/line-log-first-parent:
  line-log: fix crash when --first-parent is used
line-log: fix crash when --first-parent is used 2014-11-04T20:47:35+00:00 Tzvetan Mikov tmikov@gmail.com 2014-11-04T20:33:37+00:00 a8787c5c1c51f4bdb610526175442a23eea7c467 line-log tries to access all parents of a commit, but only the first parent has been loaded if "--first-parent" is specified, resulting in a crash. Limit the number of parents to one if "--first-parent" is specified. Reported-by: Eric N. Vander Weele <ericvw@gmail.com> Signed-off-by: Tzvetan Mikov <tmikov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
line-log tries to access all parents of a commit, but only the first
parent has been loaded if "--first-parent" is specified, resulting
in a crash.

Limit the number of parents to one if "--first-parent" is specified.

Reported-by: Eric N. Vander Weele <ericvw@gmail.com>
Signed-off-by: Tzvetan Mikov <tmikov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
use REALLOC_ARRAY for changing the allocation size of arrays 2014-09-18T16:13:42+00:00 René Scharfe l.s.r@web.de 2014-09-16T18:56:57+00:00 2756ca4347cbda05b16954cd7f445c216b935e76 Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>