On 01/30/2013 07:45 PM, Junio C Hamano wrote:
The third round.
- Multi-valued variable transfer.hiderefs lists prefixes of ref
hierarchies to be hidden from the requests coming over the
network.
- A configuration optionally allows uploadpack to accept fetch
requests for an
Hi Michael,
Michael Haggerty wrote:
I would again like to express my discomfort about this feature, which is
already listed as will merge to next. Frankly, I have the feeling
that this feature is being steamrolled in before a community consensus
has been reached and indeed before many valid
Junio C Hamano venit, vidit, dixit 04.02.2013 18:12:
Michael J Gruber g...@drmicha.warpmail.net writes:
Recently and not so recently, we made sure that log/grep type operations
use textconv filters when a userfacing diff would do the same:
ef90ab6 (pickaxe: use textconv for -S counting,
On Wed, Jan 30, 2013 at 10:45:37AM -0800, Junio C Hamano wrote:
Teach upload-pack and receive-pack to omit some refs from their
initial advertisements by paying attention to the transfer.hiderefs
multi-valued configuration variable. Any ref that is under the
hierarchies listed on the value
On Mon, Feb 4, 2013 at 10:22 PM, Junio C Hamano gits...@pobox.com wrote:
Tomas Carnecky tomas.carne...@gmail.com writes:
That's what `git checkout` is for. And I would even argue that it's the
better
choice in your situation because it would delete files from /var/www/foo
which
you have
Junio C Hamano venit, vidit, dixit 04.02.2013 17:36:
Michael J Gruber g...@drmicha.warpmail.net writes:
But diffs are on here (-p), it's just that the default diff option for
merges is to not display them. Well, I admit there's two different ways
of thinking here:
A) git log -p turns on
Can I please unsubscribe from this thing?...
Thanks.
Jakub Suder
On 5 February 2013 05:06, David A. Greene gree...@obbligato.org wrote:
All of the patches I have received from others as well as a few of my
own follow. Probably the most controversial is a patch to remove
--annotate. After
On Wed, Jan 30, 2013 at 10:45:41AM -0800, Junio C Hamano wrote:
Teach git fetch to accept an exact SHA-1 object name the user may
obtain out of band on the LHS of a pathspec, and send it on a want
message when the server side advertises the allow-tip-sha1-in-want
capability.
Hmm. The UI on
On Mon, Feb 04, 2013 at 08:36:43AM -0800, Junio C Hamano wrote:
git log/diff-files -U8 do not need -p to enable textual patches,
for example. It is I already told you that I want 8-line context.
For what else, other than showing textual diff, do you think I told
you that for? and replacing
On Mon, Feb 4, 2013 at 5:36 PM, Junio C Hamano gits...@pobox.com wrote:
git log/diff-files -U8 do not need -p to enable textual patches,
for example. It is I already told you that I want 8-line context.
For what else, other than showing textual diff, do you think I told
you that for? and
On 02/05/2013 09:33 AM, Jonathan Nieder wrote:
Michael Haggerty wrote:
I would again like to express my discomfort about this feature, which is
already listed as will merge to next. Frankly, I have the feeling
that this feature is being steamrolled in before a community consensus
has been
As we all know, git provides `submodule add , init, update, sync, sumary,
foreach, status`, but where is `submodule remove`?
will
I not delete one of them sometime in the future? Although most people
will not use submodule or one who uses it can remove submodule by hand,
providing complete
On Mon, Feb 04, 2013 at 04:27:31PM +0100, Michael J Gruber wrote:
Recently and not so recently, we made sure that log/grep type operations
use textconv filters when a userfacing diff would do the same:
ef90ab6 (pickaxe: use textconv for -S counting, 2012-10-28)
b1c2f57 (diff_grep: use
On Wed, Jan 30, 2013 at 7:45 PM, Junio C Hamano gits...@pobox.com wrote:
The third round.
- Multi-valued variable transfer.hiderefs lists prefixes of ref
hierarchies to be hidden from the requests coming over the
network.
- A configuration optionally allows uploadpack to accept
On Tue, Feb 05, 2013 at 04:19:38AM -0500, Jeff King wrote:
But taking a step back, this really seems quite inferior to an
extension that would allow the client to share its refspecs with the
server. That would solve the bandwidth efficiency problem for normal
fetchers who are
I should have
On Tue, Feb 05, 2013 at 11:16:52AM +0100, Ævar Arnfjörð Bjarmason wrote:
On Mon, Feb 4, 2013 at 5:36 PM, Junio C Hamano gits...@pobox.com wrote:
git log/diff-files -U8 do not need -p to enable textual patches,
for example. It is I already told you that I want 8-line context.
For what
Here's a re-send of the git-subtree patches after rebasing onto
master. Hopefully Junio will have better luck applying these.
-David
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
From: Techlive Zheng techlivezh...@gmail.com
Use %B to format the commit message and body to avoid an extra newline
if a commit only has a subject line.
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
Signed-off-by: David A. Greene gree...@obbligato.org
---
contrib/subtree/git-subtree.sh
From: David A. Greene gree...@obbligato.org
Check refspecs for validity before passing them on to other commands.
This lets us generate more helpful error messages.
Signed-off-by: David A. Greene gree...@obbligato.org
---
contrib/subtree/git-subtree.sh | 12 +---
1 file changed, 9
From: David A. Greene gree...@obbligato.org
Fix the documentation of add to show that a repository can be
specified along with a commit.
Suggested by Yann Dirson dir...@bertin.fr.
Signed-off-by: David A. Greene gree...@obbligato.org
---
contrib/subtree/git-subtree.sh |6 ++
From: Jesper L. Nielsen lya...@gmail.com
Before install git-subtree documentation, make sure the manpage
directory exists.
Signed-off-by: Jesper L. Nielsen lya...@gmail.com
Signed-off-by: David A. Greene gree...@obbligato.org
---
contrib/subtree/Makefile |1 +
1 file changed, 1 insertion(+)
From: Techlive Zheng techlivezh...@gmail.com
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
Signed-off-by: David A. Greene gree...@obbligato.org
---
contrib/subtree/.gitignore |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/contrib/subtree/.gitignore
From: Techlive Zheng techlivezh...@gmail.com
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
Signed-off-by: David A. Greene gree...@obbligato.org
---
contrib/subtree/git-subtree.sh |2 ++
contrib/subtree/t/t7900-subtree.sh |2 ++
2 files changed, 4 insertions(+)
diff --git
From: Techlive Zheng techlivezh...@gmail.com
Previous code does not fulfill Git's whitespace policy.
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
Signed-off-by: David A. Greene gree...@obbligato.org
---
contrib/subtree/git-subtree.sh | 68
contrib/subtree/git-subtree.txt
From: Adam Tkac at...@redhat.com
Teach git-subtree's Makefile to honor DESTDIR.
Signed-off-by: Adam Tkac at...@redhat.com
Signed-off-by: David A. Greene gree...@obbligato.org
---
contrib/subtree/Makefile |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
David A. Greene gree...@obbligato.org writes:
Here's a re-send of the git-subtree patches after rebasing onto
master. Hopefully Junio will have better luck applying these.
Damn. Sorry, I sent this before getting all of the feedback. Just
ignore this sequence and I'll send a fixed version in
From: David A. Greene gree...@obbligato.org
Remove --annotate. This obviates the need for an --unannotate
command. We really want a more generalized commit message rewrite
mechanism.
Signed-off-by: David A. Greene gree...@obbligato.org
---
contrib/subtree/git-subtree.sh |6 +
From: Techlive Zheng techlivezh...@gmail.com
'git subtree merge' will fail if the argument of '--prefix' has a slash
appended.
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
Signed-off-by: David A. Greene gree...@obbligato.org
---
contrib/subtree/git-subtree.sh |2 +-
From: Techlive Zheng techlivezh...@gmail.com
Mostly prepare for the later tests refactoring.
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
Signed-off-by: David A. Greene gree...@obbligato.org
---
contrib/subtree/t/t7900-subtree.sh | 270 ++--
1 file
From: Techlive Zheng techlivezh...@gmail.com
Signed-off-by: Techlive Zheng techlivezh...@gmail.com
Signed-off-by: David A. Greene gree...@obbligato.org
---
contrib/subtree/t/t7900-subtree.sh | 871 +---
1 file changed, 613 insertions(+), 258 deletions(-)
diff
On Tue, Feb 05, 2013 at 03:40:32PM +0800, Jiang Xin wrote:
Command usage would not align well if command options are translated,
especially to CJK. Call utf8_strwidth in function usage_argh, so that
the caller will get correct column width.
Yeah, I just noticed a misalignment in Vietnamese
On Tue, Feb 5, 2013 at 1:38 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Missing description. Stealing from the link you sent:
The typical use-case is starting a rebase, do something else, come
back
the day after, run git status or make a new commit and wonder what
On Tue, Feb 5, 2013 at 6:44 AM, gree...@obbligato.org wrote:
Junio C Hamano gits...@pobox.com writes:
Remove --annotate. This obviates the need for an --unannotate
command. We really want a more generalized commit message rewrite
mechanism.
That may be a good goal as the end result, but
gree...@obbligato.org writes:
Junio C Hamano gits...@pobox.com writes:
David A. Greene gree...@obbligato.org writes:
+test_create_commit() (
+ repo=$1
+ commit=$2
+ cd $repo
+ mkdir -p $(dirname $commit)
+ echo $commit $commit
Style.
I need a little more explanation. :)
Jeff King p...@peff.net writes:
On Wed, Jan 30, 2013 at 10:45:37AM -0800, Junio C Hamano wrote:
Teach upload-pack and receive-pack to omit some refs from their
initial advertisements by paying attention to the transfer.hiderefs
multi-valued configuration variable. Any ref that is under the
Jeff King p...@peff.net writes:
git log --cc --stat
the --cc is significant. So I don't think it is right for --cc to
always imply -p. But if the rule kicked in only when no other format
had been specified, that might make sense.
Yes, it was my mistake that I left it unsaid. Obviously
Ævar Arnfjörð Bjarmason ava...@gmail.com writes:
On a related note then, it's a bit confusing that it's called
--full-diff when it doesn't actually show a diff.
It is too late to change the name of the option, but we could add a
synonym if it makes easier to understand what the option is for.
Jeff King p...@peff.net writes:
On Wed, Jan 30, 2013 at 10:45:41AM -0800, Junio C Hamano wrote:
Teach git fetch to accept an exact SHA-1 object name the user may
obtain out of band on the LHS of a pathspec, and send it on a want
message when the server side advertises the
Ævar Arnfjörð Bjarmason ava...@gmail.com writes:
Do you have any plans for something that *does* have the reduction of
network bandwidth as a primary goal?
Uncluttering gives reduction of bandwidth anyway, so I do not see
much point in the distinction you seem to be making.
Is this what
Ted Zlatanov t...@lifelogs.com writes:
On Mon, 04 Feb 2013 16:15:47 -0800 Junio C Hamano gits...@pobox.com wrote:
JCH Ted Zlatanov t...@lifelogs.com writes:
- do you want to support backslashed newlines?
JCH What for? netrc/authinfo is not a line oriented file format at all,
JCH and
On Fri, Jan 25, 2013 at 9:23 PM, Brandon Casey draf...@gmail.com wrote:
On Wed, Jan 23, 2013 at 12:36 PM, Junio C Hamano gits...@pobox.com wrote:
Sverre Rabbelier srabbel...@gmail.com writes:
On Wed, Jan 23, 2013 at 11:47 AM, John Keeping j...@keeping.me.uk wrote:
When did we last revisit
Duy Nguyen pclo...@gmail.com writes:
On Tue, Feb 5, 2013 at 7:15 PM, Duy Nguyen pclo...@gmail.com wrote:
+ fprintf(outfile, sb.buf);
Use fputs instead. I looked up fputs man page but somehow still left
fprintf there.
Once the streams of oops that was wrong comments are done, I'd
Ted Zlatanov t...@lifelogs.com writes:
+# build reverse token map
+my %rmap;
+foreach my $k (keys %{$options{tmap}}) {
+ push @{$rmap{$options{tmap}-{$k}}}, $k;
+}
Mental note: $rmap{foo} -eq 'bar' means that what Git calls 'bar'
is found as 'foo' in the netrc/authinfo file. Keys in
Junio C Hamano gits...@pobox.com writes:
I thought I've given a more concrete outline than I'll read
Net::Netrc and do whatever I think it does in a separate message.
And it turns out that the message was sitting in my outbox. Sorry.
I just told the outbox to send it out.
--
To unsubscribe
Command usage would not align well if command options are translated,
especially to CJK. Call utf8_strwidth in function usage_argh, so that
the caller will get correct column width.
Signed-off-by: Jiang Xin worldhello@gmail.com
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Signed-off-by: Jiang Xin worldhello@gmail.com
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
parse-options.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/parse-options.c b/parse-options.c
index cd029f..be916 100644
--- a/parse-options.c
+++
Jeff King venit, vidit, dixit 05.02.2013 12:13:
On Mon, Feb 04, 2013 at 04:27:31PM +0100, Michael J Gruber wrote:
Recently and not so recently, we made sure that log/grep type operations
use textconv filters when a userfacing diff would do the same:
ef90ab6 (pickaxe: use textconv for -S
Duy Nguyen pclo...@gmail.com writes:
On Tue, Feb 5, 2013 at 1:38 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Missing description. Stealing from the link you sent:
The typical use-case is starting a rebase, do something else, come
back
the day after, run git status or
On Tue, 05 Feb 2013 08:15:48 -0800 Junio C Hamano gits...@pobox.com wrote:
JCH Ted Zlatanov t...@lifelogs.com writes:
+# build reverse token map
+my %rmap;
+foreach my $k (keys %{$options{tmap}}) {
+push @{$rmap{$options{tmap}-{$k}}}, $k;
+}
JCH Mental note: $rmap{foo} -eq 'bar' means
I have found a situation where git log produces (apparently)
endless output. Presumably this is a bug. Following is a (Linux)
script that reliably reproduces the error for me (on Fedora 16):
--
set -ve
# Print the git version.
git --version
# Create respository.
rm -rf .git
git init
Jiang Xin worldhello@gmail.com writes:
Signed-off-by: Jiang Xin worldhello@gmail.com
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
parse-options.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/parse-options.c b/parse-options.c
index
Michael Haggerty mhag...@alum.mit.edu writes:
I would again like to express my discomfort about this feature, which is
already listed as will merge to next.
Do not take will merge to next too literally. One major purpose
of marking a topic as such is exactly to solicit comments like this
;-)
Jonathan Nieder jrnie...@gmail.com writes:
* I didn't see a response to Peff's convincing arguments that this
should be a client-side feature rather than a server-side feature [1].
The client can't control the size of the ref advertisement. That is
the main motivation if I understood
Michael Haggerty mhag...@alum.mit.edu writes:
On 02/05/2013 09:33 AM, Jonathan Nieder wrote:
Michael Haggerty wrote:
I would again like to express my discomfort about this feature, which is
already listed as will merge to next. Frankly, I have the feeling
that this feature is being
wor...@alum.mit.edu (Dale R. Worley) writes:
I have found a situation where git log produces (apparently)
endless output. Presumably this is a bug. Following is a (Linux)
script that reliably reproduces the error for me (on Fedora 16):
Wasn't this fixed at v1.8.1.1~13 or is this a different
Changes since PATCHv3:
- simple tests in Makefile
- support multiple files, code refactored
- documentation and comments updated
- fix IO::File for GPG pipe
- exit peacefully in almost every situation, die on bad invocation or query
- use log_verbose() and -v for logging for the user
- use
Junio C Hamano gits...@pobox.com writes:
We could read from the payload part of the patch to learn the full
object name of the commit, but the primary user git rebase has
been fixed to give us a full object name, so this should suffice
for now.
And the patch on top to do so looks like this.
Ted Zlatanov t...@lifelogs.com writes:
JCH Oh, another thing. 'default' is like 'machine' followed by any
JCH machine name, so the above while loop that reads two tokens
JCH pair-wise needs to be aware that 'default' is not followed by a
JCH value. I think the loop will fail to parse this:
Ted Zlatanov t...@lifelogs.com writes:
Changes since PATCHv3:
- simple tests in Makefile
- support multiple files, code refactored
- documentation and comments updated
- fix IO::File for GPG pipe
- exit peacefully in almost every situation, die on bad invocation or query
- use
On Tue, 05 Feb 2013 11:47:56 -0800 Junio C Hamano gits...@pobox.com wrote:
JCH Ted Zlatanov t...@lifelogs.com writes:
JCH Oh, another thing. 'default' is like 'machine' followed by any
JCH machine name, so the above while loop that reads two tokens
JCH pair-wise needs to be aware that 'default'
On Tue, Feb 5, 2013 at 5:03 PM, Junio C Hamano gits...@pobox.com wrote:
Ævar Arnfjörð Bjarmason ava...@gmail.com writes:
Do you have any plans for something that *does* have the reduction of
network bandwidth as a primary goal?
Uncluttering gives reduction of bandwidth anyway, so I do not
On Tue, Feb 05, 2013 at 05:21:18PM +0100, Michael J Gruber wrote:
Thanks Jeff, that helps a lot! It covers grep expr and grep expr rev
-- path just fine. I'll look into grep expr rev:path which does not
work yet because of an empty driver.
I also have show --textconv covered and a
Ted Zlatanov t...@lifelogs.com writes:
JCH You still need to parse a file that has a default entry correctly;
JCH otherwise the users won't be able to share existing .netrc files
JCH with other applications e.g. ftp, which is the whole point of this
JCH series. Not using values from the
Signed-off-by: John Keeping j...@keeping.me.uk
---
On Sun, Feb 03, 2013 at 04:24:52PM -0800, Junio C Hamano wrote:
Ideally it should also have test cases
to show git diff --cc --raw blob1 blob2...blob$n for n=4 and n=40
(or any two values clearly below and above the
On 27.01.13 18:34, Junio C Hamano wrote:
Torsten Bögershausen tbo...@web.de writes:
Back to the which:
...
and running make test gives the following, at least in my system:
...
I think everybody involved in this discussion already knows that;
the point is that it can easily give false
On Tue, 05 Feb 2013 11:53:20 -0800 Junio C Hamano gits...@pobox.com wrote:
JCH Ted Zlatanov t...@lifelogs.com writes:
Changes since PATCHv3:
- simple tests in Makefile
- support multiple files, code refactored
- documentation and comments updated
- fix IO::File for GPG pipe
- exit
John Keeping j...@keeping.me.uk writes:
Signed-off-by: John Keeping j...@keeping.me.uk
---
...
diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh
index 40277c7..a0701bc 100755
--- a/t/t4038-diff-combined.sh
+++ b/t/t4038-diff-combined.sh
@@ -89,4 +89,33 @@
Torsten Bögershausen tbo...@web.de writes:
Thanks for the detailed suggestion.
Instead of using a file for putting out non portable syntax,
can we can use a similar logic as test_failure ?
Your test_bad_syntax_ function can be called from a subshell, and
its exit 1 will not exit, no?
Add Git credential helper that can parse netrc/authinfo files.
This credential helper support multiple files, returning the first one
that matches. It checks file permissions and owner. For *.gpg files,
it will run GPG to decrypt the file.
Signed-off-by: Ted Zlatanov t...@lifelogs.com
---
Junio C Hamano gits...@pobox.com writes:
wor...@alum.mit.edu (Dale R. Worley) writes:
I have found a situation where git log produces (apparently)
endless output. Presumably this is a bug. Following is a (Linux)
script that reliably reproduces the error for me (on Fedora 16):
Wasn't this
Signed-off-by: John Keeping j...@keeping.me.uk
---
Changes since v1:
- more spaces around '|'
- create trees with line feeds and use 'sed -e 4q'
---
t/t4038-diff-combined.sh | 24
1 file changed, 24 insertions(+)
diff --git a/t/t4038-diff-combined.sh
Junio C Hamano gits...@pobox.com writes:
Torsten Bögershausen tbo...@web.de writes:
Thanks for the detailed suggestion.
Instead of using a file for putting out non portable syntax,
can we can use a similar logic as test_failure ?
Your test_bad_syntax_ function can be called from a
Ted Zlatanov t...@lifelogs.com writes:
On Tue, 05 Feb 2013 11:53:20 -0800 Junio C Hamano gits...@pobox.com wrote:
I think it's more readable with large loops, and it actually makes sense
when you read the code. Not a big deal to me either, I just felt for
this particular script it was OK.
Thanks.
--
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
Constantine A. Murenin muren...@gmail.com writes:
I have two distinct trees that were not managed by any RCS, and I'd
like to import them into a single repository into two separate orphan
branches, then make sense of what's in there, merge, and unify into
'master'.
(To give some context,
Jeff King p...@peff.net writes:
On Tue, Jan 29, 2013 at 11:53:19AM -0800, Junio C Hamano wrote:
Either way it still encourages a plaintext password to be on disk,
which may not be what we want, even though it may be slight if not
really much of an improvement. Again the Help-for-users has
This looks to be of mixed quality. The earlier ones look fairly
finished, while the later ones not so much.
I am tempted to take up to 06/13 and advance them to 'next', without
the rest.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Junio C Hamano gits...@pobox.com writes:
Otherwise, looks almost ready to me.
For now, I've queued this as a minimum fix-up on top of your patch
and pushed the result out. It is an equivalent of the previous
review comments in a patch form. Please review and incorporate in
your reroll as
2013/2/6 Junio C Hamano gits...@pobox.com:
I somehow suspect that this is going in a direction that makes this
piece of code much less maintainable.
Look at the entire function and see how many places you do fprintf
on strings that are marked with _(). short_name and long_name are
not
On 5 February 2013 14:29, Junio C Hamano gits...@pobox.com wrote:
Constantine A. Murenin muren...@gmail.com writes:
I have two distinct trees that were not managed by any RCS, and I'd
like to import them into a single repository into two separate orphan
branches, then make sense of what's in
Add Git credential helper that can parse netrc/authinfo files.
This credential helper supports multiple files, returning the first one
that matches. It checks file permissions and owner. For *.gpg files,
it will run GPG to decrypt the file.
Signed-off-by: Ted Zlatanov t...@lifelogs.com
---
Since command usages can be translated, they may not align well especially
when they are translated to CJK. A wrapper utf8_fprintf can help to return
the correct columns required.
Signed-off-by: Jiang Xin worldhello@gmail.com
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Jiang Xin worldhello@gmail.com writes:
2013/2/6 Junio C Hamano gits...@pobox.com:
I somehow suspect that this is going in a direction that makes this
piece of code much less maintainable.
Look at the entire function and see how many places you do fprintf
on strings that are marked with
2013/2/6 Junio C Hamano gits...@pobox.com:
Jiang Xin worldhello@gmail.com writes:
I agree, a helper named 'utf8_fprintf' in utf8.c is better.
I will send a patch latter.
Yeah, the idea of a helper function I agree with; I am not thrilled
with the name utf8_fprintf() though. People use
Jiang Xin worldhello@gmail.com writes:
2013/2/6 Junio C Hamano gits...@pobox.com:
Jiang Xin worldhello@gmail.com writes:
I agree, a helper named 'utf8_fprintf' in utf8.c is better.
I will send a patch latter.
Yeah, the idea of a helper function I agree with; I am not thrilled
with
85 matches
Mail list logo
