On Fri, Jul 12, 2013 at 5:38 PM, Junio C Hamano gits...@pobox.com wrote:
From: Stefan Beller stefanbel...@googlemail.com
Signed-off-by: Stefan Beller stefanbel...@googlemail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
t/t4203-mailmap.sh | 33 +
1
On Fri, Jul 12, 2013 at 5:38 PM, Junio C Hamano gits...@pobox.com wrote:
From: Stefan Beller stefanbel...@googlemail.com
Signed-off-by: Stefan Beller stefanbel...@googlemail.com
Signed-off-by: Junio C Hamano gits...@pobox.com
---
t/t4203-mailmap.sh | 33 +
1
option instructing it to show email addresses,
hence the tests do not actually prove that address remapping succeeded.
Fix this by instructing git-shortlog to output email addresses as well.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
The very last git-shortlog complex test
. Consequently, script authors need not
re-implement .mailmap functionality manually, thus avoiding potential
quirks and behavioral differences.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
.gitignore | 1 +
Documentation/git-check-mailmap.txt| 47
Test the command-line interface of check-mailmap.
(Actual .mailmap functionality is already covered by existing tests.)
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/t4203-mailmap.sh | 43 +++
1 file changed, 43 insertions(+)
diff --git a/t
://thread.gmane.org/gmane.comp.version-control.git/229533/
Eric Sunshine (2):
builtin: add git-check-mailmap command
t4203: test check-mailmap command invocation
.gitignore | 1 +
Documentation/git-check-mailmap.txt| 47
Makefile
On Sat, Jul 13, 2013 at 3:20 AM, Stefan Beller
stefanbel...@googlemail.com wrote:
This is a regression test for a66e77eab70a08938fdc2227b7ada0f0465c6991
Signed-off-by: Stefan Beller stefanbel...@googlemail.com
---
t/t4203-mailmap.sh | 41 +
1 file
On Sun, Jul 14, 2013 at 4:36 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 3571a1b..546eea4 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -879,6 +883,10 @@ GIT_NOGLOB_PATHSPECS::
Setting this
On Sat, Jul 13, 2013 at 4:20 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller stefanbel...@googlemail.com writes:
Indeed the patch tests for both bugs unintentionally.
I was puzzled because I do not think that is what is happening with
the posted patch.
The off-by-one fix seems to
A bug in mailmap.c:parse_name_and_email() causes it to overlook the
single-character name in A user@host and parse it only as
user@host. Demonstrate this problem.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/t4203-mailmap.sh | 9 +
1 file changed, 9 insertions(+)
diff
The compiler complains that '*' in fprintf() format directive %.*s
should have type int, but we pass size_t. Fix this.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
mailmap.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mailmap.c b/mailmap.c
index 62d998a
From: Junio C Hamano gits...@pobox.com
Wrap overlong lines and format the multi-line comments to match our
coding style.
Signed-off-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
mailmap.c | 42 +++---
1 file
Resolve segmentation fault due to size_t variable being consumed
by '%s'.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
mailmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mailmap.c b/mailmap.c
index 0516354..62d998a 100644
--- a/mailmap.c
+++ b/mailmap.c
to pick up
the name, which makes the entry equivalent to
a...@example.org old@x.z
without the name.
Signed-off-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
mailmap.c | 2 +-
t/t4203-mailmap.sh | 2 +-
2 files changed, 2 insertions
match).
Signed-off-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
mailmap.c | 20
t/t4203-mailmap.sh | 2 +-
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/mailmap.c b/mailmap.c
index 418081e..a7e92db
Resolve segmentation fault due to arguments passed in wrong order.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
mailmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mailmap.c b/mailmap.c
index a7e92db..0516354 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -309,7
On Sat, Jul 13, 2013 at 2:29 AM, Stefan Beller
stefanbel...@googlemail.com wrote:
On 07/13/2013 02:35 AM, Eric Sunshine wrote:
Two tests in t4203-mailmap.sh set up the mapping b...@company.xx =
b...@company.xy in an apparent attempt to check that email address
remapping works as expected
On Mon, Jul 15, 2013 at 5:51 AM, Kyle J. McKay mack...@gmail.com wrote:
Improve on the http.url.* url matching behavior by first
normalizing the urls before they are compared.
diff --git a/http.c b/http.c
index 758e5b1..d04386e 100644
--- a/http.c
+++ b/http.c
@@ -169,6 +169,210 @@ static
All surrounding examples are typeset as monospaced text. Follow suit.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
Documentation/git-log.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 2ea79ba
On Tue, Jul 16, 2013 at 5:53 AM, Kyle J. McKay mack...@gmail.com wrote:
On Jul 15, 2013, at 16:12, Eric Sunshine wrote:
On Mon, Jul 15, 2013 at 5:51 AM, Kyle J. McKay mack...@gmail.com wrote:
+static int append_normalized_escapes(struct strbuf *buf,
+const
pace without being tied
to git log -L.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/229755/
Eric Sunshine (6):
line-range: fix blame -L X,-N regression
t8001/t8002 (blame): modernize style
t8001/t8002 (blame): add blame -L tests
t8001/t8002 (blame): add blame -L :funcname
git-blame inherited -L :funcname support when -L :funcname:file was
implemented for git-log. Add tests.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/annotate-tests.sh | 48 ++--
1 file changed, 46 insertions(+), 2 deletions(-)
diff --git
In particular,
- indent with tabs
- cuddle test description and opening body quote with test_expect_foo
- normalize test descriptions and case
- remove whitepsace following redirection operator
- use standardized filenames (such as actual, expected)
Signed-off-by: Eric Sunshine sunsh
since the comma separating them
is typeset the same as the comma in start,end. Fix this by placing
each variation on its own line.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
Documentation/blame-options.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
With the exception of a couple corner case checks in t8003 (and some
indirect tests in t4211 of -L parsing code shared by log -L), there is
no systematic checking of blame -L. Add tests to check blame -L
directly.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/annotate-tests.sh
The ability to omit either end of the -L range is a handy but
undocumented shortcut, and is thus not easily discovered. Fix this
shortcoming.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
Documentation/blame-options.txt | 7 +--
1 file changed, 5 insertions(+), 2 deletions
to add it to line-range.c along with other code
relocated from blame.c. Thus, such a range is effectively treated as
empty. Fix this regression.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
line-range.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/line-range.c b/line
On Thu, Jul 18, 2013 at 3:35 PM, Junio C Hamano gits...@pobox.com wrote:
Add a safety valve to fail git pull that does not explicitly
specify what branch from which repository to integrate your history
with, when it is neither a fast-forward or already up-to-date,
until/unless the user
On Fri, Jul 19, 2013 at 12:22 PM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
+When `git pull` that does not explicitly specify what branch from
+which repository is to be integrated with your history on the
+command line, recent Git will refuse
On Fri, Jul 19, 2013 at 6:20 PM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
Dropping the parenthetical comment might improve flow slightly:
Without repository or branch on the command line, `git pull`
needs to be told how to integrate
As a convenience, accept the same style since committish as accepted
by git-format-patch. For example:
% git contacts origin
will consider commits in the current branch built atop 'origin', just as
git format-patch origin will format commits built atop 'origin'.
Signed-off-by: Eric Sunshine
Assuming that git-contacts may some day be promoted to a core git
command, the documentation is written and formatted as if it already
belongs in Documentation/ even though it presently resides in
contrib/contacts.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
contrib/contacts/git
For example:
% git contacts R1..R2
Committishes and patch files can be mentioned in the same invocation:
% git contacts R1..R2 extra/*.patch
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
contrib/contacts/git-contacts | 38 --
1 file changed
' git-related patch series[1]
written in Ruby.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/226065/
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
contrib/contacts/git-contacts | 127 ++
1 file changed, 127 insertions(+)
create mode
email addresses in the computed list rather than
potentially outdated ones recorded with commits. Apply git's mailmap
functionality to the retrieved contacts in order to achieve this goal.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
contrib/contacts/git-contacts | 18
/226065/
[2]: http://thread.gmane.org/gmane.comp.version-control.git/229533/
[3]:
http://git.661346.n2.nabble.com/PATCH-v3-0-2-add-git-check-mailmap-command-td7591791.html
Eric Sunshine (5):
contrib: add git-contacts helper
contrib: contacts: add ability to parse from committish
contrib
On Mon, Jul 22, 2013 at 2:57 AM, Junio C Hamano gits...@pobox.com wrote:
* es/contacts (2013-07-21) 5 commits
- contrib: contacts: add documentation
- contrib: contacts: add mailmap support
- contrib: contacts: interpret committish akin to format-patch
- contrib: contacts: add ability to
On Tue, Jul 9, 2013 at 4:25 PM, Junio C Hamano gits...@pobox.com wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
It would be more general to support follow the second match to /A/
*independent* of whether the first match is also followed. I think your
proposal only allows the second to
When handed an empty range_set (range_set.nr == 0),
sort_and_merge_range_set() incorrectly sets range_set.nr to 1 at exit.
Subsequent range_set functions then access the bogus range at element
zero and crash or throw an assertion failure. Fix this bug.
Signed-off-by: Eric Sunshine sunsh
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/t4211-line-log.sh | 5 +
1 file changed, 5 insertions(+)
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 12814c0..7616365 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -72,4 +72,9 @@ test_expect_success
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/t4211-line-log.sh | 8
1 file changed, 8 insertions(+)
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 7776f93..1db1edd 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -64,4 +64,12 @@ test_bad_opts -L
empty ranges.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
line-log.c | 2 ++
t/t4211-line-log.sh | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/line-log.c b/line-log.c
index 5234879..6f94d56 100644
--- a/line-log.c
+++ b/line-log.c
@@ -115,6 +115,8
,
line_log_data_insert() assigns the empty range to a new line_log_data
record without taking any action to ensure that the empty range is
eventually folded out. Subsequent range-set functions crash or throw an
assertion failure upon encountering such an anomaly. Fix this bug.
Signed-off-by: Eric
On Tue, Jul 23, 2013 at 3:03 PM, Junio C Hamano gits...@pobox.com wrote:
SZEDER Gábor sze...@ira.uka.de writes:
You could avoid the 'cat' here and patch in 4/5 by doing $(wc -l b.c).
Correct.
Thanks, I like that better.
Unfortunately, what actually got queued on 'next', after applying this
On Tue, Jul 23, 2013 at 5:26 PM, Philip Oakley philipoak...@iee.org wrote:
From: Junio C Hamano gits...@pobox.com
Sent: Tuesday, July 23, 2013 7:26 PM
Jakub Narebski jna...@gmail.com writes:
Junio C Hamano gitster at pobox.com writes:
This is mostly unchanged since the previous round, except
On Wed, Jul 24, 2013 at 11:10 AM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
On Tue, Jul 23, 2013 at 3:03 PM, Junio C Hamano gits...@pobox.com wrote:
SZEDER Gábor sze...@ira.uka.de writes:
You could avoid the 'cat' here and patch in 4/5 by doing $(wc
On Tue, Jul 23, 2013 at 10:28 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
While implementing multiple -L support for git-blame, I encountered
several bugs in range-set and line-log resulting in crashes. This
series fixes those bugs.
Eric Sunshine (5):
range-set: fix
On Thu, Jul 25, 2013 at 5:12 AM, Johannes Sixt j.s...@viscovery.net wrote:
Am 7/25/2013 10:03, schrieb Eric Sunshine:
The tests in this series identify real bugs in dealing with empty
ranges, which the subsequent patches fix. The test are possible
because one can specify an empty range via
On Fri, Jul 26, 2013 at 4:50 PM, Stefan Beller
stefanbel...@googlemail.com wrote:
There are currently 115 commands built into the git executable.
Before this commit, it was iterated over these commands in a linear
order, i.e. each command was checked.
As it turns out the commands are already
On Tue, Jul 30, 2013 at 12:05 AM, Brandon Casey bca...@nvidia.com wrote:
When the number of open packs exceeds pack_max_fds, unuse_one_window()
is called repeatedly to attempt to release the least-recently-used
pack windows, which, as a side-effect, will also close a pack file
after closing
to avoid regressing blame foo when foo is an empty file, the
fix is slightly more complicated than changing '' to '='.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
builtin/blame.c | 4 ++--
t/annotate-tests.sh | 8
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
patch fixing an off-by-one bug which
incorrectly accepts -LX where X is one past end-of-file.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/annotate-tests.sh | 72 +
1 file changed, 72 insertions(+)
diff --git a/t/annotate-tests.sh b
Checking all bogus -L syntax forms in a single test makes it difficult
to identify the offender when one case fails. Decompose this
conglomerate test in order to check each bad syntax case separately.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/annotate-tests.sh | 32
-control.git/231035
Eric Sunshine (11):
t8001/t8002: blame: decompose overly-large test
t8001/t8002: blame: demonstrate -L bounds checking bug
t8001/t8002: blame: add empty file partial-line tests
blame: fix -L bounds checking bug
t4211: log: demonstrate -L bounds checking bug
t4211: retire
Empty ranges -LX,+0 and -LX,-0 are nonsensical in the context of blame
yet they are accepted (in fact, both are interpreted as -LX,+2). Report
them as invalid.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
line-range.c| 2 ++
t/annotate-tests.sh | 4 ++--
2 files changed, 4
When 12da1d1f added -L support to git-log, a broken bounds check was
copied from git-blame -L which incorrectly allows -LX to extend one line
past end of file without reporting an error. Instead, it generates an
empty range. Fix this bug.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
Empty ranges -LX,+0 and -LX,-0 are nonsensical in the context of blame
yet they are accepted. They should be errors. Demonstrate this
shortcoming.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/annotate-tests.sh | 8
1 file changed, 8 insertions(+)
diff --git a/t/annotate
Empty ranges -L,+0 and -L,-0 are nonsensical in the context of blame yet
they are accepted (in fact, both are interpreted as -L1,Y where Y is
end-of-file). Report them as invalid.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
line-range.c| 2 +-
t/annotate-tests.sh | 4 ++--
2
at and in the vicinity of end-of-file.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/t4211-line-log.sh | 30 ++
1 file changed, 30 insertions(+)
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 7665d67..f98275c 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line
Empty ranges -L,+0 and -L,-0 are nonsensical in the context of blame yet
they are accepted. They should be errors. Demonstrate this shortcoming.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/annotate-tests.sh | 8
1 file changed, 8 insertions(+)
diff --git a/t/annotate
at and in the vicinity of end-of-file.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/annotate-tests.sh | 22 ++
1 file changed, 22 insertions(+)
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 3524eaf..02fbbf1 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
the
command-line. APIs of both facilities are private (file static) so
there likewise is no way to test their behaviors programmatically.
Consequently, retire these two tests.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/t4211-line-log.sh | 13 -
1 file changed, 13
On Wed, Jul 31, 2013 at 12:28 PM, Stefan Beller
stefanbel...@googlemail.com wrote:
This patch allows users to use the short form -q on
log and format-patch, which was non possible before.
It would make sense for documentation updates to accompany these changes.
Signed-off-by: Stefan Beller
On Wed, Jul 31, 2013 at 12:28 PM, Stefan Beller
stefanbel...@googlemail.com wrote:
This task emerged from b04ba2bb (parse-options: deprecate OPT_BOOLEAN,
2011-09-27). hash-object is a plumbing layer command, so better
not change the input/output behavior for now.
Unfortunately we have these
On Wed, Jul 31, 2013 at 12:28 PM, Stefan Beller
stefanbel...@googlemail.com wrote:
The --no-create was parsed with OPT_BOOLEAN, which has a counting up
logic implemented. Since b04ba2bb (parse-options: deprecate OPT_BOOLEAN,
2011-09-27) the OPT_BOOLEAN is deprecated and is only a define:
On Wed, Jul 31, 2013 at 12:28 PM, Stefan Beller
stefanbel...@googlemail.com wrote:
The --no-create was parsed with OPT_BOOLEAN, which has a counting up
logic implemented. Since b04ba2bb (parse-options: deprecate OPT_BOOLEAN,
2011-09-27) the OPT_BOOLEAN is deprecated and is only a define:
hello.orig
- sed -e /}/i\\
- Qputs(\goodbye\); hello.orig | tr Q \\t hello.c
+ sed -e /}/ {x; s/$/Qputs(\goodbye\);/; G;} hello.orig |
+ tr Q \\t hello.c
Thanks.
Acked-by: Eric Sunshine sunsh...@sunshineco.com
GIT_AUTHOR_NAME=G GIT_AUTHOR_EMAIL=g...@test.git
On Mon, Aug 5, 2013 at 3:29 PM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
A bounds checking bug allows the X in -LX to extend one line past the
end of file. For example, given a file with 5 lines, -L6 is accepted as
valid. Demonstrate this problem
On Mon, Aug 5, 2013 at 3:35 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Mon, Aug 5, 2013 at 3:29 PM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
A bounds checking bug allows the X in -LX to extend one line past the
end of file. For example
.661346.n2.nabble.com/PATCH-0-6-fix-blame-L-regression-add-tests-tp7592174.html
[5]: http://thread.gmane.org/gmane.comp.version-control.git/231035
[6]: http://thread.gmane.org/gmane.comp.version-control.git/231412
[7]: http://article.gmane.org/gmane.comp.version-control.git/229966
Eric Sunshine (16
confusing since the comma
separating them is typeset the same as the comma in start,end. Fix
this by placing each variation on its own line.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
Documentation/git-log.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
and log's -L options to
accept a start point for -L/RE/ searches. Follow-up patches will upgrade
blame and log to take advantage of this ability.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/229755/focus=229966
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
builtin
.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
Documentation/line-range-format.txt | 1 +
line-range.c| 10 --
t/annotate-tests.sh | 21 +
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/Documentation/line
to override the default relative
search behavior.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
Documentation/line-range-format.txt | 3 ++-
line-range.c| 12 +++-
t/annotate-tests.sh | 16
t/t4211-line-log.sh | 1
Since inception, git-blame -L has been documented as accepting 1-based
line numbers. When handed a line number less than 1, -L's behavior is
undocumented and undefined; it's also nonsensical and should be
diagnosed as an error. Do so.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
line
be -L's lone argument.
Clarify by discussing :regex at the same indentation level as start
and end...:
-Lstart,end
-L:regex
start and end can take one of these forms:
* number
* /regex/
* +offset or -offset
If :regex is given in place of start and end ...
Signed-off-by: Eric
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/annotate-tests.sh | 32
1 file changed, 32 insertions(+)
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index ce5b8ed..77083d9 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -271,6
git-blame is slated to accept multiple -L ranges. git-log already
accepts multiple -L's but its implementation of range-set, which
organizes and normalizes -L ranges, is private. Publish the small
subset of range-set API which is needed for git-blame multiple -L
support.
Signed-off-by: Eric
to instead store each file's set
of -L ranges verbatim, and then coalesce the ranges in a post-processing
step.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
line-log.c | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/line-log.c b/line-log.c
index
The -L:RE option of blame/log searches from the end of the previous -L
range, if any. Add new notation -L^:RE to override this behavior and
search from start of file.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
Documentation/line-range-format.txt | 1 +
line-range.c
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
Documentation/blame-options.txt | 8 +---
Documentation/git-blame.txt | 10 +++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 489032c
Option -L/RE/ of blame/log now searches relative to the previous -L
range, if any. Document this.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
Documentation/line-range-format.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/line-range
-blame to accept multiple -L ranges. Overlapping and
out-of-order ranges are accepted.
In this patch, the X in -LX,Y is absolute (for instance, /RE/ patterns
search from line 1), and Y is relative to X. Follow-up patches provide
more flexibility over how X is anchored.
Signed-off-by: Eric Sunshine
On Tue, Aug 6, 2013 at 9:07 AM, Stefan Beller
stefanbel...@googlemail.com wrote:
Now that the variables are readin by OPT_BOOL, which makes sure
Do you mean s/readin/read in/ ?
Or should it be s/readin/set/ ?
to have the values being 0 or 1 after reading, we do not need
the double negation
), however, adds a new invocation of opterror()
which ignores the return value, thus triggering the unused value
warning.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
parse-options.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parse-options.h b/parse-options.h
]: http://thread.gmane.org/gmane.comp.version-control.git/231739
Eric Sunshine (3):
contacts: validate hunk length earlier
contacts: gather all blame sources prior to invoking git-blame
contacts: reduce git-blame invocations
contrib/contacts/git-contacts | 31 ++-
1
by collecting together all lines to
blame within a single file at a particular revision. By validating the
blame range early, the subsequent patch can more easily avoid adding
empty ranges at collection time.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
contrib/contacts/git-contacts | 5
^..23c339c0f262aad2 /dev/null
real 0m2.285s
user 0m2.093s
sys 0m0.165s
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
contrib/contacts/git-contacts | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/contrib/contacts/git-contacts b/contrib/contacts/git
to
to know in advance which line ranges to blame per file per revision.
Make this information available by collecting all sources as a distinct
step from invoking git-blame. A subsequent patch will utilize the
information to optimize git-blame invocations.
Signed-off-by: Eric Sunshine sunsh
On Sat, Aug 10, 2013 at 9:24 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
Over the time the default value for --thin has been switched between
on and off. As of now it's always on, even if --no-thin is given.
Correct the code to respect --no-thin.
receive-pack learns about --no-thin only
On Sat, Aug 10, 2013 at 12:58 AM, Stephen Haberman
step...@exigencecorp.com wrote:
If a user is working on master, and has merged in their feature branch, but
now
has to git pull because master moved, with pull.rebase their feature branch
will be flattened into master.
This is because git
On Sun, Aug 11, 2013 at 2:16 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
Also, it's not clear from the documentation how one would override
pull.rebase=preserve in order to do a normal non-preserving rebase.
From reading the code, one can see that --preserve=true (or
s/--preserve=true
a unique SHA-1
abbreviation:
error: short SHA1 badbeef is ambiguous.
fatal: Needed a single revision
Invalid commit name: badbeef
Fix this problem by expanding the SHA-1's in the todo list before
performing the operations.
[es: also collapse expand SHA-1's for --edit-todo]
Signed-off-by: Eric
commit's message.
Signed-off-by: Eric Sunshine sunsh...@sunshineco.com
---
t/t3404-rebase-interactive.sh | 17 +
1 file changed, 17 insertions(+)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index af141be..e5ebec6 100755
--- a/t/t3404-rebase
On Mon, Aug 12, 2013 at 2:28 AM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
At start of script, t3404 installs a specialized test-editor ($EDITOR)
upon which many of the interactive rebase tests depend. Late in t3404,
test rebase -i respects
On Mon, Aug 12, 2013 at 2:31 AM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
The 'todo' sheet for interactive rebase shows abbreviated SHA-1's and
then performs its operations upon those shortened values. This can lead
to an abort if the SHA-1
On Mon, Aug 12, 2013 at 3:44 AM, Junio C Hamano gits...@pobox.com wrote:
Subject: .mailmap: update long-lost friends with multiple defunct addresses
A handful of past contributors are recorded with multiple e-mail
addresses, all of which are undeliberable. With a lot of help from
On Thu, Aug 15, 2013 at 3:37 PM, Stefan Beller
stefanbel...@googlemail.com wrote:
When checking the previous lines in that function, we can deduct that
s/deduct/deduce/
hsize must always be smaller than (1u31), since 506049c7df2c6
(fix 4GiB source delta assertion failure), because the entries
On Thu, Aug 15, 2013 at 5:34 PM, Stefan Beller
stefanbel...@googlemail.com wrote:
When checking the previous lines in that function, we can deduce that
hsize must always be smaller than (1u31), since 506049c7df2c6
(fix 4GiB source delta assertion failure), because entries is
capped at an upper
On Thu, Aug 15, 2013 at 6:17 PM, Stefan Beller
stefanbel...@googlemail.com wrote:
I have got an idea regarding the send-email. If there are no recipients
given, it could propose recipients using the new 'git contacts'
This would help people new to projects to not forget people, who may have
301 - 400 of 3596 matches
Mail list logo
