On Fri, May 12, 2017 at 11:00:36AM -0700, Jonathan Tan wrote:
> > @@ -617,7 +632,8 @@ static void filter_refs(struct fetch_pack_args *args,
> > else if (cmp == 0) {
> > keep = 1; /* definitely have it */
> >
On Fri, May 12, 2017 at 01:46:48PM -0700, Jonathan Tan wrote:
> Change from v5: used "ensure_tip_oids_initialized" function instead.
> This removes some of the muddiness (e.g. with newlist being modified
> after the function).
I don't think it really improves the muddiness. You are still calling
On Fri, May 12, 2017 at 01:02:44PM -0700, Stefan Beller wrote:
> The 'keydata' may be of value in the underlying compare function to decide
> if the given two entries are the same.
I had to scratch my head over this for a minute, because there isn't
really any motivating example of what you're tr
On Fri, May 05, 2017 at 11:27:56AM -0400, Ben Peart wrote:
> +int packet_writel(int fd, const char *line, ...);
This isn't a new problem, but I noticed that this function should
probably get annotated to describe its interface.
Junio, can you pick up the patch below on top of Ben's series (or I'
On Fri, May 05, 2017 at 11:28:01AM -0400, Ben Peart wrote:
> +static void subprocess_exit_handler(struct child_process *process)
> +{
> + sigchain_push(SIGPIPE, SIG_IGN);
> + /* Closing the pipe signals the subprocess to initiate a shutdown. */
> + close(process->in);
> + close(pro
On Mon, May 08, 2017 at 10:58:46AM +0900, Junio C Hamano wrote:
> Will queue; during the pre-release freeze, new things would move
> slowly, but let's see if we have more comments from others and then
> merge it to 'next' soon after the 2.13 final.
I gave it a fresh read-through. I had a few comm
Hi,
I'm trying to add a subtree which contains a folder with the same name
as the subtree directory itself.
Adding seems to work, but if i pull after the subtree remote changed,
files in my top directory are deleted and everything seems to have
"moved up" one directory - although i specify a subtr
On Fri, May 12, 2017 at 03:43:21PM +0900, Junio C Hamano wrote:
> * sg/clone-refspec-from-command-line-config (2017-05-09) 2 commits
> - git-clone --config order & fetching extra refs during initial clone
> - clone: respect configured fetch respecs during initial fetch
>
> "git clone -c var=va
On Thu, May 11, 2017 at 10:00:50AM -0700, Brandon Williams wrote:
> > None of this is your problem now either way; the advertisement-limiting
> > extension is still vaporware, albeit one we've discussed a lot. I just
> > wanted to make sure we weren't painting ourselves into any corners. And
> > I
Signed-off-by: Sven Strickroth
---
Documentation/gitweb.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index 96156e5e1..88450589a 100644
--- a/Documentation/gitweb.txt
+++ b/Documentation/gitweb.txt
@@ -84,7 +84,7 @@ sep
Jonathan Nieder writes:
> Johannes Schindelin wrote:
>> On Fri, 12 May 2017, Junio C Hamano wrote:
>
>>> And this one is also important. I do not think we had to touch any
>>> code that handles .git/remotes/ or .git/branches when we extended
>>> the .git/config based configuration for remotes, s
On Sat, May 13, 2017 at 11:54 AM, Sven Strickroth wrote:
Spelling error: Wikipeai
Looks good, but let's change these too while we're at it:
$ git grep http://en.wikip
Documentation/gitweb.txt:87:http://en.wikipedia.org/wiki/Query_string#URL_encoding[]),
the difference
bisect.c:549: * http://en.
Signed-off-by: Sven Strickroth
---
Documentation/gitweb.txt | 2 +-
bisect.c | 2 +-
gitweb/gitweb.perl | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index 96156e5e1..88450589a 100644
--- a/Document
On Fri, May 12, 2017 at 7:06 AM, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> Add a helper function to make the tests which check for patterns with
>> \0 in them more succinct. Right now this isn't a big win, but
>> subsequent commits will add a lot more of these tests.
>>
>> The
On Fri, May 12, 2017 at 12:50 PM, Johannes Schindelin
wrote:
> On Windows, `(1|2)` is not a valid file name, and therefore the tag
> cannot be created as expected by the new test.
>
> So simply skip this test on Windows.
Thanks for the hotfix. I'll fix this in my v2, but do it differently
in such
On Sat, May 13, 2017 at 1:44 AM, Jonathan Nieder wrote:
> Johannes Schindelin wrote:
>
>> On Windows, `(1|2)` is not a valid file name, and therefore the tag
>> cannot be created as expected by the new test.
>>
>> So simply skip this test on Windows.
>>
>> Signed-off-by: Johannes Schindelin
>> --
On 13/05/17 04:48, Jeff King wrote:
> The set_error_handle() function was introduced by 3b331e926
> (vreportf: report to arbitrary filehandles, 2015-08-11) so
> that run-command could send post-fork, pre-exec errors to
> the parent's original stderr.
>
> That use went away in 79319b194 (run-comm
On Sat, May 13, 2017 at 1:50 AM, Jeff King wrote:
> On Fri, May 12, 2017 at 01:02:44PM -0700, Stefan Beller wrote:
>
>> The 'keydata' may be of value in the underlying compare function to decide
>> if the given two entries are the same.
>
> I had to scratch my head over this for a minute, because
Am 13.05.2017 um 00:36 schrieb Junio C Hamano:
Thanks, all three patches look good. Will queue.
Let's merge them to 'next' soonish and eventually down to 'master'
and 'maint'.
The patches change translated strings. You should probably wait for an
update of their translations before you relea
p0004-lazy-init-name-hash.sh errors out if the test repo is too small,
and doesn't generate any perf test results even if it finishes
successfully. That prevents t/perf/run from running the whole test
suite. This series tries to address these issues.
p0004: simplify calls of test-lazy-init-nam
The test library puts helpers into $PATH, so we can simply call them
without specifying their location.
The suffix $X is also not necessary because .exe files on Windows can be
started without specifying their extension, and on other platforms it's
empty anyway.
Signed-off-by: Rene Scharfe
---
The return code of commands on the producing end of a pipe is ignored.
Evaluate the outcome of test-lazy-init-name-hash by calling sort
separately.
Signed-off-by: Rene Scharfe
---
t/perf/p0004-lazy-init-name-hash.sh | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/t/pe
The perf test suite (more specifically: t/perf/aggregate.perl) requires
each test script to write test results into a file, otherwise it aborts
when aggregating. Add actual performance tests with test_perf to allow
p0004 to be run together with other perf scripts.
Calibrate the value for the para
If the single-threaded variant beats the multi-threaded one then we may
have a performance bug, but that doesn't justify aborting the test.
Drop that check; we can compare the results for --single and --multi
using the actual performance tests.
Signed-off-by: Rene Scharfe
---
t/perf/p0004-lazy-i
Repositories with less than 4000 entries are always handled using a
single thread, causing test-lazy-init-name-hash --multi to error out.
Don't abort the whole test script in that case, but simply skip the
multi-threaded performance check. We can still use it to compare the
single-threaded speed o
On Fri, May 12, 2017 at 6:59 AM, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> Amend the submodule recursion test to prepare it for subsequent tests
>> of whether it passes along the grep.patternType to the submodule
>> greps.
>>
>> This is the result of searching & replacing:
>>
On Tue, Feb 12, 2013 at 11:17 AM, Brandon Casey wrote:
> The part of test_commit() may not be appropriate for a tag name.
> So let's allow test_commit to accept a fourth argument to specify the tag
> name.
[Kind of late to notice, I know]
I see nobody spotted in four rounds of reviews that this
On Fri, May 12, 2017 at 6:48 AM, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> Add exhaustive tests for how the different grep.patternType options &
>> the corresponding command-line options affect git-log.
>> ...
>> The patterns being passed to fixed/basic/extended/PCRE are caref
Hi Ævar,
I originally replied in a very verbose manner, going step by step through
the "one-liner", but decided to rephrase everything.
So here goes.
On Sat, 13 May 2017, Ævar Arnfjörð Bjarmason wrote:
> Let's drop this current gawk import series.
Well, the reason why you imported the current
Hi Jonathan,
On Fri, 12 May 2017, Jonathan Nieder wrote:
> Johannes Schindelin wrote:
>
> > On Windows, `(1|2)` is not a valid file name, and therefore the tag
> > cannot be created as expected by the new test.
> >
> > So simply skip this test on Windows.
> >
> > Signed-off-by: Johannes Schindel
On Sat, May 13, 2017 at 8:30 PM, Johannes Schindelin
wrote:
> Hi Ævar,
>
> I originally replied in a very verbose manner, going step by step through
> the "one-liner", but decided to rephrase everything.
>
> So here goes.
>
> On Sat, 13 May 2017, Ævar Arnfjörð Bjarmason wrote:
>
>> Let's drop this
On Sat, May 13, 2017 at 11:54 AM, Sven Strickroth wrote:
> Signed-off-by: Sven Strickroth
Thanks! FWIW:
Reviewed-by: Ævar Arnfjörð Bjarmason
> ---
> Documentation/gitweb.txt | 2 +-
> bisect.c | 2 +-
> gitweb/gitweb.perl | 2 +-
> 3 files changed, 3 insertions(+), 3 de
Reword an outdated & inaccurate comment which suggests that only
git-grep can use PCRE.
This comment was added back when PCRE support was initially added in
commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09), and was true
at the time.
It hasn't been telling the full truth since git-log learne
Add exhaustive tests for how the different grep.patternType options &
the corresponding command-line options affect git-log.
Before this change it was possible to patch revision.c so that the
--basic-regexp option was synonymous with --extended-regexp, and
--perl-regexp wasn't recognized at all, a
Easy to review? 29 patches? Are you kidding me?!
As noted in v1 (<20170511091829.5634-1-ava...@gmail.com>;
https://public-inbox.org/git/20170511091829.5634-1-ava...@gmail.com/)
these are all doc, test, refactoring etc. changes needed by the
subsequent "PCRE v2, PCRE v1 JIT, log -P & fixes" series.
Add a test for backreferences such as (.)\1 in PCRE patterns. This
test ensures that the PCRE_NO_AUTO_CAPTURE option isn't turned
on. Before this change turning it on would break these sort of
patterns, but wouldn't break any tests.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t7810-grep.sh | 7
Stop promising in our grep & rev-list options documentation that we're
always going to be using libpcre when given the --perl-regexp option.
Instead talk about using "Perl-compatible regular expressions" and
using these types of patterns using "a compile-time dependency".
Saying "libpcre" means t
Add tests for --threads=N being supplied on the command-line, or when
grep.threads=N being supplied in the configuration.
When the threading support was made run-time configurable in commit
89f09dd34e ("grep: add --threads= option and grep.threads
configuration", 2015-12-15) no tests were added fo
Add testing for grep pattern types being correctly passed to
submodules. The pattern "(.|.)[\d]" matches differently under
fixed (not at all), and then matches different lines under
basic/extended & perl regular expressions, so this change asserts that
the pattern type is passed along correctly.
S
Add setup code needed for testing regexes that contain both binary
data and regex metacharacters.
The POSIX regcomp() function inherently can't support that, because it
takes a \0-delimited char *, but other regex engines APIs like PCRE v2
take a pattern/length pair, and are thus able to handle \0
Add a helper function to make the tests which check for patterns with
\0 in them more succinct. Right now this isn't a big win, but
subsequent commits will add a lot more of these tests.
The helper is based on the match() function in t3070-wildmatch.sh.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Rename the LIBPCRE prerequisite to PCRE. This is for preparation for
libpcre2 support, where having just "LIBPCRE" would be confusing as it
implies v1 of the library.
None of these tests are incompatible between versions 1 & 2 of
libpcre, it's less confusing to give them a more general name to mak
Add a test asserting that when --perl-regexp (and -P for grep) is
given to git-grep & git-log that we die with an error.
In developing the PCRE v2 series I introduced a regression where -P
would (through control-flow fall-through) become synonymous with basic
POSIX matching. I.e. 'git grep -P '[\d
Change a non-ASCII case-insensitive test case to stop using --debug,
and instead simply test for the expected results.
The test coverage remains the same with this change, but the test
won't break due to internal refactoring.
This test was added in commit 793dc676e0 ("grep/icase: avoid kwsset
whe
Amend the submodule recursion test to prepare it for subsequent tests
of whether it passes along the grep.patternType to the submodule
greps.
This is the result of searching & replacing:
foobar -> (1|2)d(3|4)
foo-> (1|2)
bar-> (3|4)
Currently there's no tests for whether e.g.
Add a die(...) to a default case for the switch statement selecting
between grep pattern types under --recurse-submodules.
Normally this would be caught by -Wswitch, but the grep_pattern_type
type is converted to int by going through parse_options(). Changing
the argument type passed to compile_su
Add a very basic performance comparison test comparing the POSIX
basic, extended and perl engines.
In theory the "basic" and "extended" engines should be implemented
using the same underlying code with a slightly different pattern
parser, but some implementations may not do this. Jump through some
Amend the t/perf/run output so that in addition to the "Running N
tests" heading currently being emitted, it also emits "Unpacking $rev"
and "Building $rev" when setting up the build/$rev directory & when
building it, respectively.
This makes it easier to see what's going on and what revision is b
Add a git GIT_PERF_MAKE_COMMAND variable to compliment the existing
GIT_PERF_MAKE_OPTS facility. This allows specifying an arbitrary shell
command to execute instead of 'make'.
This is useful e.g. in cases where the name, semantics or defaults of
a Makefile flag have changed over time. It can even
Address a big blind spot in the tests for patterns containing \0. The
is_fixed() function considers any string that contains \0 fixed, even
if it contains regular expression metacharacters, those patterns are
currently matched with kwset.
Before this change removing that memchr(s, 0, len) check fr
Remove a redundant assignment to the "regflags" variable. This
variable is only used for POSIX regular expression matching, not when
the PCRE library is used.
This redundant assignment was added as a result of copy/paste
programming in commit 84befcd0a4 ("grep: add a grep.patternType
configuration
Change the internal USE_LIBPCRE define, & build options flag to use a
naming convention ending in PCRE1, without changing the long-standing
USE_LIBPCRE Makefile flag which enables this code.
This is for preparation for libpcre2 support where having things like
USE_LIBPCRE and USE_LIBPCRE2 in any m
Factor the test for \0 in grep patterns into a function. Since commit
9eceddeec6 ("Use kwset in grep", 2011-08-21) any pattern containing a
\0 is considered fixed as regcomp() can't handle it.
This limitation was never documented, and other some regular
expression engines are capable of compiling
Add a performance comparison test which compares both case-sensitive &
case-insensitive fixed-string grep, as well as non-ASCII
case-sensitive & case-insensitive grep.
Currently only the "-i æ" performance test doesn't go through the same
kwset.[ch] codepath, see the "Even when -F..." comment in g
Add a test for the warning that's emitted when --threads or
pack.threads is provided under NO_PTHREADS=YesPlease. This uses the
new PTHREADS prerequisite.
The assertion for C_LOCALE_OUTPUT in the latter test is currently
redundant, since unlike index-pack the pack-objects warnings aren't
i18n'd. H
Move the is_fixed() function which are currently only used in
compile_regexp() earlier so it can be used in the PCRE family of
functions in a later change.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
grep.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --g
Remove redundant assignments to the "regflags" variable. There are no
code paths that have previously set the regflags to anything, and
certainly not to `|= REG_EXTENDED`.
This code gave the impression that it had to reset its environment,
but it doesn't. This dates back to the initial introductio
Add a PTHREADS prerequisite which is false when git is compiled with
NO_PTHREADS=YesPlease.
There's lots of custom code that runs when threading isn't available,
but before this prerequisite there was no way to test it.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Makefile | 1 +
t/README
Change the grep_{lock,unlock} functions to assert that num_threads is
true, instead of only locking & unlocking the pthread mutex lock when
it is.
These functions are never called when num_threads isn't true, this
logic has gone through multiple iterations since the initial
introduction of grep th
Add a warning about missing thread support when grep.threads or
--threads is set to a non 0 (default) or 1 (no parallelism) value
under NO_PTHREADS=YesPlease.
This is for consistency with the index-pack & pack-objects commands,
which also take a --threads option & are configurable via
pack.threads
Fix a buggy warning about threads under NO_PTHREADS=YesPlease. Due to
re-using the delta_search_threads variable for both the state of the
"pack.threads" config & the --threads option, setting "pack.threads"
but not supplying --threads would trigger the warning for both
"pack.threads" & --threads.
Change the internal PCRE variable & function names to have a "1"
suffix. This is for preparation for libpcre2 support, where having
non-versioned names would be confusing.
An earlier change in this series ("grep: change the internal PCRE
macro names to be PCRE1", 2017-04-07) elaborates on the moti
Trivial changes since v1, but I wanted to send a new one for
completeness since I re-sent the "Easy to review grep & pre-PCRE
changes" series.
For v1 see <20170511170142.15934-1-ava...@gmail.com>
(https://public-inbox.org/git/20170511170142.15934-1-ava...@gmail.com/).
Changes noted below & reply
Change the pattern compilation logic under threading so that grep
doesn't compile a pattern it never ends up using on the non-threaded
code path, only to compile it again N times for N threads which will
each use their own copy, ignoring the initially compiled pattern.
This redundant compilation d
Add a short -P option as a synonym for the longer --perl-regexp, for
consistency with the options the corresponding grep invocations
accept.
This was intentionally omitted in commit 727b6fc3ed ("log --grep:
accept --basic-regexp and --perl-regexp", 2012-10-03) for unspecified
future use.
Make it
Skip the administrative overhead of using pthreads when only using one
thread. Instead take the non-threaded path which would be taken under
NO_PTHREADS.
The threading support was initially added in commit
5b594f457a ("Threaded grep", 2010-01-25) with a hardcoded compile-time
number of 8 threads.
Amend my change earlier in this series ("grep: add support for the
PCRE v1 JIT API", 2017-04-11) to un-break the build on PCRE v1
versions earlier than 8.32.
The JIT support was added in version 8.20 released on 2011-10-21, but
it wasn't until 8.32 released on 2012-11-30 that the fast code path to
Amend my change earlier in this series ("grep: add support for the
PCRE v1 JIT API", 2017-04-11) to un-break the build on PCRE v1
versions earlier than 8.20.
The 8.20 release was the first release to have JIT & pcre_jit_stack in
the headers, so a mock type needs to be provided for it on those
rele
Change the grep PCRE v1 code to use JIT when available. When PCRE
support was initially added in commit 63e7e9d8b6 ("git-grep: Learn
PCRE", 2011-05-09) PCRE had no JIT support, it was integrated into
8.20 released on 2011-10-21.
Enabling JIT support usually improves performance by more than
40%. T
Add support for v2 of the PCRE API. This is a new major version of
PCRE that came out in early 2015[1].
The regular expression syntax is the same, but while the API is
similar, pretty much every function is either renamed or takes
different arguments. Thus using it via entirely new functions makes
On 05/12, Jeff King wrote:
> The set_error_handle() function was introduced by 3b331e926
> (vreportf: report to arbitrary filehandles, 2015-08-11) so
> that run-command could send post-fork, pre-exec errors to
> the parent's original stderr.
>
> That use went away in 79319b194 (run-command: elimin
The reverse flag is used in parts of blame that are being moved to
libgit, and should be accessible via the scoreboard structure.
Signed-off-by: Jeff Smith
---
blame.h | 3 +++
builtin/blame.c | 20 +++-
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/bla
Rather than duplicate large portions of builtin/blame.c in cgit, it
would be better to shift its core functionality into libgit.a. The
functionality left in builtin/blame.c mostly relates to terminal
presentation.
Since initial patchset:
Made commit titles consistent
Broke some commits into m
Signed-off-by: Jeff Smith
---
blame.c | 272 +++-
blame.h | 5 +-
builtin/blame.c | 259 +
3 files changed, 271 insertions(+), 265 deletions(-)
diff --git a/blame.c b/blame.c
Clean up blame code before moving it into libgit
Signed-off-by: Jeff Smith
---
builtin/blame.c | 25 ++---
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c
index c419981..e30b3ef 100644
--- a/builtin/blame.c
+++ b/builtin/blame
Statistic counters are used in parts of blame that are being moved to
libgit, and should be accessible via the scoreboard structure.
Signed-off-by: Jeff Smith
---
blame.h | 5 +
builtin/blame.c | 29 -
2 files changed, 17 insertions(+), 17 deletions(-)
d
The scoreboard structure is core to the blame interface. Since
scoreboard will be more exposed, rename it to blame_scoreboard to
clarify what it is a part of.
Signed-off-by: Jeff Smith
---
blame.h | 29
builtin/blame.c | 83 +++
The show_root flag is used in parts of blame that are being moved to
libgit, and should be accessible via the scoreboard structure.
Signed-off-by: Jeff Smith
---
blame.h | 1 +
builtin/blame.c | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/blame.h b/blame.h
index
Signed-off-by: Jeff Smith
---
blame.c | 1313 ++
blame.h | 11 +
builtin/blame.c | 1330 +--
3 files changed, 1330 insertions(+), 1324 deletions(-)
diff --git a/blame.c b/bla
textconv_object is used in places other than blame.c and should be moved
to a more appropriate location. Other textconv related functions are
located in diff.c so that seems as good a place as any.
Signed-off-by: Jeff Smith
---
builtin.h | 2 --
builtin/blame.c| 28 ---
With commit 21666f1 ("convert object type handling from a string to a
number", 2007-02-26), there was no longer a need for blame.c to include
blob.h but it was not removed.
Signed-off-by: Jeff Smith
---
builtin/blame.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/builtin/blame.c b/builtin/
Signed-off-by: Jeff Smith
---
blame.c | 203 +++-
blame.h | 4 +-
builtin/blame.c | 197 --
3 files changed, 205 insertions(+), 199 deletions(-)
diff --git a/blame.c b/blame.
The origin and blame_entry structures are core to the blame interface
and reference each other. Since origin will be more exposed, rename it
to blame_origin to clarify what it is a part of.
Signed-off-by: Jeff Smith
---
blame.h | 86 ++
builtin/blame.c | 185
The argument from --contents is used in parts of blame that are being
moved to libgit, and should be accessible via the scoreboard structure.
Signed-off-by: Jeff Smith
---
blame.h | 3 +++
builtin/blame.c | 1 +
2 files changed, 4 insertions(+)
diff --git a/blame.h b/blame.h
index fde7d
Copy and move score thresholds are used in parts of blame that are being
moved to libgit, and should be accessible via the scoreboard structure.
Signed-off-by: Jeff Smith
---
blame.h | 10 ++
builtin/blame.c | 36
2 files changed, 26 insertion
The xdl_opts flags are used in parts of blame that are being moved to
libgit, and should be accessible via the scoreboard structure.
Signed-off-by: Jeff Smith
---
blame.h | 1 +
builtin/blame.c | 7 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/blame.h b/blame.h
The new method's interface is marginally cleaner than blame_sort, and
will avoid the need to expose the compare_blame_final method.
Signed-off-by: Jeff Smith
---
builtin/blame.c | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.
Signed-off-by: Jeff Smith
---
Makefile| 1 +
blame.c | 62 +
blame.h | 15 +++
builtin/blame.c | 120
4 files changed, 102 insertions(+), 96 deletions(-)
create mode 100644 blame.
Signed-off-by: Jeff Smith
---
blame.c | 7 +++
blame.h | 2 ++
builtin/blame.c | 4 +---
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/blame.c b/blame.c
index 798e61b..17ebf64 100644
--- a/blame.c
+++ b/blame.c
@@ -1574,3 +1574,10 @@ void assign_blame(struct
Allow the interface user to decide how to handle a failed sanity check,
whether that be to output with the current state or to do nothing.
Signed-off-by: Jeff Smith
---
blame.h | 4
builtin/blame.c | 23 +++
2 files changed, 19 insertions(+), 8 deletions(-)
dif
Either prepare_initial or prepare_final is used to determine which
commit is marked as 'final'. Call the underlying methods directly to
make this more clear.
Signed-off-by: Jeff Smith
---
builtin/blame.c | 49 +++--
1 file changed, 23 insertions(+), 26
Allow the interface user to decide how to handle a progress update.
Signed-off-by: Jeff Smith
---
blame.h | 3 +++
builtin/blame.c | 24 ++--
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/blame.h b/blame.h
index e85db06..a0bd91b 100644
--- a/blame.
Signed-off-by: Jeff Smith
---
blame.c | 16
blame.h | 2 ++
builtin/blame.c | 11 +--
3 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/blame.c b/blame.c
index f6c9cb7..00404b9 100644
--- a/blame.c
+++ b/blame.c
@@ -1845,3 +1845,19 @@ void
The no_whole_file_rename flag is used in parts of blame that are being
moved to libgit, and should be accessible via the scoreboard structure.
Signed-off-by: Jeff Smith
---
blame.h | 1 +
builtin/blame.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/blame.h b/bla
> As I said, I'm a little iffy on doing this unconditionally, but it may
> be the least-bad solution. I'd just worry about collateral damage to
> somebody who doesn't use commit.verbose, but has something scissors-like
> in their commit message.
>
> If you were to switch out is_scissors_line() fo
If a commit message is being editted as "verbose", it will contain a
scissors string ("-- >8 --") and a diff:
my subject
# >8
# Do not touch the line above.
# Everything below will be removed.
diff --git a/foo.txt b/foo.txt
NEEDSWORK:
checkout -b remotes/origin/ should not work, unless force is
given (maybe?)
(I just run into that, now I have a remote tracking branch that points
at my detached HEAD. Oh well.)
On Sat, May 13, 2017 at 08:39:23PM -0700, Brian Malehorn wrote:
> If a commit message is being editted as "verbose", it will contain a
> scissors string ("-- >8 --") and a diff:
>
> my subject
>
> # >8
> # Do not touch the line above.
On Sat, May 13, 2017 at 08:52:37PM -0700, Stefan Beller wrote:
> NEEDSWORK:
>
> checkout -b remotes/origin/ should not work, unless force is
> given (maybe?)
>
> (I just run into that, now I have a remote tracking branch that points
> at my detached HEAD. Oh well.)
To be pedantic, you have a lo
In a later patch, I want to propose an option to detect&color
moved lines in a diff, which cannot be done in a one-pass over
the diff. Instead we need to go over the whole diff twice,
because we cannot detect the first line of the two corresponding
lines (+ and -) that got moved.
So to prepare the
1 - 100 of 121 matches
Mail list logo
