On Sun, Jun 09, 2013 at 04:25:11PM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" writes:
>
> > With respect to this, and a bit off-topic, what's
> > the best way to revise patch series?
> >
> > What I did, given series in patchvN-1/:
> >
> > rm -fr patchvN #blow away old directory if th
Junio C Hamano wrote:
> Revert 77c1305 and 3c3b46b
The core of the argument seems to be that
__git_complete_revlist_file() is a misleading name for the completion
done by archive and ls-tree, but __git_complete_file() is somehow a
less misleading name? Irrespective of what the valid completio
On Sun, Jun 09, 2013 at 04:24:37PM -0700, Junio C Hamano wrote:
> Sometimes people would want to view the commits in parallel
> histories in the order of author dates, not committer dates.
>
> Teach "topo-order" sort machinery to do so, using a commit-info slab
> to record the author dates of eac
From: Erik Faye-Lund
Returning the SIGALRM handler for SIGINT is not very useful.
Signed-off-by: Erik Faye-Lund
Signed-off-by: Johannes Sixt
---
Am 6/7/2013 16:20, schrieb Erik Faye-Lund:
> On Fri, Jun 7, 2013 at 3:07 PM, Johannes Sixt wrote:
>> BTW, isn't mingw_signal() bogus in that it retu
Am 6/9/2013 22:31, schrieb Junio C Hamano:
> Jeff King writes:
>
>> I'm a little negative on handling just SIGTERM. That would make the test
>> pass, but does it really address the overall issue? To me, the
>> usefulness is having exit values with consistent meanings.
>
> Yes. Unless the goal i
On Sun, Jun 09, 2013 at 04:37:27PM -0700, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > Use the commit-queue data structure to implement a priority queue
> > of commits sorted by committer date, when handling --date-order.
> > The commit-queue structure can also be used as a simple LIFO s
On Sun, Jun 09, 2013 at 04:24:35PM -0700, Junio C Hamano wrote:
> Traditionally we used a singly linked list of commits to hold a set
> of in-flight commits while traversing history. The most typical use
> of the list is to add commits that are newly discovered to it, keep
> the list sorted by co
Ignore this patch. I was using this to test and improve 'git rebase', and I was
using the lessons learned to improve 'git rebase' shell script.
I was planning it to clean it even more, and simplify it using tricks specific
to Ruby.
But no more.
There's no point in trying to improve 'git rebase'.
On Sun, Jun 9, 2013 at 6:40 PM, Stefano Lattarini
wrote:
> I do accuse Felipe's *attitude* to bring on and nourish such
> unpleasantness toxicity. His technical merits and the possible
> qualities of his patches do *nothing* to remove or quell such
> issues.
How convenient to accuse me
On Sun, Jun 9, 2013 at 4:42 PM, Michael Haggerty wrote:
> Felipe, I wish that you would devote a small fraction of your prodigious
> energy to the very difficult challenge of feeling empathy,
I do feel empathy, the problem is that you make the assumption that
other people are like you, and that
On Sun, Jun 9, 2013 at 4:39 PM, Junio C Hamano wrote:
> One example of killing the entire thread is when I see "This patch
> will not be applied" by Felipe in a thread started with his patch.
> I understand that it is his way to say "this patch is retracted"
> without having to explicitly say tha
On Sun, Jun 09, 2013 at 04:24:34PM -0700, Junio C Hamano wrote:
> The name "lifo", however, is too strongly tied to the way how the
> function implements its behaviour, and does not describe what the
> behaviour _means_.
>
> Replace this field with an enum rev_sort_order, with two possible
> valu
On Sun, Jun 9, 2013 at 6:29 PM, Junio C Hamano wrote:
> When otherwise silent old-timers feel a need to come during a
> discussion that might affect the course of the project in a major
> way, we should pay more attention, not less, to what they say (I am
> not saying "we should blindly follow").
On Sun, Jun 9, 2013 at 7:24 PM, Junio C Hamano wrote:
> The primary invariant of sort_in_topological_order() is that a
> parent commit is not emitted untile all children of it are. When
s/untile/until/
> traversing a forked history like this with "git log C E":
>
> ABC
> \
>
On Sun, Jun 9, 2013 at 7:59 PM, SZEDER Gábor wrote:
> Fedore 9 shipped the gvfs package with a buggy Bash completion script:
s/Fedore/Fedora/
> it removed the ':' character from COMP_WORDBREAKS, thereby breaking
> certain features of git's completion script. We worked this around in
> db8a9ff0
On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy wrote:
> GUARD_PATHSPEC() marks pathspec-sensitive code, basically all those
> that touch anything in 'struct pathspec' except fields "nr" and
> "original". GUARD_PATHSPEC() is not supposed to fail. It's mainly to
> help the designers to catch u
On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy wrote:
> This makes 'original' suitable for passing to an external command
> because all pathspec magic is left in place, provided that the
> external command understands pathspec. The prefixing is needed because
> we usually launch a subcommand
On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy wrote:
> This flag is equivalent to builtin/ls-files.c:strip_trailing_slashes()
> and is intended to replace that function when ls-files is converted to
> use parse_pathspec.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git a/pathspec
On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy wrote:
> parse_pathspec: a special flag for max_depth feature
s/a/add/
> match_pathspec_depth() and tree_entry_interesting() check max_depth
> field in order to support "git grep --max-depth". The feature
> activation is tied to "recursive" fi
On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy wrote:
> diff --git a/pathspec.c b/pathspec.c
> index 89bdc7f..9e68321 100644
> --- a/pathspec.c
> +++ b/pathspec.c
> @@ -271,10 +271,20 @@ void parse_pathspec(struct pathspec *pathspec,
> if (!entry && !prefix)
> return;
I find the new atmosphere in the list uncomfortable to work with. I do
this for fun and it does not seem fun these days any more so I will
take a break from Git development. Consider all my ongoing work
abandoned. All of my public patches are signed off. If you want to
continue improve them, go ahe
On Mon, Jun 10, 2013 at 12:54 AM, Ramkumar Ramachandra
wrote:
> Hi,
>
> This iteration contains some minor fixups (courtesy reviews by Eric
> Sunshine and Junio), and some tests from Duy squashed in.
I'm starting to think this is a half-baked solution. It hides
problems, for example commit placeh
On Sun, Jun 9, 2013 at 2:25 AM, Nguyễn Thái Ngọc Duy wrote:
> diff --git a/pathspec.c b/pathspec.c
> index 8fe56cd..b49bd51 100644
> --- a/pathspec.c
> +++ b/pathspec.c
> @@ -195,15 +195,128 @@ static const char *prefix_pathspec(const char *prefix,
> int prefixlen, const char
> +/*
> + * Given co
On Sun, Jun 9, 2013 at 6:22 PM, Célestin Matte
wrote:
> Changes with v2:
> - Remove patch [02/22] about using the Readonly module
> - Split commit [07/22] into 5 different ones
This was easier to review after being split. Thanks.
> - Split commit [14/22] into 2 different ones
> - Patch [17/22] w
On Sun, Jun 9, 2013 at 6:22 PM, Célestin Matte
wrote:
> - strings which don't need interpolation are single-quoted for more clarity
> and
> slight gain of performance
> - interpolation is preferred over concatenation in many cases, for more
> clarity
> - variables are always used with the ${} op
SZEDER Gábor wrote:
> Fedore 9 shipped the gvfs package with a buggy Bash completion script:
> it removed the ':' character from COMP_WORDBREAKS, thereby breaking
> certain features of git's completion script. We worked this around in
> db8a9ff0 (bash completion: Resolve git show ref:path losing
Fedore 9 shipped the gvfs package with a buggy Bash completion script:
it removed the ':' character from COMP_WORDBREAKS, thereby breaking
certain features of git's completion script. We worked this around in
db8a9ff0 (bash completion: Resolve git show ref:path losing ref:
portion, 2008-07-15).
T
[Sorry for the full quote, but sometimes, repetita iuvant]
On 06/09/2013 11:42 PM, Michael Haggerty wrote:
> On 06/09/2013 09:11 PM, Johan Herland wrote:
>> [...]
>> FWIW, I'd like to express my support for the opinions expressed by
>> Jonathan, Jeff and Thomas. They accurately describe my impress
"Philip Oakley" writes:
> While folks do use such simplistic names, given that the patch had
> many call sites, I do think Filipe's short name would quickly become
> the accepted test name and not cause any great difficulties.
OK.
--
To unsubscribe from this list: send the line "unsubscribe git"
Junio C Hamano writes:
> Use the commit-queue data structure to implement a priority queue
> of commits sorted by committer date, when handling --date-order.
> The commit-queue structure can also be used as a simple LIFO stack,
> which is a good match for --topo-order processing.
>
> Signed-off-b
Ramkumar Ramachandra writes:
> Do you think that the opinions of
> inactive community members and non-contributors are _more_ valuable
> than those of active contributors, or am I missing something?
I am not Dscho, but it probably is worth saying this anyway.
6d297f81373e (Status update on merg
"Michael S. Tsirkin" writes:
> With respect to this, and a bit off-topic, what's
> the best way to revise patch series?
>
> What I did, given series in patchvN-1/:
>
> rm -fr patchvN #blow away old directory if there
> # otherwise I get two copies of patches if I renam
Use the commit-queue data structure to implement a priority queue
of commits sorted by committer date, when handling --date-order.
The commit-queue structure can also be used as a simple LIFO stack,
which is a good match for --topo-order processing.
Signed-off-by: Junio C Hamano
---
commit-queue
The primary invariant of sort_in_topological_order() is that a
parent commit is not emitted untile all children of it are. When
traversing a forked history like this with "git log C E":
ABC
\
DE
we ensure that A is emitted after all of B, C, D, and E are done, B
has to
Sometimes people would want to view the commits in parallel
histories in the order of author dates, not committer dates.
Teach "topo-order" sort machinery to do so, using a commit-info slab
to record the author dates of each commit, and commit-queue to sort
them.
Signed-off-by: Junio C Hamano
--
Traditionally we used a singly linked list of commits to hold a set
of in-flight commits while traversing history. The most typical use
of the list is to add commits that are newly discovered to it, keep
the list sorted by commit timestamp, pick up the newest one from the
list, and keep digging.
Not much changed in the first three patches since the edition from
last week. A clean-up to clarify the toposort API, introduction of
priority queue API, and then its use in topological sort logic.
The final patch adds "log --author-date-order" to build on top of
them.
Adding tests to t4202 and/
Thanks, both. Will queue both after re-reading 1/2.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Felipe Contreras writes:
> There's no need to list again the prerequisites.
>
> Signed-off-by: Felipe Contreras
> ---
Makes sense. I'll retitle to keep shortlog a bit more information
rich while queuing the patch, though.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git
SZEDER Gábor writes:
>> There still remain two users of __git_complete_file, completions for
>> "archive" and "ls-tree". As these commands do not take range
>> notation, and "git show" no longer uses __git_complete_file, the
>> implementation of can be updated not to complete ranges, but that is
Ramkumar Ramachandra writes:
> rr/triangle (4d35924, 2013-04-07) introduced support for triangular
> workflows, but did not think through the effect of the new configuration
> variables in the upstream and simple modes. When remote.pushdefault or
> branch..pushremote is set, and push.default is
From: "Felipe Contreras"
Sent: Sunday, June 09, 2013 8:33 PM
On Sun, Jun 9, 2013 at 2:20 PM, Junio C Hamano
wrote:
Felipe Contreras writes:
On Sun, Jun 9, 2013 at 1:30 PM, Junio C Hamano
wrote:
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -606,6 +606,18 @@ test_cmp() {
A "split ' '" is turned into a "split / /", which changes its behaviour: the
old method matched a run of whtespaces (/\s*/), while the new one will match a
single whitespace, which is what we want here. Indeed, in other contexts,
changing split(' ') to split(/ /) could potentially be a regression,
Follow perlcritic's InputOutput::RequireEncodingWithUTF8Layer policy
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
m// and // is used randomly. It is better to use the m modifier only when
needed, e.g., when the regexp uses another separator than //.
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |6 +++---
1 file changed, 3 insertions(+), 3 del
In this regexp, ' |\n' is used, whereas its equivalent '[ \n]', which is
clearer, is used elsewhere. Make the style coherent.
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
index 50b3452..fb6bca3 100
Perl's split function takes a regex pattern argument. You can also
feed it an expression, which is then compiled into a regex at runtime.
It therefore works to pass your pattern via single quotes, but it is
much less obvious to a reader that the argument is meant to be a
regex, not a static string.
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |1 -
1 file changed, 1 deletion(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
index 6024791..ef9e60a 100755
--- a/contrib/m
Put first parameter of map inside a block, for better readability.
Follow BuiltinFunctions::RequireBlockMap
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --gi
Change '[\n]' to '\n': brackets are useless here.
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
index ef9e60a..0610d
Follow Subroutines::RequireFinalReturn
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl | 18 ++
1 file changed, 18 insertions(+)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl | 50 +--
1 file changed, 31 insertions(+), 19 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
Local variable $url has the same name as a global variable. Changing the name
of the local variable prevents future possible misunderstanding.
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |6 +++---
1 file changed, 3 insertions(+)
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
index 1cda460..b
This follows the following rule:
InputOutput::RequireBracedFileHandleWithPrint (Severity: 1)
The `print' and `printf' functions have a unique syntax that supports an
optional file handle argument. Conway suggests wrapping this argument in
braces to make it visually stand out from the ot
Empty strings are replaced by an $EMPTY constant.
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/co
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
index c2b1afd..b0e540b 1
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
index 63d1530..60247
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
Non-trivial numeric values (e.g., different from 0, 1 and 2) are placed in
constants at the top of the code to be easily modifiable and to make more sense
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl | 20 ++--
1 fil
@$var structures are re-written in the following way: @{$var}
It makes them more readable.
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/mw-to-git/g
- strings which don't need interpolation are single-quoted for more clarity and
slight gain of performance
- interpolation is preferred over concatenation in many cases, for more clarity
- variables are always used with the ${} operator inside strings
- strings including double-quotes are written w
Changes with v2:
- Remove patch [02/22] about using the Readonly module
- Split commit [07/22] into 5 different ones
- Split commit [14/22] into 2 different ones
- Patch [17/22] was *not* split: tell me if it is necessary
- Remove wrong change in patch [22/22]
Patch about fixing a bug in a regexp
Use {}{} instead of /// when slashes are used inside the regexp so as not to
escape it.
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/mw-to-git/git-re
%basetimestamps declaration was lost in the middle of subroutines
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
index a7bb397..863ecc9 100
Explicitly assign local variable $/ as undef and make a proper
one-instruction-by-line indentation
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/contrib/mw-to-g
Subroutines' parameters should be affected to variable before doing anything
else
Besides, existing instruction affected a variable inside a "if", which break
Git's coding style
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |3 ++-
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl |1 -
1 file changed, 1 deletion(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
index fb6bca3..c404e7b 100755
--- a/contrib/m
Hi,
On Sun, Jun 09, 2013 at 02:20:33PM -0700, Junio C Hamano wrote:
> Regarding that rr/complete-difftool topic, let's revert the tip 2
> commits (the "ls-tree, archive and show" one, and the follow-up
> resurrection of __git_complete_file) with this:
>
> Revert 77c1305 and 3c3b46b
>
>
On 06/09/2013 09:11 PM, Johan Herland wrote:
> [...]
> FWIW, I'd like to express my support for the opinions expressed by
> Jonathan, Jeff and Thomas. They accurately describe my impression of
> these discussion threads.
I also agree. In my opinion, Felipe, your abrasiveness, your disregard
of pr
Jeff King writes:
> ... We do not have an explicit code of
> conduct on the list, but it is not as if behavior is without
> consequences. If you are not easy to work with, people will get tired of
> dealing with you eventually[1].
FWIW, I have already reached that point and learned to kill certa
Antoine Pelisse writes:
> It might be kind of noisy, but I think trying to improve the solution
> might lead to over-engineering.
> How would we compute the "minimal distance between interesting and
> blank" so that the blank becomes interesting ?
> Using the context size for that is quite conven
SZEDER Gábor writes:
>> It is somewhat annoying that "git diff gi" stops at expanding
>> it to "git diff git" and then upon another "git diff git"
>> offers tags whose names begin with "git" (e.g. gitgui-0.10.0) but
>> the pathname git.c is not included in the choices. My wish was to
>> take the
From: "Felipe Contreras"
Sent: Sunday, June 09, 2013 6:23 PM
On Sun, Jun 9, 2013 at 12:18 PM, SZEDER Gábor
wrote:
On Sun, Jun 09, 2013 at 11:40:22AM -0500, Felipe Contreras wrote:
We should free objects before leaving.
Signed-off-by: Felipe Contreras
A shortlog-friendlier subject could be
SZEDER Gábor writes:
> Now, __git_complete_revlist_file() provides completion both for this
> master:Doc notation and for revision ranges, i.e. for
> master..n and master...n. However, since neither git
> ls-tree nor git archive accept revision ranges, calling
> __git_complete_revlist_file() in
On Sun, Jun 9, 2013 at 3:35 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> On Sun, Jun 9, 2013 at 2:20 PM, Junio C Hamano wrote:
>>> Felipe Contreras writes:
>>>
On Sun, Jun 9, 2013 at 1:30 PM, Junio C Hamano wrote:
> --- a/t/test-lib-functions.sh
> +++ b/t/test-li
Felipe Contreras writes:
> On Sun, Jun 9, 2013 at 2:20 PM, Junio C Hamano wrote:
>> Felipe Contreras writes:
>>
>>> On Sun, Jun 9, 2013 at 1:30 PM, Junio C Hamano wrote:
>>>
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -606,6 +606,18 @@ test_cmp() {
Jonathan Nieder wrote:
> Of course the git development community is not organized enough for an
> intervention, but as context I thought I'd mention that that's what
> works.
Atleast this is more interesting that the canned
Felipe-demeanour-complaint people constantly bring up boring everyone
to d
On Sun, Jun 9, 2013 at 10:07 PM, Junio C Hamano wrote:
> by
> the way, do we also handle deletions and do your new tests check
> them?
As stated in the commit message, yes we should, but we don't have
tests for that.
I will need to add some as I think I found a bug when removing blank lines.
>>
Jeff King writes:
> I'm a little negative on handling just SIGTERM. That would make the test
> pass, but does it really address the overall issue? To me, the
> usefulness is having exit values with consistent meanings.
Yes. Unless the goal is to give Windows port pratically the same
signal sema
Antoine Pelisse writes:
> The goal of the patch is to introduce the GNU diff
> -B/--ignore-blank-lines as closely as possible. The short option is not
> available because it's already used for "break-rewrites".
>
> When this option is used, git-diff will not create hunks that simply
> adds or rem
On Sun, Jun 9, 2013 at 2:57 PM, Jonathan Nieder wrote:
> Jeff King wrote:
> Of course that's not the intent: the intent of ignoring someone is to
> hope they'll go away. :)
>
> In the context of other unhealthy behaviors (like alcoholism) there is
> a concept of enabling behavior.
The only one t
On Sun, Jun 9, 2013 at 2:54 PM, Ramkumar Ramachandra wrote:
>> http://article.gmane.org/gmane.comp.version-control.git/225969
This is a good example of an evolving discussion. René Scharfe has
accepted that the API indeed needs work. How exactly it's going to be
fixed is not entirely clear, bu
Jeff King wrote:
> My advice would be to ignore him when the discussion proceeds in an
> unproductive direction.
There is something appealing about that option. The problem is that
it doesn't work, at least for someone that relies on the list as a way
of understanding patches that have been appl
Thomas Rast wrote:
> The arguments arise to a large degree from attempting to review his
> work. Not doing so is not an option, see e.g.:
I don't recall saying that you shouldn't review his work (?). What I
_am_ saying is that there is absolutely no point belaboring over
what's wrong with Felipe
On Sun, Jun 09, 2013 at 02:16:29PM -0500, Felipe Contreras wrote:
> On Sun, Jun 9, 2013 at 2:08 PM, Fredrik Gustafsson wrote:
> > On Sun, Jun 09, 2013 at 01:19:03PM -0500, Felipe Contreras wrote:
> >> The explains what the patch is doing, but not why. Why is more important.
> >
> > You're right. W
Now that git log -L has hit master, I figure it's time to discuss the
corresponding change to gitk.
The hard part is that AFAICS this is the first history display
accessible through gitk that can only be computed in one go. The
existing displays all work by having git-log perform a preliminary
se
The previous commit split the diffs into a separate field. Now we
actually want to show them.
To that end we use the stored diff, and
- process it once to build a fake "tree diff", i.e., a list of all
changed files;
- feed it through parseblobdiffline to actually format it into the
$ctext f
So far we just parsed everything after the headers into the "comment"
bit of $commitinfo, including notes and -- if you gave weird options
-- the diff.
Split out the diff, if any, into a separate field. It's easy to
recognize, since the log message is indented but the /^diff / that
starts a diff
For later use with data sources other than a pipe, refactor the big
worker part of getblobdiffline to a separate function
parseblobdiffline. Also refactor its initialization and wrap-up to
separate routines.
Signed-off-by: Thomas Rast
---
gitk | 408 +++--
This gives line-log support to gitk, by exploiting the new support for
processing and showing "inline" diffs straight from the git-log
output.
Note that we 'set allknown 0', which is a bit counterintuitive since
this is a "known" option. But that flag prevents gitk from thinking
it can optimize t
On Sun, Jun 9, 2013 at 2:24 PM, Felipe Contreras
wrote:
> Same as before, but:
Also, remove the patches from Martin von Zweigbergk, because
apparently some people have trouble understanding that they were not
part of this series.
--
Felipe Contreras
--
To unsubscribe from this list: send the li
On Sun, Jun 9, 2013 at 2:20 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> On Sun, Jun 9, 2013 at 1:30 PM, Junio C Hamano wrote:
>>
>>> --- a/t/test-lib-functions.sh
>>> +++ b/t/test-lib-functions.sh
>>> @@ -606,6 +606,18 @@ test_cmp() {
>>> $GIT_TEST_CMP "$@"
>>> }
>>>
>>> +
On Sun, Jun 9, 2013 at 2:21 PM, Fredrik Gustafsson wrote:
> On Sun, Jun 09, 2013 at 11:40:23AM -0500, Felipe Contreras wrote:
>> Signed-off-by: Felipe Contreras
>> ---
>> builtin/sequencer.c | 4 ++--
>> t/t3510-cherry-pick-sequence.sh | 2 +-
>> 2 files changed, 3 insertions(+), 3 d
On Sun, Jun 9, 2013 at 2:11 PM, Johan Herland wrote:
> On Sun, Jun 9, 2013 at 8:16 PM, Felipe Contreras
> wrote:
>> On Sun, Jun 9, 2013 at 1:10 PM, Jeff King wrote:
>>> Go back to my 261 commits, show me one that is "unmindful of technical
>>> details".
>>
>> And you say this thread is an excel
The cherrypick mode does the job.
Signed-off-by: Felipe Contreras
---
Makefile | 1 -
contrib/completion/git-prompt.sh | 4 +-
git-rebase--merge.sh | 151 ---
git-rebase.sh| 13 +---
t/t3406-rebase-m
Unless any specific 'git am' options are used.
Signed-off-by: Felipe Contreras
---
contrib/completion/git-prompt.sh | 2 ++
git-rebase.sh | 8
t/t3407-rebase-abort.sh| 2 +-
t/t3420-rebase-autostash.sh| 2 +-
t/t5520-pull.sh
1 - 100 of 307 matches
Mail list logo
