* add remote branch permanently
From: JuanPablo AJ @ 2011-08-07 19:44 UTC (permalink / raw)
To: git
Hi,
when I add a remote branch
$ git remote add otherUser git_repo_url
this is added locally configuration, how I can add this remote
branches configuration permanently similar to submodules ?
Regards.
^ permalink raw reply
* Re: [PATCH v2 4/4] upload-archive: use start_command instead of fork
From: Johannes Sixt @ 2011-08-07 20:02 UTC (permalink / raw)
To: René Scharfe; +Cc: Jeff King, Erik Faye-Lund, Junio C Hamano, git
In-Reply-To: <4E3D0C1D.9000807@lsrfire.ath.cx>
Am 06.08.2011 11:40, schrieb René Scharfe:
> So here's an ugly patch to implement an internal passthrough filter to
> avoid newline conversions. It makes the tar filter command (gzip etc.)
> write to a pipe instead of directly to a file.
*If* we are working around the CRLF conversion issue in git itself,
wouldn't it be much simpler to just:
diff --git a/archive-tar.c b/archive-tar.c
index 20af005..da3d98a 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -364,9 +364,9 @@ void init_tar_archiver(void)
int i;
register_archiver(&tar_archiver);
- tar_filter_config("tar.tgz.command", "gzip -cn", NULL);
+ tar_filter_config("tar.tgz.command", "gzip -cn | cat", NULL);
tar_filter_config("tar.tgz.remote", "true", NULL);
- tar_filter_config("tar.tar.gz.command", "gzip -cn", NULL);
+ tar_filter_config("tar.tar.gz.command", "gzip -cn | cat", NULL);
tar_filter_config("tar.tar.gz.remote", "true", NULL);
git_config(git_tar_config, NULL);
for (i = 0; i < nr_tar_filters; i++) {
(provided that 'cat' magically does not suffer from the same problem,
and I do think that it does not.)
Anyway, I think it would be better to address the problem on the msysgit
side. Perhaps by providing a gzip of a different vintage (e.g. a
self-compiled one) that does not suffer from the CRLF conversion issue.
-- Hannes
^ permalink raw reply related
* Suppressing auto-cc for specific addresses
From: Daniel Mack @ 2011-08-07 20:20 UTC (permalink / raw)
To: git; +Cc: Greg Kroah-Hartman
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
Hi,
I'm looking for a way to suppress certain Cc: fields that are normally
automatically added for addresses mentioned in Cc: lines found in patches.
In particular, the kernel rules for marking patches for stable release
inclusion wants users to add a "Cc: stable@kernel.org" line in the patch
itself but to not actually send a copy of that patch to that address. It
will be picked automatically once the patch was applied upstream.
I couldn't find a proper way to do that with git send-email, so I dare
to come up with a patch proposal. Is that acceptable or is there any
better way (which I'm not aware about) to achive this?
Thanks,
Daniel
[-- Attachment #2: 0001-send-email-Allow-email-addresses-and-domains-as-supp.patch --]
[-- Type: text/plain, Size: 2899 bytes --]
From f1a17a4fbc0373283696cb560afff3afa05c2e8f Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Sun, 7 Aug 2011 22:16:00 +0200
Subject: [PATCH] send-email: Allow email addresses and domains as
--suppress-cc options
Signed-off-by: Daniel Mack <zonque@gmail.com>
---
Documentation/git-send-email.txt | 10 +++++++---
git-send-email.perl | 12 +++++++++++-
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 327233c..5966abb 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -233,9 +233,9 @@ Automating
cc list. Default is the value of 'sendemail.signedoffbycc' configuration
value; if that is unspecified, default to --signed-off-by-cc.
---suppress-cc=<category>::
- Specify an additional category of recipients to suppress the
- auto-cc of:
+--suppress-cc=<category|address|domain>::
+ Specify an additional category, email address or domain of recipients
+ to suppress the auto-cc for. Possible categories are:
+
--
- 'author' will avoid including the patch author
@@ -251,6 +251,10 @@ Automating
- 'all' will suppress all auto cc values.
--
+
+If a full email address is given, auto-cc will be suppressed for this particular
+address. This also works for entire domains if the parameter starts with the '@'
+sign. All email addresses in that domain will hence be ignored by auto-cc.
++
Default is the value of 'sendemail.suppresscc' configuration value; if
that is unspecified, default to 'self' if --suppress-from is
specified, as well as 'body' if --no-signed-off-cc is specified.
diff --git a/git-send-email.perl b/git-send-email.perl
index 98ab33a..22813e5 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -374,7 +374,7 @@ my(%suppress_cc);
if (@suppress_cc) {
foreach my $entry (@suppress_cc) {
die "Unknown --suppress-cc field: '$entry'\n"
- unless $entry =~ /^(?:all|cccmd|cc|author|self|sob|body|bodycc)$/;
+ unless $entry =~ /^(?:all|cccmd|cc|author|self|sob|body|bodycc|.*@.*)$/;
$suppress_cc{$entry} = 1;
}
}
@@ -1213,6 +1213,11 @@ foreach my $t (@files) {
} else {
next if ($suppress_cc{'cc'});
}
+ next if ($suppress_cc{$addr});
+ if ($addr =~ /^(.+)(@.+)$/) {
+ my $domain = $2;
+ next if $suppress_cc{$domain};
+ }
printf("(mbox) Adding cc: %s from line '%s'\n",
$addr, $_) unless $quiet;
push @cc, $addr;
@@ -1261,6 +1266,11 @@ foreach my $t (@files) {
next if $suppress_cc{'sob'} and $what =~ /Signed-off-by/i;
next if $suppress_cc{'bodycc'} and $what =~ /Cc/i;
}
+ next if ($suppress_cc{$c});
+ if ($c =~ /^(.+)(@.+)$/) {
+ my $domain = $2;
+ next if $suppress_cc{$domain};
+ }
push @cc, $c;
printf("(body) Adding cc: %s from line '%s'\n",
$c, $_) unless $quiet;
--
1.7.6
^ permalink raw reply related
* Re: [PATCH v2 4/4] upload-archive: use start_command instead of fork
From: Jeff King @ 2011-08-07 21:06 UTC (permalink / raw)
To: Johannes Sixt; +Cc: René Scharfe, Erik Faye-Lund, Junio C Hamano, git
In-Reply-To: <4E3EEF3B.80908@kdbg.org>
On Sun, Aug 07, 2011 at 10:02:03PM +0200, Johannes Sixt wrote:
> Am 06.08.2011 11:40, schrieb René Scharfe:
> > So here's an ugly patch to implement an internal passthrough filter to
> > avoid newline conversions. It makes the tar filter command (gzip etc.)
> > write to a pipe instead of directly to a file.
>
> *If* we are working around the CRLF conversion issue in git itself,
> wouldn't it be much simpler to just:
>
> diff --git a/archive-tar.c b/archive-tar.c
> index 20af005..da3d98a 100644
> --- a/archive-tar.c
> +++ b/archive-tar.c
> @@ -364,9 +364,9 @@ void init_tar_archiver(void)
> int i;
> register_archiver(&tar_archiver);
>
> - tar_filter_config("tar.tgz.command", "gzip -cn", NULL);
> + tar_filter_config("tar.tgz.command", "gzip -cn | cat", NULL);
> tar_filter_config("tar.tgz.remote", "true", NULL);
> - tar_filter_config("tar.tar.gz.command", "gzip -cn", NULL);
> + tar_filter_config("tar.tar.gz.command", "gzip -cn | cat", NULL);
> tar_filter_config("tar.tar.gz.remote", "true", NULL);
> git_config(git_tar_config, NULL);
> for (i = 0; i < nr_tar_filters; i++) {
>
> (provided that 'cat' magically does not suffer from the same problem,
> and I do think that it does not.)
I like that much better, but assumed cat was broken. It might be better
still to have a GZIP_FILTER variable in the Makefile. That would let
msysgit do this, but would also let people with a funny path to gzip
define it at build time (they could also just reconfigure it, of course,
but it is nice to work out of the box on odd platforms).
> Anyway, I think it would be better to address the problem on the msysgit
> side. Perhaps by providing a gzip of a different vintage (e.g. a
> self-compiled one) that does not suffer from the CRLF conversion issue.
Yeah, that would make me happy, too. :)
-Peff
^ permalink raw reply
* A little help with error?
From: Rusty Dog Ink @ 2011-08-07 21:16 UTC (permalink / raw)
To: git
This command.
git add --force /Users/chris/Sites/mattSchubert/public/css/browserfix.css => "Crappy Error"
Yields this error.
fatal: '/Users/chris/Sites/mattSchubert/public/css/browserfix.css' is outside repository
This command does gives the same error.
git add --force /public/css/browserfix.css => "Same error"
But this command, works. Why?
git add --force public/css/browserfix.css => "Works yeah"
This is an issue since Gitbox my graphical client uses full paths for it's commands. This began happening after I use the "bundle install" command after adding 'dm-postgres-adapter' to my gem file. Ideas on fixing this?
--
Chris
Sent with Sparrow (http://www.sparrowmailapp.com)
^ permalink raw reply
* Re: Suppressing auto-cc for specific addresses
From: Greg KH @ 2011-08-07 23:46 UTC (permalink / raw)
To: Daniel Mack; +Cc: git
In-Reply-To: <4E3EF38A.9010307@gmail.com>
On Sun, Aug 07, 2011 at 10:20:26PM +0200, Daniel Mack wrote:
> Hi,
>
> I'm looking for a way to suppress certain Cc: fields that are
> normally automatically added for addresses mentioned in Cc: lines
> found in patches.
>
> In particular, the kernel rules for marking patches for stable
> release inclusion wants users to add a "Cc: stable@kernel.org" line
> in the patch itself but to not actually send a copy of that patch to
> that address. It will be picked automatically once the patch was
> applied upstream.
There is no "rule" that says you can not send a copy of the patch to
stable@kernel.org, in fact that happens a lot and is fine and I have no
problem with that at all.
So please don't feel that you have to do anything different here with
git to properly follow the stable kernel rules, there should not be any
need.
thanks,
greg k-h
^ permalink raw reply
* HELP!! "git push"error!
From: Baoyin @ 2011-08-08 1:05 UTC (permalink / raw)
To: git
Hi, all
Git reports error when I did "git push", following is part of error message:
error: packfile ./objects/pack/
pack-54b383e85f2e93a2c2ed4bf439808ecebd23986a.pack cannot be accessed
error: packfile ./objects/pack/pack-
a2105c2321aaf311826fe8148d56528536a3e38a.pack cannot be accessed
error: refs/changes/87/6687/1 does not point to a valid object!
error: packfile ./objects/pack/pack-
ce47b0d7b5fba35cc7764bfce061e673a401d775.pack cannot be accessed
error: refs/changes/87/7987/3 does not point to a valid object!
error: packfile ./objects/pack/
pack-25c5e425895d1f9333aa02a1ee0050de4ede5189.pack cannot be accessed
error: refs/changes/87/8687/1 does not point to a valid object!
error: packfile ./objects/pack/
pack-6eaaf27b51be41b1301a0e921d6609d05304d9a3.pack cannot be accessed
error: refs/changes/87/8987/1 does not point to a valid object!
error: packfile ./objects/pack/
pack-2064289922b9f0f403262adb94ad932c2684639c.pack cannot be accessed
error: refs/changes/87/8987/2 does not point to a valid object!
...........
some error messages show that "error: refs/changes/87/8987/1 does not point to
a valid object! ", but refs/changes/87/8987/1 dose point to a valid commit
"3cbba537".
Then I did "git show 3cbba537", result is ok, no error.
I don't know why there is conflict.
I also did "git fsck" on git server, git reports errors too, following is part
of error message:
error: packfile ./objects/pack/pack-
d8c9cd1bdfdd458b7a53977c3544a54a26de8d30.pack cannot be accessed
missing tree e2aa6890223d9cc186b53764752bc3531650aa1f
error: packfile ./objects/pack/
pack-29df930a4d5cae218ecd1a1bed6b1a662dec3253.pack cannot be accessed
error: packfile ./objects/pack/pack-
d8c9cd1bdfdd458b7a53977c3544a54a26de8d30.pack cannot be accessed
broken link from commit 1fad8edbaf7651e924681550da36e29419910c00
to tree e2aa6890223d9cc186b53764752bc3531650aa1f
error: packfile ./objects/pack/pack-
f62ed9d45bd82e735758a2fa750e2432734383e5.pack cannot be accessed
missing tree 53ad32be22811bf4c351b3ec911905bbda016346
error: packfile ./objects/pack/pack-
f0724f223ec7d0501dcb9d350304e893ec06fb4b.pack cannot be accessed
error: packfile ./objects/pack/pack-
d17aa5efdbed08d0a59ceefc942e31d43694dfb4.pack cannot be accessed
error: packfile ./objects/pack/
pack-04644913e5cb6c9663e54c9e7fd4385182a87b15.pack cannot be accessed
missing tree 6eaf3d97dbd2ce915c9b3ba83d9810e052016b6b
error: packfile ./objects/pack/pack-
ac7c3cd6124f4329159da2358690d34ff0182bbc.pack cannot be accessed
missing tree d3b0de15d4ff4484195ec7342a1ffdb3ba6ddfc0
dangling tree 03b18cf447ca33bd2d8a3ff765db03a469c0007c
error: packfile ./objects/pack/
pack-63e3e1673dc7d59c5ff90615fbf82f10512284e4.pack cannot be accessed
missing tree 25b1d39e3736ca5a2ea9b766b549c615a8d19f84
error message shows that some objects missing, but they do exist. what's the
problem?????
PS. merge patches by gerrit is work, I just can not "git push" to remote
repository directly. it's takes me too much time to maintain four branches
by cherry-pick each patch to local, use “git-commit --amend” to modify and push
to gerrit again.
^ permalink raw reply
* [PATCH/RFC 0/2] test_when_finished and returning early
From: Jonathan Nieder @ 2011-08-08 1:13 UTC (permalink / raw)
To: git
Cc: Michael J Gruber, Junio C Hamano, Jeff King,
Ævar Arnfjörð Bjarmason
In-Reply-To: <20110324082108.GA30196@elie>
Jonathan Nieder wrote:
> The use of "return" was surprising. It seems this style has been
> intended to work ever since v0.99.5~24^2~4 (Trapping exit in tests,
> using return for errors, 2005-08-10).
>
> It interacts poorly with test_when_finished but since these tests do
> not use that function, they should be safe. test_when_finished could
> use some fixes to avoid future surprises but that's another story.
The above was about some code that looks like this:
| for i in 1 2 3 4 5 6 7 8 9 10 11
| do
| git checkout -b root$i five || return
The fixes alluded to might go something like this. Thoughts?
Jonathan Nieder (2):
test: simplify return value of test_run_
test: cope better with use of return for errors
t/test-lib.sh | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
^ permalink raw reply
* [PATCH 1/2] test: simplify return value of test_run_
From: Jonathan Nieder @ 2011-08-08 1:15 UTC (permalink / raw)
To: git
Cc: Michael J Gruber, Junio C Hamano, Jeff King,
Ævar Arnfjörð Bjarmason
In-Reply-To: <20110808011341.GA19551@elie.gateway.2wire.net>
As v0.99.5~24^2~4 (Trapping exit in tests, using return for errors,
2005-08-10) explains, callers to test_run_ (such as test_expect_code)
used to check the result from eval and the return value separately so
tests that fail early could be distinguished from tests that completed
normally with successful (nonzero) status. Eventually tests that
succeed with nonzero status were phased out (see v1.7.4-rc0~65^2~19,
2010-10-03 and especially v1.5.5-rc0~271, 2008-02-01) but the weird
two-return-value calling convention lives on.
Let's get rid of it. The new rule: test_run_ succeeds (returns 0)
if and only if the test succeeded.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
t/test-lib.sh | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index df25f179..b16a9b98 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -457,7 +457,7 @@ test_run_ () {
if test "$verbose" = "t" && test -n "$HARNESS_ACTIVE"; then
echo ""
fi
- return 0
+ return "$eval_ret"
}
test_skip () {
@@ -502,8 +502,7 @@ test_expect_failure () {
if ! test_skip "$@"
then
say >&3 "checking known breakage: $2"
- test_run_ "$2" expecting_failure
- if [ "$?" = 0 -a "$eval_ret" = 0 ]
+ if test_run_ "$2" expecting_failure
then
test_known_broken_ok_ "$1"
else
@@ -521,8 +520,7 @@ test_expect_success () {
if ! test_skip "$@"
then
say >&3 "expecting success: $2"
- test_run_ "$2"
- if [ "$?" = 0 -a "$eval_ret" = 0 ]
+ if test_run_ "$2"
then
test_ok_ "$1"
else
--
1.7.6
^ permalink raw reply related
* [PATCH 2/2] test: cope better with use of return for errors
From: Jonathan Nieder @ 2011-08-08 1:17 UTC (permalink / raw)
To: git
Cc: Michael J Gruber, Junio C Hamano, Jeff King,
Ævar Arnfjörð Bjarmason
In-Reply-To: <20110808011341.GA19551@elie.gateway.2wire.net>
In olden times, tests would quietly exit the script when they failed
at an inconvenient moment, which was a little disconcerting.
Therefore v0.99.5~24^2~4 (Trapping exit in tests, using return for
errors, 2005-08-10) switched to an idiom of using "return" instead,
wrapping evaluation of test code in a function to make that safe:
test_run_ () {
eval >&3 2>&4 "$1"
eval_ret="$?"
return 0
}
Years later, the implementation of test_when_finished (v1.7.1.1~95,
2010-05-02) and v1.7.2-rc2~1^2~13 (test-lib: output a newline before
"ok" under a TAP harness, 2010-06-24) took advantage of test_run_ as a
place to put code shared by all test assertion functions, without
paying attention to the function's former purpose:
test_run_ () {
...
eval >&3 2>&4 "$1"
eval_ret=$?
if should run cleanup
then
eval >&3 2>&4 "$test_cleanup"
fi
if TAP format requires a newline here
then
echo
fi
return 0
}
That means cleanup commands and the newline to put TAP output at
column 0 are skipped when tests use "return" to fail early. Fix it by
introducing a test_eval_ function to catch the "return", with a
comment explaining the new function's purpose for the next person who
might touch this code.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
t/test-lib.sh | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index b16a9b98..57c3d532 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -444,15 +444,21 @@ test_debug () {
test "$debug" = "" || eval "$1"
}
+test_eval_ () {
+ # This is a separate function because some tests use
+ # "return" to end a test_expect_success block early.
+ eval >&3 2>&4 "$*"
+}
+
test_run_ () {
test_cleanup=:
expecting_failure=$2
- eval >&3 2>&4 "$1"
+ test_eval_ "$1"
eval_ret=$?
if test -z "$immediate" || test $eval_ret = 0 || test -n "$expecting_failure"
then
- eval >&3 2>&4 "$test_cleanup"
+ test_eval_ "$test_cleanup"
fi
if test "$verbose" = "t" && test -n "$HARNESS_ACTIVE"; then
echo ""
--
1.7.6
^ permalink raw reply related
* Re: [PATCH/RFC 0/2] test_when_finished and returning early
From: Jeff King @ 2011-08-08 1:26 UTC (permalink / raw)
To: Jonathan Nieder
Cc: git, Michael J Gruber, Junio C Hamano,
Ævar Arnfjörð Bjarmason
In-Reply-To: <20110808011341.GA19551@elie.gateway.2wire.net>
On Mon, Aug 08, 2011 at 03:13:41AM +0200, Jonathan Nieder wrote:
> Jonathan Nieder wrote:
>
> > The use of "return" was surprising. It seems this style has been
> > intended to work ever since v0.99.5~24^2~4 (Trapping exit in tests,
> > using return for errors, 2005-08-10).
> >
> > It interacts poorly with test_when_finished but since these tests do
> > not use that function, they should be safe. test_when_finished could
> > use some fixes to avoid future surprises but that's another story.
>
> The above was about some code that looks like this:
>
> | for i in 1 2 3 4 5 6 7 8 9 10 11
> | do
> | git checkout -b root$i five || return
>
> The fixes alluded to might go something like this. Thoughts?
>
> Jonathan Nieder (2):
> test: simplify return value of test_run_
> test: cope better with use of return for errors
Both look sane to me. Thanks for a nicely written set of commit messages
explaining the rather subtle issue.
-Peff
^ permalink raw reply
* [PATCH v2] am: ignore leading whitespace before patch
From: Jonathan Nieder @ 2011-08-08 2:49 UTC (permalink / raw)
To: Junio C Hamano
Cc: David Barr, Git Mailing List, Tay Ray Chuan, Sverre Rabbelier,
Giuseppe Bilotta, Simon Sasburg
In-Reply-To: <7vvcub16e7.fsf@alter.siamese.dyndns.org>
From: David Barr <davidbarr@google.com>
Some web-based email clients prepend whitespace to raw message
transcripts to workaround content-sniffing in some browsers. Adjust
the patch format detection logic to ignore leading whitespace.
So now you can apply patches from GMail with "git am" in three steps:
1. choose "show original"
2. tell the browser to "save as" (for example by pressing Ctrl+S)
3. run "git am" on the saved file
This fixes a regression introduced by v1.6.4-rc0~15^2~2 (git-am
foreign patch support: autodetect some patch formats, 2009-05-27).
GMail support was first introduced to "git am" by v1.5.4-rc0~274^2
(Make mailsplit and mailinfo strip whitespace from the start of the
input, 2007-11-01).
Signed-off-by: David Barr <davidbarr@google.com>
Acked-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Junio C Hamano wrote:
> It no longer checks "the first few lines" but can read a lot more, so the
> comment that precedes this block is now invalid.
>
> Also we are rather old fashioned and we never say "until [ ... ]" anywhere
> in our shell scripts.
Good ideas, thanks. While at it, let's initialize l1 to protect
against any stray value it might have inherited from the environment.
Looking forward to the promised test, :)
Jonathan
git-am.sh | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 463c741d..c8422dbe 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -196,10 +196,15 @@ check_patch_format () {
return 0
fi
- # otherwise, check the first few lines of the first patch to try
- # to detect its format
+ # otherwise, check the first few non-blank lines of the first
+ # patch to try to detect its format
{
- read l1
+ # Start from first line containing non-whitespace
+ l1=
+ while test -z "$l1"
+ do
+ read l1
+ done
read l2
read l3
case "$l1" in
--
1.7.6
^ permalink raw reply related
* Using git-svn fetch after a directory change with rewrite-root
From: H Krishnan @ 2011-08-08 3:26 UTC (permalink / raw)
To: git
Hi,
We use git-svn to sync with SVN. We set the "rewrite-root" attribute
to a dummy URL as different people use different SVN mirrors to update
their git repository. Recently, the trunk directory in SVN was
renamed. After this, with git version 1.7.3 or later, we are not able
to fetch. We get an SVN error ("RA layer request failed: ...: 200
OK"). git version 1.7.0 seemed to work OK. On debugging further, I
found that in the following lines, $url has the rewrite-root prefix
whereas $gs->full_url has the actual url prefix and thus the "last if"
fails.
while (1) {
# It is possible to tag two different subdirectories at
# the same revision. If the url for an existing ref
# does not match, we must either find a ref with a
# matching url or create a new ref by growing a tail.
$gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);
my (undef, $max_commit) = $gs->rev_map_max(1);
last if (!$max_commit);
my ($url) = ::cmt_metadata($max_commit);
last if ($url eq $gs->full_url);
$ref_id .= '-';
}
print STDERR "Initializing parent: $ref_id\n" unless $::_q > 1;
I wonder if commit 3235b7053c45a734c1cdf9b117bda68b7ced29c9 handles
rewrite-root correctly. Should the comparison be made with
$gs->metadata_url instead of $gs->full_url?
H. Krishnan
^ permalink raw reply
* Re: I suggest that git commit support -A option, just like hg does.thanks.
From: Miles Bader @ 2011-08-08 4:33 UTC (permalink / raw)
To: Marc Weber; +Cc: git
In-Reply-To: <1312659297-sup-2956@nixos>
Marc Weber <marco-oweber@gmx.de> writes:
>> I don't want to run "git add -A" before commit,Â
>> I want to use "git commit -A -m 'msg' " instead.
>
> if you need it that often add to your .bashrc:
> gcA(){ git add -A && git commit -m "$@"; }
>
> which is even faster.
Remember: "just add an alias!" is an acceptable answer only if the
desired feature is odd/unusual. For desired features that are likely
to be generally useful, git should do the right thing, out of the box,
for everybody.
Which case this particular request falls into, is a matter of
judgement, but such a feature looks "generally useful" to me.
The annoying thing, of course, is that commit and add already have
inconsistent long options for this type of functionality (commit --all
vs add --all). [I'd consider that a bug, regardless of whether commit
gets -A type functionality, but I suppose it's too late to fix...]
-Miles
--
Absurdity, n. A statement or belief manifestly inconsistent with one's own
opinion.
^ permalink raw reply
* RFC: repository of handy git aliases?
From: Jon Seymour @ 2011-08-08 4:46 UTC (permalink / raw)
To: Jakub Narebski, Git Mailing List
I was wondering if there is any interest in establishing a wiki page
or gist repository of git aliases that people find useful?
jon.
^ permalink raw reply
* Re: I suggest that git commit support -A option, just like hg does.thanks.
From: Junio C Hamano @ 2011-08-08 4:56 UTC (permalink / raw)
To: Miles Bader; +Cc: Marc Weber, git
In-Reply-To: <buoy5z4ed3w.fsf@dhlpc061.dev.necel.com>
Miles Bader <miles@gnu.org> writes:
> Remember: "just add an alias!" is an acceptable answer only if the
> desired feature is odd/unusual. For desired features that are likely
> to be generally useful, git should do the right thing, out of the box,
> for everybody.
The reason I deliberately chose to use capital letter in "add -A" even
when we do not have "add -a" was exactly so that interested parties can do
"commit -A" to match it (and "commit -a" is doing the _right_ thing out of
the box, and its behaviour will not change). Hopefully you can take it as
a strong hint that I personally do not think "commit -A" is without merit.
So far, nobody stepped up to do it, though. I have been taking it as a
sign that "commit -A" is not one of the commonly desired features but is
probably closer to your "odd/unusual". It's up to the user/developer
community to change that ;-)
^ permalink raw reply
* Re: [RFC] helping smart-http/stateless-rpc fetch race
From: Junio C Hamano @ 2011-08-08 5:03 UTC (permalink / raw)
To: Shawn Pearce; +Cc: git
In-Reply-To: <CAJo=hJvdMCyU-5wzy0p1r+QJxXU=DJTE+Mu5G6pk9iAwAD51mA@mail.gmail.com>
Shawn Pearce <spearce@spearce.org> writes:
> Why a new --allow-non-tip flag? Why not always do this with the
> existing --stateless-rpc flag?
It certainly would be much easier from implementation point of view, but I
did it that way for two and half reasons:
(1) It might make sense to give admins who run upload-pack not behind
smart-http an option to allow fetching from a non-tip; and
(2) It also might make sense to let admins who do run upload-pack behind
smart-http force re-fetching when the race is encountered.
and the remaining half-reason was that I was too lazy to think things
through to refute the above two "might make sense" and convince myself
that they should instead be "is not necessary".
^ permalink raw reply
* RE: [PATCH v2] am: ignore leading whitespace before patch
From: David Barr @ 2011-08-08 5:10 UTC (permalink / raw)
To: Junio C Hamano
Cc: David Barr, Jonathan Nieder, Git Mailing List, Tay Ray Chuan,
Sverre Rabbelier, Giuseppe Bilotta, Simon Sasburg
In-Reply-To: <20110808024904.GF19551@elie.gateway.2wire.net>
Add a test for GMail-style padded email files.
Signed-off-by: David Barr <davidbarr@google.com>
---
t/t4150-am.sh | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 151404e..40a5a3e 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -167,6 +167,17 @@ test_expect_success 'am applies patch e-mail not in a mbox with CRLF' '
test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
'
+test_expect_success 'am applies patch e-mail with preceding whitespace' '
+ rm -fr .git/rebase-apply &&
+ git reset --hard &&
+ git checkout first &&
+ printf "%256s\\n" "" >patch1-ws.eml &&
+ cat patch1.eml >>patch1-ws.eml &&
+ git am <patch1-ws.eml >output.out 2>&1 &&
+ ! test -d .git/rebase-apply &&
+ git diff --exit-code second
+'
+
test_expect_success 'setup: new author and committer' '
GIT_AUTHOR_NAME="Another Thor" &&
GIT_AUTHOR_EMAIL="a.thor@example.com" &&
--
1.7.6
^ permalink raw reply related
* Re: [PATCH v2] am: ignore leading whitespace before patch
From: David Barr @ 2011-08-08 5:31 UTC (permalink / raw)
To: Junio C Hamano
Cc: David Barr, Jonathan Nieder, Git Mailing List, Tay Ray Chuan,
Sverre Rabbelier, Giuseppe Bilotta, Simon Sasburg
In-Reply-To: <1312780242-91659-1-git-send-email-davidbarr@google.com>
*facepalm*
This test already passes:
> + git am <patch1-ws.eml >output.out 2>&1 &&
Alternatively, the following was failing:
> + git am patch1-ws.eml >output.out 2>&1 &&
Note that the email file is passed as an argument rather than a redirect.
--
David Barr
^ permalink raw reply
* Re: Suppressing auto-cc for specific addresses
From: Daniel Mack @ 2011-08-08 7:24 UTC (permalink / raw)
To: Greg KH; +Cc: git
In-Reply-To: <20110807234634.GA3236@kroah.com>
On Mon, Aug 8, 2011 at 1:46 AM, Greg KH <greg@kroah.com> wrote:
> On Sun, Aug 07, 2011 at 10:20:26PM +0200, Daniel Mack wrote:
>> I'm looking for a way to suppress certain Cc: fields that are
>> normally automatically added for addresses mentioned in Cc: lines
>> found in patches.
>>
>> In particular, the kernel rules for marking patches for stable
>> release inclusion wants users to add a "Cc: stable@kernel.org" line
>> in the patch itself but to not actually send a copy of that patch to
>> that address. It will be picked automatically once the patch was
>> applied upstream.
>
> There is no "rule" that says you can not send a copy of the patch to
> stable@kernel.org, in fact that happens a lot and is fine and I have no
> problem with that at all.
Ok, thanks for explaining. In fact, I've done it that way ever since,
and never thought that there is any problem with it. But the topic
came up lately on the ALSA ML (and was continued off-list later), and
reading Documentation/stable_kernel_rules.txt again, I became aware of
the fact that sending it to stable@ is not actually necessary (while
at the same time, it doesn't seem to be frowned upon).
Anyway, I found it strange not have a way in git to achive this, and
maybe this new feature has other uses, too?
Thanks,
Daniel
^ permalink raw reply
* Re: [PATCH 14/18] reset: Make reset remove the sequencer state
From: Christian Couder @ 2011-08-08 7:27 UTC (permalink / raw)
To: Ramkumar Ramachandra
Cc: Junio C Hamano, Git List, Jonathan Nieder, Christian Couder,
Daniel Barkalow, Jeff King
In-Reply-To: <1312454356-3070-15-git-send-email-artagnon@gmail.com>
On Thursday 04 August 2011 12:39:12 Ramkumar Ramachandra wrote:
>
> branch.c | 2 ++
> t/7106-reset-sequence.sh | 44
> ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46
> insertions(+), 0 deletions(-)
> create mode 100755 t/7106-reset-sequence.sh
The name of the new test file should be "t7106-reset-sequence.sh" instead of
"7106-reset-sequence.sh".
> diff --git a/t/7106-reset-sequence.sh b/t/7106-reset-sequence.sh
> new file mode 100755
> index 0000000..4956caa
> --- /dev/null
> +++ b/t/7106-reset-sequence.sh
Thanks,
Christian.
^ permalink raw reply
* Re: [PATCH 17/18] revert: Introduce --continue to continue the operation
From: Christian Couder @ 2011-08-08 7:31 UTC (permalink / raw)
To: Ramkumar Ramachandra
Cc: Junio C Hamano, Git List, Jonathan Nieder, Christian Couder,
Daniel Barkalow, Jeff King
In-Reply-To: <1312454356-3070-18-git-send-email-artagnon@gmail.com>
Hi Ram,
On Thursday 04 August 2011 12:39:15 Ramkumar Ramachandra wrote:
>
> +test_expect_success '--signoff is not automatically propogated to resolved
> conflict' '
s/propogated/propagated/
I found nothing else from another look at the tests in the series so you can
add an "Acked-by: Christian Couder <chriscool@tuxfamily.org>" or "Signed-of-
by: Christian Couder <chriscool@tuxfamily.org>".
Thanks,
Christian.
^ permalink raw reply
* Re: [PATCH 14/18] reset: Make reset remove the sequencer state
From: Ramkumar Ramachandra @ 2011-08-08 8:20 UTC (permalink / raw)
To: Christian Couder
Cc: Junio C Hamano, Git List, Jonathan Nieder, Christian Couder,
Daniel Barkalow, Jeff King
In-Reply-To: <CAP8UFD0FfPqFpp1Fvg+ESkt1euqua6n_WPa3BSoyBEkNrOrFvQ@mail.gmail.com>
Hi Christian,
Christian Couder writes:
> On Thursday 04 August 2011 12:39:12 Ramkumar Ramachandra wrote:
>> create mode 100755 t/7106-reset-sequence.sh
>
> The name of the new test file should be "t7106-reset-sequence.sh" instead of
> "7106-reset-sequence.sh".
Ugh, right.
Junio: Could you kindly squash the following patch in before merging
the series into 'next'? I hope it's not too late.
p.s- I'm pleasantly surprised to see no diff.
--8<--
Subject: [PATCH] fixup! reset: Make reset remove the sequencer state
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
...6-reset-sequence.sh => t7106-reset-sequence.sh} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
rename t/{7106-reset-sequence.sh => t7106-reset-sequence.sh} (100%)
diff --git a/t/7106-reset-sequence.sh b/t/t7106-reset-sequence.sh
similarity index 100%
rename from t/7106-reset-sequence.sh
rename to t/t7106-reset-sequence.sh
--
1.7.6.351.gb35ac.dirty
^ permalink raw reply
* Re: [PATCH 17/18] revert: Introduce --continue to continue the operation
From: Ramkumar Ramachandra @ 2011-08-08 8:24 UTC (permalink / raw)
To: Christian Couder
Cc: Junio C Hamano, Git List, Jonathan Nieder, Christian Couder,
Daniel Barkalow, Jeff King
In-Reply-To: <CAP8UFD0izFOW0xHQB8ZT3+bbTjGtSm-ZWHs6AWdJoEneRX32mw@mail.gmail.com>
Hi Christian,
Christian Couder writes:
> On Thursday 04 August 2011 12:39:15 Ramkumar Ramachandra wrote:
>>
>> +test_expect_success '--signoff is not automatically propogated to resolved
>> conflict' '
>
> s/propogated/propagated/
>
> I found nothing else from another look at the tests in the series so you can
> add an "Acked-by: Christian Couder <chriscool@tuxfamily.org>" or "Signed-of-
> by: Christian Couder <chriscool@tuxfamily.org>".
Thanks for being so thorough! :)
Junio: Here's another small fixup patch for your convenience.
--8<--
Subject: [PATCH] fixup! revert: Introduce --continue to continue the
operation
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
t/t3510-cherry-pick-sequence.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 78f3f01..3bca2b3 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -171,7 +171,7 @@ test_expect_success '--continue respects opts' '
grep "cherry picked from" anotherpick_msg
'
-test_expect_success '--signoff is not automatically propogated to
resolved conflict' '
+test_expect_success '--signoff is not automatically propagated to
resolved conflict' '
pristine_detach initial &&
test_must_fail git cherry-pick --signoff base..anotherpick &&
echo "c" >foo &&
--
1.7.6.351.gb35ac.dirty
^ permalink raw reply related
* [PATCH 2/2] Documentation/Makefile: add *.pdf to `clean' target
From: Emilio G. Cota @ 2011-08-08 8:33 UTC (permalink / raw)
To: gitster; +Cc: git, Emilio G. Cota
In-Reply-To: <1312792385-19149-1-git-send-email-cota@braap.org>
From: "Emilio G. Cota" <cota@braap.org>
user-manual.pdf is not removed by `make clean'; fix it.
Signed-off-by: Emilio G. Cota <cota@braap.org>
---
Documentation/Makefile | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 36989b7..18c71d7 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -232,6 +232,7 @@ cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT)
clean:
$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
$(RM) *.texi *.texi+ *.texi++ git.info gitman.info
+ $(RM) *.pdf
$(RM) howto-index.txt howto/*.html doc.dep
$(RM) technical/api-*.html technical/api-index.txt
$(RM) $(cmds_txt) *.made
--
1.7.6
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox