The following changes since commit b5c26758639cd934780620d4dd16854c8fdf8c34:
Sync with maint (2013-06-03 13:00:09 -0700)
are available in the git repository at:
http://github.com/msysgit/git tags/post183-for-junio
for you to fetch changes up to 65db0443710f59a1c05a85688cdccc215ff48333:
A colleague of mine who is well-intentioned and fairly knowledgeable
about git recently caused havoc with our repository while merging
changes on the main line branch into a feature branch. The reason is
that, along the way, he tried to use "git stash" while the merge was
pending. A few commands
On Thu, Jun 06, 2013 at 06:35:43PM -0700, Constantine A. Murenin wrote:
> I'm interested in running a web interface to this and other similar
> git repositories (FreeBSD and NetBSD git repositories are even much,
> much bigger).
>
> Software-wise, is there no way to make cold access for git-log an
Am 6/6/2013 19:40, schrieb Jeff King:
> On Thu, Jun 06, 2013 at 10:21:47AM -0700, Junio C Hamano wrote:
>
>>> The particular deficiency is that when a signal is raise()d whose SIG_DFL
>>> action will cause process death (SIGTERM in this case), the
>>> implementation of raise() just calls exit(3).
Signed-off-by: Martin von Zweigbergk
---
t/t3400-rebase.sh | 31 +
t/t3401-rebase-partial.sh | 45 ---
t/t3404-rebase-interactive.sh | 10 +-
t/t3409-rebase-preserve-merges.sh | 53
t/t3425-rebase-topology-merges.sh | 258 ++
Changes since v5:
* Improved test_linear_range
* Changed TODOs to be about consistency, not --topo-order
Martin von Zweigbergk (7):
add simple tests of consistency across rebase types
add tests for rebasing with patch-equivalence present
add tests for rebasing of empty commits
add tests
Update the following:
- Quote 'setup'
- Remove blank lines within test case body
- Use test_commit instead of custom quick_one
- Create branch "topic" from tag created by test_commit
Signed-off-by: Martin von Zweigbergk
---
t/t3406-rebase-message.sh | 30 +-
1 fi
Signed-off-by: Martin von Zweigbergk
---
t/lib-rebase.sh | 17
t/t3421-rebase-topology-linear.sh | 85 +++
2 files changed, 102 insertions(+)
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 1e0ff28..4b74ae4 100644
--- a/t/lib-re
Helped-by: Johannes Sixt
Signed-off-by: Martin von Zweigbergk
---
t/lib-rebase.sh | 16
t/t3421-rebase-topology-linear.sh | 78 +++
2 files changed, 94 insertions(+)
create mode 100755 t/t3421-rebase-topology-linear.sh
diff --git a
t3406 is supposed to test "messages from rebase operation", so let's
move tests in t3400 that fit that description into 3406. Most of the
functionality they tested, except for the messages, has now been
subsumed by t3420.
Signed-off-by: Martin von Zweigbergk
---
t/t3400-rebase.sh | 22 --
Signed-off-by: Martin von Zweigbergk
---
t/t3421-rebase-topology-linear.sh | 129 ++
1 file changed, 129 insertions(+)
diff --git a/t/t3421-rebase-topology-linear.sh
b/t/t3421-rebase-topology-linear.sh
index f19f0d0..e67add6 100755
--- a/t/t3421-rebase-topolo
Signed-off-by: Martin von Zweigbergk
---
t/t3401-rebase-partial.sh | 24
t/t3421-rebase-topology-linear.sh | 58 +++
2 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh
On Fri, Jun 7, 2013 at 1:11 AM, 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 insert commit that is newly discovered in it, keep
s/commit/a commit/
Also, "in i
Eric Sunshine writes:
> On Fri, Jun 7, 2013 at 1:11 AM, Junio C Hamano wrote:
>> The primary invariant of sort_in_topological_order() is to emit all
>> children before their parent is emitted. When traversing a forked
>
> s/parent is/parents are/
Hmm, not quite. The above refers to:
B
On Fri, Jun 7, 2013 at 1:11 AM, Junio C Hamano wrote:
> The primary invariant of sort_in_topological_order() is to emit all
> children before their parent is emitted. When traversing a forked
s/parent is/parents are/
> history like this with "git log C E":
>
> ABC
> \
> D
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 insert commit that is newly discovered in it, keep
it sorted by commit timestamp, pick up the newest one from the list,
and keep digging. The c
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 to emit all
children before their parent is emitted. 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 wait until C
These three patches introduce a commit-queue API to manage a set of
commits in a priority queue, with a caller-specified comparison
function. The priority queue replaces the singly-listed commit_list
in the topological sort function.
The series applies on top of the commit-info-slab API sesries P
On Thu, Jun 6, 2013 at 7:25 PM, Junio C Hamano wrote:
> When sorting commits topologically, the primary invariant is to emit
> all children before its parent is emitted. When traversing a forked
> history like this with "git log C E":
>
> ABC
> \
> DE
>
> we ensure that
Eric Sunshine writes:
> On Thu, Jun 6, 2013 at 3:34 PM, Célestin Matte
> wrote:
>> Signed-off-by: Célestin Matte
>> Signed-off-by: Matthieu Moy
>> ---
s/into a submodule/into a sub/; or "subroutine".
>> contrib/mw-to-git/git-remote-mediawiki.perl | 44
>> ---
>> 1
Eric Sunshine writes:
> On Thu, Jun 6, 2013 at 10:30 PM, Junio C Hamano wrote:
>> Eric Sunshine writes:
>>
- if (my ($child, $parents) = $line =~
m/^-?([a-f0-9]+) ([a-f0-9 ]+)/) {
- foreach my $parent (split(' ', $parents)) {
>
On Thu, Jun 6, 2013 at 10:30 PM, Junio C Hamano wrote:
> Eric Sunshine writes:
>
>>> - if (my ($child, $parents) = $line =~
>>> m/^-?([a-f0-9]+) ([a-f0-9 ]+)/) {
>>> - foreach my $parent (split(' ', $parents)) {
>>> + if (
On Thu, Jun 6, 2013 at 3:34 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
On Thu, Jun 6, 2013 at 3:34 PM, Célestin Matte
wrote:
> 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
On Thu, Jun 6, 2013 at 3:34 PM, Célestin Matte
wrote:
> @$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 | 12 ++--
> 1 fil
On Thu, Jun 6, 2013 at 3:34 PM, Célestin Matte
wrote:
> Signed-off-by: Célestin Matte
> Signed-off-by: Matthieu Moy
> ---
> contrib/mw-to-git/git-remote-mediawiki.perl | 44
> ---
> 1 file changed, 26 insertions(+), 18 deletions(-)
>
> diff --git a/contrib/mw-to-git/g
On Thu, Jun 6, 2013 at 3:34 PM, Célestin Matte
wrote:
> 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.
Hi Ram,
On Fri, 7 Jun 2013, Ramkumar Ramachandra wrote:
> Johannes Schindelin wrote:
> > My initial reaction, too. It was hard enough to get Perl included with Git
> > for Windows (because of that pesky Subversion dependency).
>
> Nevertheless, we had to do it, and we did it.
That is not quite
Hi git,
I want to work on a visualization program for git. I was hoping there
was a library that would allow me to monitor a git repo for changes.
Consider it like inotify, but for a git repository (in fact, I think
it would probably have inotify under the hood).
This hypothetical library would t
Eric Sunshine writes:
>> - if (my ($child, $parents) = $line =~
>> m/^-?([a-f0-9]+) ([a-f0-9 ]+)/) {
>> - foreach my $parent (split(' ', $parents)) {
>> + if (my ($child, $parents) = $line =~ /^-?([a-f0-9]+)
>> ([a-f0-9 ]
On Thu, Jun 6, 2013 at 3:34 PM, Célestin Matte
wrote:
> - Remove m modifier when useless (m// and // was used randomly; this makes the
> code more coherent)
> - Remove stringy split (split('c', ...) instead of split(/c/, ...))
> - Use {}{} instead of /// when slashes or used inside the regexp so a
On Thu, Jun 6, 2013 at 3:34 PM, Célestin Matte
wrote:
> Fix warnings from perlcritic's level 5 and 4. They correspond to the following
> cases:
> - always end a submodule with a return
> - don't use the constant pragma, use the Readonly module instead
> - some syntax details for maps, and others.
Hi,
On a relatively-empty Intel Core i7 975 @ 3.33GHz (quad-core):
Cns# cd DragonFly/
Cns# time git log sys/sys/sockbuf.h >/dev/null
0.540u 0.140s 0:04.30 15.8% 0+0k 2754+55io 6484pf+0w
Cns# time git log sys/sys/sockbuf.h > /dev/null
0.000u 0.030s 0:00.52 5.7% 0+0k 0+0io 0pf+0w
Cns# tim
Junio C Hamano writes:
> When sorting commits topologically, the primary invariant is to emit
> all children before its parent is emitted. When traversing a forked
s/its/their/;
>> As I needed to have an excuse to push jk/commit-info-slab topic
>> further (I have an unpublished show-branch rew
On Thu, Jun 6, 2013 at 3:34 PM, Célestin Matte
wrote:
> [PATCH 08/18] Explicitely assign local variable as undef and make a proper
> one-instruction-by- line indentation
s/Explicitely/Explicitly/
s/by- /by-/
> Signed-off-by: Célestin Matte
> Signed-off-by: Matthieu Moy
--
To unsubscribe from
SZEDER Gábor writes:
> On Thu, Jun 06, 2013 at 03:41:08PM -0700, Junio C Hamano wrote:
>> * rr/complete-difftool (2013-06-03) 2 commits
>> (merged to 'next' on 2013-06-04 at 01c7611)
>> + completion: clarify ls-tree, archive, show completion
>> + completion: difftool takes both revs and files
On Wed, Jun 5, 2013 at 6:40 PM, Jeff King wrote:
> We cannot create an archive from a blob object, so we would
> not expect anyone to provide one to us. And if they do, we
> will fail anyway just after the reachability check. We can
> therefore optimize our reachability check to ignore blobs
> co
On Thu, Jun 06, 2013 at 03:41:08PM -0700, Junio C Hamano wrote:
> * rr/complete-difftool (2013-06-03) 2 commits
> (merged to 'next' on 2013-06-04 at 01c7611)
> + completion: clarify ls-tree, archive, show completion
> + completion: difftool takes both revs and files
>
> Update command line co
When sorting commits topologically, the primary invariant is to emit
all children before its parent is emitted. 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 wait until
Junio C Hamano writes:
> If you want to do this in a multi-step series (which may not be a
> bad idea), I would imagine that the enum starts as a choice between
> the two: traversal-order vs committer-date-order. The first patch
> would change nothing else.
>
> And then you would add the third c
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-publi
Le 06/06/2013 23:58, Junio C Hamano a écrit :
> Célestin Matte writes:
>
>> So using autodie may not be a good idea.
>> But the problem is that in the current state, open() return values are
>> checked, but print ones are not, although it should be.
>
> I tried "man autodie" and tried to spot 'p
Célestin Matte writes:
> Le 06/06/2013 23:26, Sarma Tangirala a écrit :
>> Hello All,
>>
>> If I did 'git diff HEAD^..HEAD -- file' should git not report some
>> kind of warning if it could not match the file? For example, if 'file'
>> were infact 'dir/file' and 'file' were unique, would it not
Célestin Matte writes:
> So using autodie may not be a good idea.
> But the problem is that in the current state, open() return values are
> checked, but print ones are not, although it should be.
I tried "man autodie" and tried to spot 'print' in the categories
list that shows things like ":all
Le 06/06/2013 23:26, Sarma Tangirala a écrit :
> Hello All,
>
> If I did 'git diff HEAD^..HEAD -- file' should git not report some
> kind of warning if it could not match the file? For example, if 'file'
> were infact 'dir/file' and 'file' were unique, would it not be a good
> idea to report that
Ramkumar Ramachandra wrote:
> Git is probably the _last_ thing
> to be complaining about when it comes to packaging.
It would be nice if contrib/ files supported the usual "make; make
install; make clean" targets. That's missing functionality that does
matter
Le 06/06/2013 23:13, Junio C Hamano a écrit :
> Confused. Which part of this patch moves open inside a do{} block?
> This was last touched by [9/18] but it doesn't do any such thing,
> either.
I must have failed the rebase, as the first part of the commit moved to
[14/18] because it modifies a pa
Hello All,
If I did 'git diff HEAD^..HEAD -- file' should git not report some
kind of warning if it could not match the file? For example, if 'file'
were infact 'dir/file' and 'file' were unique, would it not be a good
idea to report that in the present working directory 'file' were not
found but
On Fri, 7 Jun 2013, Ramkumar Ramachandra wrote:
David Lang wrote:
Perl use may or may not be declining (depending on how you measure it), but
are you really willing to take on the task of re-writing everything that's
in Perl into another language and force all developers of scripts to learn
tha
Célestin Matte writes:
> Placing the open() call inside the do{} struct will automatically close the
> filehandle if possible.
> Placing the close() call outside the do{} struct is useless and will make it
> fail systematically
> Change the error message to state that what fails is a fork(), not
Hey,
yes, the problem is gone at 3684101a654d. Thanks.
Kind regards,
mosu
--
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
Greg Troxel wrote:
> It's not about what I want. It's about making choices that affect other
> people, and trying to find a plan that will be overall reasonable;
> that's the essence of stewardship in packaging. Compiling for just
> myself is far easier.
Have you asked the SBCL or Google-Chrome
On 06/06/2013 01:46 AM, Felipe Contreras wrote:
> On Thu, Jun 6, 2013 at 2:26 AM, demerphq wrote:
>>
>> Good thing you are being objective and leaving out the Python 3.0
>> mess, the long legacy of backwards compatibility in the Perl
>> community, the active community behind it, its extensive port
Johannes Schindelin wrote:
> My initial reaction, too. It was hard enough to get Perl included with Git
> for Windows (because of that pesky Subversion dependency).
Nevertheless, we had to do it, and we did it. We will do it again, if
we get enough important code written in Ruby.
> As you can se
Отправлено с iPhonegmail--
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
David Lang wrote:
> Perl use may or may not be declining (depending on how you measure it), but
> are you really willing to take on the task of re-writing everything that's
> in Perl into another language and force all developers of scripts to learn
> that other language? what's the ROI of this?
L
On Wed, Jun 5, 2013 at 6:13 AM, Michael Haggerty wrote:
>
> But my main point is that I think it would be easier to phase out
> contrib/ if there were a good alternate way of providing visibility to
> "satellite" projects. The relevant Git wiki page [1] is the most likely
> candidate, but it is a
Elliott Cable writes:
>> And update revs->lifo to use that same enum, without adding
>> use_author_date bit to rev_info.
>
> I'll look into replacing lifo with an enum as soon as I can sit back
> down to update this patch. For the moment, nothing more than
> committer_date_sort and author_date_so
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 ff9fd8f..952ddcc 1
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 a6c7de2..cf8dfc8 100755
--- a/contrib/m
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 cf8dfc8..7fbc9
- 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
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl | 20 ++--
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
index 0
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-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
index 7fbc998..ae6dd2e 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 68fd129..a6c7d
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
Placing the open() call inside the do{} struct will automatically close the
filehandle if possible.
Placing the close() call outside the do{} struct is useless and will make it
fail systematically
Change the error message to state that what fails is a fork(), not a file
opening.
Use autodie to prop
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 ae6dd2e..1c34ada 1
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 757a7a3..b
@$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 | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/contrib/mw-to
There is already a global variable called $url. 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(+), 3 deletion
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
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
contrib/mw-to-git/git-remote-mediawiki.perl | 44 ---
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl
b/contrib/mw-to-git/git-remote-mediawiki.perl
- Remove m modifier when useless (m// and // was used randomly; this makes the
code more coherent)
- Remove stringy split (split('c', ...) instead of split(/c/, ...))
- Use {}{} instead of /// when slashes or used inside the regexp so as not to
escape it.
Signed-off-by: Célestin Matte
Signed-off-
Fix warnings from perlcritic's level 5 and 4. They correspond to the following
cases:
- always end a submodule with a return
- don't use the constant pragma, use the Readonly module instead
- some syntax details for maps, and others.
Signed-off-by: Célestin Matte
Signed-off-by: Matthieu Moy
---
Hi,
This series of commits intends to follow most of perlcritic's recommandations
in order to make the code more maintainable and readable.
I followed most recommandations from level 5 (most critical ones )to 2, but
left a great part of the level 1 ones, as they were more about personal choices
of
Wow. That's my bad entirely. I apparently hallucinated a section
suggesting that you “sign-off” commits that you'd reviewed, or
something; and I'd completely skipped the section on certifying that
you have legal rights to the work, because I'd *written* it, and
didn't think it'd be relevant.
I fee
Elliott Cable writes:
> On Tue, Jun 4, 2013 at 3:14 PM, Junio C Hamano wrote:
>> elliottcable writes:
>>> Thus, I've added an --authorship-order version of --date-order, which relies
>>> upon the AUTHOR_DATE instead of the COMMITTER_DATE; this means that old
>>> commits
>>> will continue to sh
Felipe Contreras writes:
> On Thu, Jun 6, 2013 at 1:30 PM, Junio C Hamano wrote:
>> Felipe Contreras writes:
>>
>>> Pretty much what it says on the tin.
>>
>> And a bit more, isn't it?
>>
>> The --keep-redundant-commits option implies the --allow-empty option
>> and it was perfectly acceptable
Felipe Contreras writes:
> On Thu, Jun 6, 2013 at 1:30 PM, Junio C Hamano wrote:
>> Felipe Contreras writes:
>>
>>> Pretty much what it says on the tin.
>>
>> And a bit more, isn't it?
>>
>> The --keep-redundant-commits option implies the --allow-empty option
>> and it was perfectly acceptable
On Tue, Jun 4, 2013 at 3:14 PM, Junio C Hamano wrote:
> elliottcable writes:
>> Thus, I've added an --authorship-order version of --date-order, which relies
>> upon the AUTHOR_DATE instead of the COMMITTER_DATE; this means that old
>> commits
>> will continue to show up chronologically in-order
Felipe Contreras writes:
> As we should.
>
> Signed-off-by: Felipe Contreras
> ---
> sequencer.c | 42 +-
> 1 file changed, 41 insertions(+), 1 deletion(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index 76ff2ff..74480d7 100644
> --- a/sequencer.c
> ++
On Thu, Jun 6, 2013 at 1:30 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> Pretty much what it says on the tin.
>
> And a bit more, isn't it?
>
> The --keep-redundant-commits option implies the --allow-empty option
> and it was perfectly acceptable to give both. By making sure that
>
On Thu, Jun 6, 2013 at 12:21 PM, Junio C Hamano wrote:
> Jeff King writes:
>> If somebody wants to write a note somewhere in the git
>> documentation, that's fine with me, but I'm not clear on exactly
>> what it would even say.
>
> I agree with both points. I can suggest to clarify the log mess
Felipe Contreras writes:
> Pretty much what it says on the tin.
And a bit more, isn't it?
The --keep-redundant-commits option implies the --allow-empty option
and it was perfectly acceptable to give both. By making sure that
only at most one of -k-r-d, -a-e or -s-e is given, this forbids that
On Thu, Jun 6, 2013 at 12:16 PM, Greg Troxel wrote:
>
> Felipe Contreras writes:
>
>> On Thu, Jun 6, 2013 at 9:54 AM, Greg Troxel wrote:
>>>
>>> git is a core tool that people use on almost the smallest of boxes,
>>> perhaps even replacing rcs for managing local config files. On such
>>> machin
Moritz Bunkus writes:
> This used to work until recently, though I'm not sure up to which
> version excatly. I'm on Arch Linux and therefore usually pretty much
> up to date. My current git version is 1.8.3.
Could you test if 'master' at 3684101a654d (Merge branch
'kb/status-ignored-optim-2', 20
On Thu, Jun 6, 2013 at 11:09 AM, David Lang wrote:
> On Thu, 6 Jun 2013, Felipe Contreras wrote:
>
>> In the end my point remains unchanged; Perl is declining, so it would
>> be wise for the future to use another scripting language instead.
>
>
> Perl use may or may not be declining (depending on
Pat Thoyts writes:
> Seems fine to me. I can't test this as I have no access to this
> platform. Possibly you should run this in a catch statement so it can
> ignore any errors and I would tend to use the 'auto_execok' command to
> ensure that osascript actually exists. Something like
>
> set a
On Tue, Jun 4, 2013 at 2:53 PM, Junio C Hamano wrote:
> After reading the subject alone, my reaction was "is this sorting
> commits by the name of the author"?
>
> That is one of the expected natural reactions when people hear about
> this option, which is not what you want.
>
> Perhaps naming it
Jeff King writes:
> Many code paths will free a tree object's buffer and set it
> to NULL after finishing with it in order to keep memory
> usage down during a traversal. However, out of 8 sites that
> do this, only one actually unsets the "parsed" flag back.
> Those sites that don't are setting
On Thu, Jun 06, 2013 at 10:21:47AM -0700, Junio C Hamano wrote:
> > The particular deficiency is that when a signal is raise()d whose SIG_DFL
> > action will cause process death (SIGTERM in this case), the
> > implementation of raise() just calls exit(3).
>
> After a bit of web searching, it seem
Jeff King writes:
> On Wed, Jun 05, 2013 at 12:38:23PM -0400, Jeff King wrote:
>
>> 2. Actually do a reachability check. Doing a full object check to
>> allow fetching an arbitrary tree by sha1 is probably prohibitively
>> expensive[2], but we could allow the form "[:]", check
>>
Jeff King writes:
> On Thu, Jun 06, 2013 at 01:41:05AM -0500, Felipe Contreras wrote:
>
>> > Thanks. I wasn't quite clear on how the signal handling worked on
>> > Windows, but from your description, I agree there is not any point in
>> > running the test at all.
>>
>> Shouldn't we clarify that
Felipe Contreras writes:
> On Thu, Jun 6, 2013 at 9:54 AM, Greg Troxel wrote:
>>
>> git is a core tool that people use on almost the smallest of boxes,
>> perhaps even replacing rcs for managing local config files. On such
>> machines, even perl may be large, but a second scripting language se
On Thu, 6 Jun 2013, Felipe Contreras wrote:
In the end my point remains unchanged; Perl is declining, so it would
be wise for the future to use another scripting language instead.
Perl use may or may not be declining (depending on how you measure it), but are
you really willing to take on the
Pat Thoyts wrote:
> On 6 June 2013 09:17, Stefan Haller wrote:
> > +## On Mac, bring the current Wish process window to front
> > +
> > +if {[tk windowingsystem] eq "aqua"} {
> > + exec osascript -e [format {
> > + tell application "System Events"
> > +
Hi Greg,
On Thu, 6 Jun 2013, Greg Troxel wrote:
> As one of the people who helps maintain git packages in pkgsrc, my
> initial reaction is negative to adding a ruby dependency.
My initial reaction, too. It was hard enough to get Perl included with Git
for Windows (because of that pesky Subversio
1 - 100 of 127 matches
Mail list logo
