From: Junio C Hamano gits...@pobox.com
Sent: Friday, September 14, 2012 3:29 AM
Andrew Ardill andrew.ard...@gmail.com writes:
On 14 September 2012 04:06, Junio C Hamano gits...@pobox.com wrote:
Andrew Ardill andrew.ard...@gmail.com writes:
short-branch-description
long-branch-description
Devin J. Pohly djpo...@gmail.com writes:
From: Devin J. Pohly djpo...@gmail.com
Allow a fetch-style remote helper to issue the notification
ref sha1 name
to specify a ref's value during the fetch operation.
Currently, a remote helper with the fetch capability cannot fetch a
ref unless
In case 'git cherry-pick -s commit' failed, the user had to use 'git
commit -s' (i.e. state the -s option again), which is easy to forget
about. Instead, write the signed-off-by line early, so plain 'git
commit' will have the same result.
Also update 'git commit -s', so that in case there is
Michael J Gruber venit, vidit, dixit 14.09.2012 09:46:
[snipped, just adding]
...and maybe the meaning of (or ...) and *or* isn't what I think it
is either?
--
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
Junio C Hamano venit, vidit, dixit 14.09.2012 01:26:
Junio C Hamano gits...@pobox.com writes:
One possible improvement we can make is to parse the command line in
the last example with --all-match to
[all-match]
(or
pattern_bodybodycommit
(or
pattern_bodybodytag
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
revision.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/revision.c b/revision.c
index 90376e8..fad8040 100644
--- a/revision.c
+++ b/revision.c
@@ -1578,7 +1578,7 @@ static int handle_revision_opt(struct
From: Junio C Hamano gits...@pobox.com
Earlier, when we have both header expression (which has to be an OR
node by construction) and a pattern expression (which could be
anything), we created a top-level OR node that looks like this to
bind them together:
OR
/ \
From: Junio C Hamano gits...@pobox.com
Generally speaking, using more options will further narrow the
selection, but there are a few exceptions. Document them.
Signed-off-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Here are a few typo fixes.
There is a mix of single and back ticks already before this patch,
i.e. ` vs. ' -- I thought we had guidelines for this but don't find them
at the moment.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/rev-list-options.txt | 12
When threaded grep is in effect, the patterns are duplicated and
recompiled for each thread. Avoid --debug output during the
recompilation so that the output is given once instead of 1+nthreads
times.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/grep.c | 1 +
1 file
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7810-grep.sh | 16
1 file changed, 16 insertions(+)
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 180e998..b841909 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -479,6 +479,22 @@ test_expect_success
--all-match is ignored with multiple author options on purpose but
requires all --grep to be matched on some line.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7810-grep.sh | 20
1 file changed, 20 insertions(+)
diff --git a/t/t7810-grep.sh
--all-match is ignored for author matching on purpose.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7810-grep.sh | 8
1 file changed, 8 insertions(+)
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index b841909..be81d96 100755
--- a/t/t7810-grep.sh
+++
The log --grep tests generate the expected out in different ways.
Make them all use command blocks so that subshells are avoided and the
expected output is easier to grasp visually.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7810-grep.sh | 24 ++--
1
Jeff King venit, vidit, dixit 13.09.2012 20:00:
On Thu, Sep 13, 2012 at 10:30:52AM -0700, Junio C Hamano wrote:
But it should not be per-command, but per-message, and
should include all output that is not diagnostic and is not
machine-parseable (e.g., what I mentioned above,
Junio C Hamano venit, vidit, dixit 14.09.2012 07:14:
I sometimes wonder what value the message is giving us.
For example, while reviewing a patch in my Emacs session, I may say
| git am -s3c RETURN
which runs the command on the contents of the e-mail I am reading,
to apply the
On Fri, Sep 14, 2012 at 5:41 PM, Michael J Gruber
g...@drmicha.warpmail.net wrote:
For those proficient in 2 languages it's desirable to switch per project
because it's likely they participate in projects with different $LANG
preferences. Again, that means localizing everything(*).
On Fri, Sep 14, 2012 at 7:11 AM, Jeff King p...@peff.net wrote:
On Thu, Sep 13, 2012 at 02:47:09PM -0700, Junio C Hamano wrote:
I agree that the line is not bright. I do not know if it is worthwhile
or not. I think it will solve some practical problems, but it may also
introduce others.
I must have missed something reading through the documentation for this. git
version 1.7.11.3
$ git check-attr -a -- autorepair.d/AR02_new_rttest.sh
autorepair.d/AR02_new_rttest.sh: ident: set
autorepair.d/AR02_new_rttest.sh: export-subst: set
echo 0..$_expected_tests
diag 'Script Version:
On Thu, Sep 13, 2012 at 5:24 PM, Larry Martell larry.mart...@gmail.com wrote:
I created a dir on my Mac called Rollup, and pushed it out. Then went
to a CentOS box, pulled it, and realized I wanted to call it RollUp
(capital U). I renamed it, and pushed out the change. Went back to the
Mac and
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
On Fri, Sep 14, 2012 at 6:35 PM, Nguyen Thai Ngoc Duy pclo...@gmail.com
wrote:
We should honor LINGUAS variable on installation. Only languages
listed in that variable are installed. Many if not most of projects do
that already.
(Dropping translators as they probably are not interested in this)
I saw a gnu project does this (I don't remember what project). If we
update .po* files with --no-location, we can avoid a lot of diff
noises due to line number changes. A typical translator does not care
about these lines anyway.
Mestnik, Michael J - Eagan, MN - Contractor venit, vidit, dixit
14.09.2012 14:20:
I must have missed something reading through the documentation for this. git
version 1.7.11.3
$ git check-attr -a -- autorepair.d/AR02_new_rttest.sh
autorepair.d/AR02_new_rttest.sh: ident: set
Nguyễn Thái Ngọc Duy venit, vidit, dixit 14.09.2012 14:40:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
On Fri, Sep 14, 2012 at 6:35 PM, Nguyen Thai Ngoc Duy pclo...@gmail.com
wrote:
We should honor LINGUAS variable on installation. Only languages
listed in that variable
On Fri, Sep 14, 2012 at 1:48 PM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
Who guarantees at this point in the codepath that option_branch is
set when option_single_branch is non-zero? Until we talk with the
remote, clone --single-branch without an
On 09/14/2012 02:37 PM, Larry Martell wrote:
On Thu, Sep 13, 2012 at 5:24 PM, Larry Martell larry.mart...@gmail.com
wrote:
I created a dir on my Mac called Rollup, and pushed it out. Then went
to a CentOS box, pulled it, and realized I wanted to call it RollUp
(capital U). I renamed it, and
On Fri, Sep 14, 2012 at 9:48 AM, Andreas Ericsson a...@op5.se wrote:
On 09/14/2012 02:37 PM, Larry Martell wrote:
On Thu, Sep 13, 2012 at 5:24 PM, Larry Martell larry.mart...@gmail.com
wrote:
I created a dir on my Mac called Rollup, and pushed it out. Then went
to a CentOS box, pulled it,
On Fri, Sep 14, 2012 at 3:10 PM, Nguyen Thai Ngoc Duy pclo...@gmail.com wrote:
On Fri, Sep 14, 2012 at 1:48 PM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
Who guarantees at this point in the codepath that option_branch is
set when option_single_branch is
Am 9/14/2012 15:03, schrieb Michael J Gruber:
git replaces $Id$... upon checkout. Any byte sequence that begins
with $Id: and ends with $ in the worktree file is replaced with $Id$
upon check-in.
Now, the there are two problems after you add $Id$ and check-in
(commit):
- commit does not
-Original Message-
From: Johannes Sixt [mailto:j.s...@viscovery.net]
Sent: Friday, September 14, 2012 10:07 AM
To: Michael J Gruber
Cc: Mestnik, Michael J - Eagan, MN - Contractor; git@vger.kernel.org
Subject: Re: Using Format/export-subst Howto.
Am 9/14/2012 15:03, schrieb
Michael J Gruber g...@drmicha.warpmail.net writes:
Junio C Hamano venit, vidit, dixit 14.09.2012 01:26:
...
when --all-match was given from the command line, so that the
committer, author and elements on the top-level backbone in
pattern form the top-level backbone of the resulting
Nguyen Thai Ngoc Duy pclo...@gmail.com writes:
On Fri, Sep 14, 2012 at 1:48 PM, Junio C Hamano gits...@pobox.com wrote:
Alternatively, if you can move the logic to set up this
configuration further down so that it happens after we talked to the
other side and figured out
-Original Message-
From: Johannes Sixt [mailto:j.s...@viscovery.net]
Sent: Friday, September 14, 2012 10:40 AM
To: Mestnik, Michael J - Eagan, MN - Contractor
Cc: Michael J Gruber; git@vger.kernel.org
Subject: Re: Using Format/export-subst Howto.
Am 9/14/2012 17:27, schrieb
For platforms that does not have tput we can still perform coloring
by manually emitting the ANSI control codes. If tput is missing from
$PATH, install a replacement function.
The exact strings has been dumped from a machine that has tput, by
piping the output of tput through 'od -c -An'.
Recent versions of Linux libc (later than 5.4.23) and glibc (2.x)
include a malloc() implementation which is tunable via environment
variables. When MALLOC_CHECK_ is set, a special (less efficient)
implementation is used which is designed to be tolerant against
simple errors, such as double calls
On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund kusmab...@gmail.com wrote:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 78c4286..7d1b34b 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -129,6 +129,20 @@ export _x05 _x40 _z40 LF
# This test checks if command xyzzy does the right
2012/9/14 Erik Faye-Lund kusmab...@gmail.com:
On Fri, Sep 14, 2012 at 6:54 PM, Erik Faye-Lund kusmab...@gmail.com wrote:
On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund kusmab...@gmail.com wrote:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 78c4286..7d1b34b 100644
--- a/t/test-lib.sh
+++
Michael J Gruber g...@drmicha.warpmail.net writes:
From: Junio C Hamano gits...@pobox.com
Our grep allows complex boolean expressions to be formed to match
each individual line with operators like --and, '(', ')' and --not.
Introduce the --debug option to show the parse tree to help people
2012/9/14 Elia Pinto gitter.spi...@gmail.com:
2012/9/14 Erik Faye-Lund kusmab...@gmail.com:
On Fri, Sep 14, 2012 at 6:54 PM, Erik Faye-Lund kusmab...@gmail.com wrote:
On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund kusmab...@gmail.com wrote:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index
On Fri, Sep 14, 2012 at 7:12 PM, Elia Pinto gitter.spi...@gmail.com wrote:
2012/9/14 Elia Pinto gitter.spi...@gmail.com:
2012/9/14 Erik Faye-Lund kusmab...@gmail.com:
On Fri, Sep 14, 2012 at 6:54 PM, Erik Faye-Lund kusmab...@gmail.com wrote:
On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund
Michael J Gruber g...@drmicha.warpmail.net writes:
Here are a few typo fixes.
There is a mix of single and back ticks already before this patch,
i.e. ` vs. ' -- I thought we had guidelines for this but don't find them
at the moment.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
Thanks for an update. Queued with minimum modification.
--
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
Am 14.09.2012 18:58, schrieb Erik Faye-Lund:
tput () {
case $1 in
bold)
- echo -ne \033[1m ;;
+ printf \033[1m ;;
setaf)
- echo -ne \033[0;3$2m ;;
+ printf
Erik Faye-Lund kusmab...@gmail.com writes:
On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund kusmab...@gmail.com wrote:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 78c4286..7d1b34b 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -129,6 +129,20 @@ export _x05 _x40 _z40 LF
# This test
On Fri, Sep 14, 2012 at 7:28 PM, Johannes Sixt j...@kdbg.org wrote:
Am 14.09.2012 18:58, schrieb Erik Faye-Lund:
tput () {
case $1 in
bold)
- echo -ne \033[1m ;;
+ printf \033[1m ;;
setaf)
-
On Fri, Sep 14, 2012 at 7:30 PM, Junio C Hamano gits...@pobox.com wrote:
Erik Faye-Lund kusmab...@gmail.com writes:
On Fri, Sep 14, 2012 at 6:41 PM, Erik Faye-Lund kusmab...@gmail.com wrote:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 78c4286..7d1b34b 100644
--- a/t/test-lib.sh
+++
On Fri, Sep 14, 2012 at 06:41:45PM +0200, Erik Faye-Lund wrote:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 78c4286..7d1b34b 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -129,6 +129,20 @@ export _x05 _x40 _z40 LF
# This test checks if command xyzzy does the right thing...
# '
Elia Pinto gitter.spi...@gmail.com writes:
Recent versions of Linux libc (later than 5.4.23) and glibc (2.x)
include a malloc() implementation which is tunable via environment
variables. When MALLOC_CHECK_ is set, a special (less efficient)
implementation is used which is designed to be
On Fri, Sep 14, 2012 at 7:44 PM, Jeff King p...@peff.net wrote:
On Fri, Sep 14, 2012 at 06:41:45PM +0200, Erik Faye-Lund wrote:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 78c4286..7d1b34b 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -129,6 +129,20 @@ export _x05 _x40 _z40 LF
#
Michael J Gruber g...@drmicha.warpmail.net writes:
--all-match is ignored for author matching on purpose.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
It is more like --all-match is about --grep and does not interact
with --author or --committer at all. At least with the
Michael J Gruber g...@drmicha.warpmail.net writes:
--all-match is ignored with multiple author options on purpose but
requires all --grep to be matched on some line.
It is more like the behaviour of --all-match to tie more than one --grep
used to be broken when --author or --committer is used.
Erik Faye-Lund kusmab...@gmail.com writes:
Neither is which, no?
Oooh, right. Thanks for noticing. So I guess I should try to run it
instead. From the POSIX spec,...
If you assume POSIX.1, there is type.
$ type frotz ; echo $?
frotz is /usr/games/frotz
0
$ type frobnitz ;
After a repo was cloned with the --single-branch
option, the configured refspec looks like
+refs/heads/*:refs/remotes/origin/*.
After fetching from this repo again, it'll receive
all refs instead of just the ref from the single
branch. Fixing this by configure exactly the ref
of the branch the
This adds a diff.context config option to allow specifying
the number of lines of context. This is similar to Mercurial's
'unified' option.
add-context-option
Description: Binary data
Junio C Hamano gits...@pobox.com writes:
Alternatively, if you can move the logic to set up this
configuration further down so that it happens after we talked to the
other side and figured out remote_head_points_at, you could instead
set it up to keep a single remote tracking branch.
Even
Am 14.09.2012 20:11, schrieb Erik Faye-Lund:
On Fri, Sep 14, 2012 at 7:28 PM, Johannes Sixt j...@kdbg.org wrote:
printf '\033[0;3%sm' $2 ;;
Is there a reason for %s rather than %d? It seem it only takes
integers,..
No reason. I just mechanically converted your
From: Junio C Hamano gits...@pobox.com
Sent: Friday, September 14, 2012 5:47 AM
Junio C Hamano gits...@pobox.com writes:
I've played with both and have prepared patches to Reintegrate and
cook (both in the 'todo' branch). Will play with the changes a bit
more and then decide.
So here is how
On Thu, Sep 13, 2012 at 11:10:26PM -0700, Junio C Hamano wrote:
I do not think it is a good idea to allow such a helper to claim that
it supports fetch capability, for at least two reasons:
* Being able to list is essential for fetch based helpers.
think, far from arbitrary.
...
Oh,
Michael J Gruber g...@drmicha.warpmail.net writes:
you need to rm file git checkout file). If the user has to update
$Id$ to match the current sha1
(by remembering to do a more forceful checkout than checkout -f) then
one half of that feature is useless.
As if there is any value in $Id$
Junio C Hamano gits...@pobox.com writes:
Michael J Gruber g...@drmicha.warpmail.net writes:
you need to rm file git checkout file). If the user has to update
$Id$ to match the current sha1
(by remembering to do a more forceful checkout than checkout -f) then
one half of that feature is
On Fri, Sep 14, 2012 at 11:54 PM, Junio C Hamano ju...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
This reverts the i18n part of 7f81463 (Use correct grammar in diffstat
summary line - 2012-02-01) but still keeps the grammar
Dear l10n team members,
New git.pot is generated from v1.7.12-437-g1084f in the master branch.
l10n: Update git.pot (825 new, 24 removed messages)
Generate po/git.pot from v1.7.12-437-g1084f with these i18n update(s):
* i18n: mark more index-pack strings for translation
*
On Sat, Sep 15, 2012 at 8:34 AM, Jiang Xin worldhello@gmail.com wrote:
2012/9/14 Nguyen Thai Ngoc Duy pclo...@gmail.com:
(Dropping translators as they probably are not interested in this)
I saw a gnu project does this (I don't remember what project). If we
update .po* files with
63 matches
Mail list logo
