| From | Subject | Date |
|---|---|---|
| Thiago Farina | [Patch v2] Add test-string-list.c
Add a simple test that demonstrates how to create and manipulate
a list of strings using the string-list.h API.
To see the test, call it by:
./bin-wrappers/test-string-list.c
Signed-off-by: Thiago Farina <tfransosi@gmail.com>
---
Makefile | 1 +
test-string-list.c | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
create mode 100644 test-string-list.c
diff --git a/Makefile b/Makefile
index 40fbcae..287bc2c 100644
--- a/Makefile
+++ ...
| Sep 6, 4:43 pm 2010 |
| Thiago Farina | [PATCH] builtin/clean.c: Use STRING_LIST_INIT_NODUP.
Signed-off-by: Thiago Farina <tfransosi@gmail.com>
---
builtin/clean.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index b508d2c..c8798f5 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -44,7 +44,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
struct dir_struct dir;
static const char **pathspec;
struct strbuf buf = STRBUF_INIT;
- struct string_list exclude_list = { NULL, 0, 0, 0 };
+ struct ...
| Sep 6, 4:32 pm 2010 |
| Junio C Hamano | Re: [PATCH] builtin/clean.c: Use STRING_LIST_INIT_NODUP.
Good eyes. Is this the last spelled-out initialization (I didn't check
deeper than running a quick grep for "struct string_list .*= *{")?
Thanks.
--
| Sep 6, 4:56 pm 2010 |
| Elijah Newren | [PATCH] revert: Fix trivial comment style issue
Signed-off-by: Elijah Newren <newren@gmail.com>
---
builtin/revert.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 8b9d829..54d13cf 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -495,7 +495,6 @@ static int do_pick_commit(void)
free_message(&msg);
/*
- *
* If we are cherry-pick, and if the merge did not result in
* hand-editing, we will hit this commit and inherit the original
* author date ...
| Sep 6, 2:53 pm 2010 |
| Elijah Newren | [PATCH] cache_tree_free: Fix small memory leak
Signed-off-by: Elijah Newren <newren@gmail.com>
---
cache-tree.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/cache-tree.c b/cache-tree.c
index c60cf91..f755590 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -22,8 +22,10 @@ void cache_tree_free(struct cache_tree **it_p)
if (!it)
return;
for (i = 0; i < it->subtree_nr; i++)
- if (it->down[i])
+ if (it->down[i]) {
cache_tree_free(&it->down[i]->cache_tree);
+ free(it->down[i]);
+ }
...
| Sep 6, 2:40 pm 2010 |
| Ævar Arnfjörð Bjarmason | Re: Should git-citool be in mainporcelain in command-list?
I mean "convenience" interchangeably with "standard" as this paragraph
I.e. `git gui citool` and `git citool` launch the same thing, the
latter is just a shorter way to do it.
--
| Sep 6, 3:17 pm 2010 |
| Ævar Arnfjörð Bjarmason | Re: Should git-citool be in mainporcelain in command-list?
I haven't either, and I don't use git-gui or the git citool alias. I
didn't even know about it until yesterday.
The entries in git(1) don't indicate that citool is a convenience
alias for git-gui:
git-gui(1)
A portable graphical interface to Git.
git-citool(1)
Graphical alternative to git-commit.
Maybe it shouldn't be listed there at all to avoid confusion, or maybe
it should be in an aliases category to clearly indicate its function
as a ...
| Sep 6, 3:00 pm 2010 |
| Jonathan Nieder | Re: Should git-citool be in mainporcelain in command-list?
Its main purpose is to populate the command list in git.1:
Main porcelain commands
[...]
git-citool(1)
Graphical alternative to git-commit.
[...]
git-gui(1)
A portable graphical interface to Git.
What do you think this should say? (Honest question --- I
haven't thought hard about it.)
--
| Sep 6, 2:39 pm 2010 |
| Ævar Arnfjörð Bjarmason | Should git-citool be in mainporcelain in command-list?
Maybe there should be an aliases category:
$ grep -e git-gui -e citool command-list.txt
git-citool mainporcelain
git-gui mainporcelain
A very minor nit, just something I ran into while gettext-izing and
wondered "what's that".
But I'm probably the only one that's used command-list.txt for
anything non-Make related in a while :)
--
| Sep 6, 2:27 pm 2010 |
| Jonathan Nieder | Re: Should git-citool be in mainporcelain in command-list?
That's because it isn't, no?
SYNOPSIS
git citool
DESCRIPTION
A Tcl/Tk based graphical interface to review modified
files, stage them into the index, enter a commit message
and record the new commit onto the current branch. This
interface is an alternative to the less interactive git
commit program.
git citool is actually a standard alias for git gui
citool. See git-gui(1) for more details.
--
| Sep 6, 3:07 pm 2010 |
| Jonathan Nieder | Re: Should git-citool be in mainporcelain in command-list?
All I meant is that it is not an alias for "git gui" but for
"git gui citool". I can imagine a person reading git(1) and
learning about the ability to say
git citool
though I guess by the same token a person might wonder why
the list does not include similar
git blametool
and
git browsertool
commands. Anyway, I have nothing against a separate "aliases" category.
Sorry for the noise.
--
| Sep 6, 3:31 pm 2010 |
| Todd A. Jacobs | Better way to find commit from tarball?
Someone handed me a tarball that represented an unknown release from a
project. Here's what I came up with to identify the commit:
cd $SOME_WORK_DIR
find . -path ./.git -prune -o -print0 | xargs -0 rm
tar xvfz $TARBALL
for commit in {0..100}; do
id="master~${commit}"
if git diff --quiet --exit-code "$id"
then
echo "Matched on commit $id"
break
fi
done
Someone please tell me there's an easier way to find a ...
| Sep 6, 12:55 pm 2010 |
| Jonathan Nieder | Re: Better way to find commit from tarball?
If you are lucky and they used "git archive":
gunzip <$TARBALL | git get-tar-commit-id
Otherwise: maybe something like this[1] will work.
tar_id=$(
git init tarball &&
cd tarball &&
perl /usr/share/doc/git/contrib/fast-import/import-tars.perl $TARBALL &&
git rev-parse --verify HEAD:
) &&
rm -fr tarball &&
git rev-list --full-history --format='%h %T' HEAD |
grep " $tar_id\$"
[1] http://thread.gmane.org/gmane.comp.version-control.git/44750/focus=44849
--
| Sep 6, 1:05 pm 2010 |
| Daniel A. Steffen | Re: [RFC/PATCH] Force using Tcl/Tk 8.4 on Mac OS X
Hi Stefan,
first time I hear of this (or see this myself, and I use git gui every day on Mac OS X); in part this may be due to the fact that many of the menu shortcuts assigned by git gui conflict with existing OS X shortcuts and don't work anyway e.g. cmd-A (esp if a text widget is in focus)...
please don't brute-force around the problem in this way, there are many features that the Cocoa Tk in 8.5+ adds that would be lost by such a change.
Moreover the fact that 8.4 is present in that ...
| Sep 6, 12:36 pm 2010 |
| Jens Lehmann | [PATCH] t3404 & t7508: cd inside subshell instead of around
Fixed all places where it was a straightforward change from cd'ing into a
directory and back via "cd .." to a cd inside a subshell.
Found these places with "git grep -w "cd \.\.".
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
---
This patch applies on top of master and contains the changes that don't
apply to maint.
t/t3404-rebase-interactive.sh | 6 +++---
t/t7508-status.sh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git ...
| Sep 6, 11:41 am 2010 |
| Jens Lehmann | Re: [PATCH] Several tests: cd inside subshell instead of ...
I think that makes a lot of sense. I think you would not only end up
changing the indentation of many subshells (not only those that I
added), you will also have to deal with tests using spaces instead of
tabs for indentation. But these issues have to be addressed anyway ...
--
| Sep 6, 1:12 pm 2010 |
| Jonathan Nieder | Re: [PATCH] Several tests: cd inside subshell instead of ...
I assume that "sed"-ing out all parentheses would make the diff very
small and readable.
Do you think it would be a bad idea if I send a follow-on patch that
changes code like this:
(cd dir &&
git update-index --add two &&
case "`git ls-files`" in
two) echo pass two ;;
*) echo bad two; exit 1 ;;
esac
) &&
to this:
(
cd dir &&
git update-index --add two &&
case "`git ls-files`" in
two) echo pass two ;;
*) echo bad two; exit 1 ;;
esac
)
It would ...
| Sep 6, 12:06 pm 2010 |
| Jens Lehmann | [PATCH] Several tests: cd inside subshell instead of around
Fixed all places where it was a straightforward change from cd'ing into a
directory and back via "cd .." to a cd inside a subshell.
Found these places with "git grep -w "cd \.\.".
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
---
This patch applies to maint.
t/t1020-subdirectory.sh | 6 +-
t/t1302-repo-version.sh | 6 +-
t/t2101-update-index-reupdate.sh | 6 +-
t/t3060-ls-files-with-tree.sh | 4 ...
| Sep 6, 11:39 am 2010 |
| Junio C Hamano | Re: [PATCH] Several tests: cd inside subshell instead of ...
If we were to do this, shouldn't we be able to lose 'cd "$HERE"' at the
beginning of each test? The test after this one does "cd dir" without
even coming back up and relies on the next one to go back itself,
suggesting that grepping for 'cd ..' may not be sufficient, depending on
what we are trying to fix.
If we were to insist that no matter how an individual test fail, the test
that follows it must start in a known location (namely, $TRASH), then we
might want to use something like the ...
| Sep 6, 4:16 pm 2010 |
| Pascal Obry | [PATCH v5 0/3] Add support for SMTP server options
This is v5 of the patch thanks to Junio and AEvar for the review and help.
context:
--------
I'm not familiar at all with Perl so comments on style or usage most
welcomed. This patch is to introduce a way to pass specific options to the
SMTP server used by git-send-email.
I need that to be able to use different SMTP account (wanadoo, gmail...) on
some Git repositories to send over proper identity.
change since v4:
----------------
Add the missing signed-off-by.
change since ...
| Sep 6, 11:12 am 2010 |
| Pascal Obry | [PATCH v5 3/3] New send-email option smtpserveroption.
The new command line parameter --smtp-server-option or default
configuration sendemail.smtpserveroption can be used to pass
specific options to the SMTP server. Update the documentation
accordingly.
Signed-off-by: Pascal Obry <pascal@obry.net>
---
Documentation/config.txt | 1 +
Documentation/git-send-email.txt | 9 +++++++++
git-send-email.perl | 8 +++++++-
3 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/Documentation/config.txt ...
| Sep 6, 11:12 am 2010 |
| Pascal Obry | [PATCH v5 1/3] Minor indentation fix.
Signed-off-by: Pascal Obry <pascal@obry.net>
---
git-send-email.perl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 6dab3bf..0063606 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -212,7 +212,7 @@ my %config_settings = (
"smtpserverport" => \$smtp_server_port,
"smtpuser" => \$smtp_authuser,
"smtppass" => \$smtp_authpass,
- "smtpdomain" => \$smtp_domain,
+ "smtpdomain" => ...
| Sep 6, 11:12 am 2010 |
| Pascal Obry | [PATCH v5 2/3] Remove @smtp_host_parts variable as not used.
Signed-off-by: Pascal Obry <pascal@obry.net>
---
git-send-email.perl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 0063606..39cb5af 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -189,7 +189,7 @@ sub do_edit {
# Variables with corresponding config settings
my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc, $cc_cmd);
my ($smtp_server, $smtp_server_port, $smtp_authuser, ...
| Sep 6, 11:12 am 2010 |
| Pascal Obry | [PATCH v4 0/3] Add support for SMTP server options
This is v4 of the patch thanks to Junio and AEvar for the review and help.
context:
--------
I'm not familiar at all with Perl so comments on style or usage most
welcomed. This patch is to introduce a way to pass specific options to the
SMTP server used by git-send-email.
I need that to be able to use different SMTP account (wanadoo, gmail...) on
some Git repositories to send over proper identity.
change since v3:
----------------
I have moved smtp server option description after ...
| Sep 6, 10:38 am 2010 |
| Pascal Obry | [PATCH v4 2/3] Remove @smtp_host_parts variable as not used.
---
git-send-email.perl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 0063606..39cb5af 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -189,7 +189,7 @@ sub do_edit {
# Variables with corresponding config settings
my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc, $cc_cmd);
my ($smtp_server, $smtp_server_port, $smtp_authuser, $smtp_encryption);
-my ($identity, $aliasfiletype, ...
| Sep 6, 10:38 am 2010 |
| Pascal Obry | [PATCH v4 1/3] Minor indentation fix.
---
git-send-email.perl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 6dab3bf..0063606 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -212,7 +212,7 @@ my %config_settings = (
"smtpserverport" => \$smtp_server_port,
"smtpuser" => \$smtp_authuser,
"smtppass" => \$smtp_authpass,
- "smtpdomain" => \$smtp_domain,
+ "smtpdomain" => \$smtp_domain,
"to" => \@to,
"cc" => ...
| Sep 6, 10:38 am 2010 |
| Pascal Obry | [PATCH v4 3/3] New send-email option smtpserveroption.
The new command line parameter --smtp-server-option or default
configuration sendemail.smtpserveroption can be used to pass
specific options to the SMTP server. Update the documentation
accordingly.
---
Documentation/config.txt | 1 +
Documentation/git-send-email.txt | 9 +++++++++
git-send-email.perl | 8 +++++++-
3 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0510ac7..d318c31 ...
| Sep 6, 10:38 am 2010 |
| Matthieu Moy | Git-gui and the next Git release
Hi,
There are a few fixes in Git-gui's repository that were not merged in
git:
$ git log --oneline --decorate git-gui/master ^origin/master
aef0b48 (git-gui/master) git-gui: ensure correct application termination in git-gui--askpass
d5257fb (git-gui/pu) git-gui: handle textconv filter on Windows and in development
62f9a63 git-gui: use shell to launch textconv filter in "blame"
7807777 (git-gui/maint) git-gui: display error launching blame as a message box.
ea47503 git-gui: Make usage ...
| Sep 6, 8:57 am 2010 |
| Artur Skawina | remote-helpers: The lost verbosity level
Tried turning on more debugging in my new remote-helper and was surprised by this:
$ git fetch -q swarm://address blah
I= "option verbosity 0"
$ git fetch swarm://address blah
I= "option verbosity 1"
$ git fetch -v swarm://address blah
I= "option verbosity 1"
$ git fetch -vv swarm://address blah
I= "option verbosity 3"
$ git fetch -vvv swarm://address blah
I= "option verbosity 4"
# etc
$ git --version
git version 1.7.2.1
IOW the '-v' case is undetectable. Presumably an off-by-one ...
| Sep 6, 8:24 am 2010 |
| Sverre Rabbelier | Re: remote-helpers: The lost verbosity level
Heya,
Curious. That does not seem like correct behavior, no. Can you
investigate where this goes wrong?
--
Cheers,
Sverre Rabbelier
--
| Sep 6, 1:52 pm 2010 |
| Oxfam GB | Oxfam gb -uk Cash\Grant Donation 2010.
You have been officially chosen by the Board of Trustees of the Oxfam GB (NGO UK) as one of the
final Recipients of a Cash Grant/Donation of £850,000.00 grant entitlements,Contact email
terrywilliams201@aim.com, Qualification Number(OG/N231/E101/BDB
--
| Sep 6, 7:14 am 2010 |
| Mark Lodato | [PATCHv3] completion: make compatible with zsh
Modify git-completion.bash so that it also works with zsh when using
bashcompinit. In particular:
declare -F
Zsh doesn't have the same 'declare -F' as bash, but 'declare -f'
is the same, and it works just as well for our purposes.
${var:2}
Zsh does not implement ${var:2} to skip the first 2 characters, but
${var#??} works in both shells to replace the first 2 characters
with nothing. Thanks to Jonathan Nieder for the suggestion.
for (( n=1; "$n" ... ))
Zsh does ...
| Sep 6, 5:33 am 2010 |
| Jan III Sobieski | git diff - howto exclude dir from diff?
Hi,
I wonder if it's possible to exclude a dir from the diff. I want to
get some diffstats from Linux tree
git diff v2.6.35..v2.6.36-rc3 --stat
but without drivers/staging/ dir. Is it possible?
Regards,
Jan
--
Jan III Sobieski
--
| Sep 6, 4:13 am 2010 |
| Sylvain Rabot | Re: git diff - howto exclude dir from diff?
It's not possible to exclude with git diff/grep, but you can do
somtehing like that :
find . -type f ! -path "./drivers/staging/*" | xargs git diff
--
| Sep 6, 6:25 am 2010 |
| Junio C Hamano | What's cooking in git.git (Sep 2010, #02; Mon, 6)
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
marked with '.' do not appear in any of the integration branches, but I am
still holding onto them.
There are a few leftover bits in 'next' that need to be merged to 'master'
before we declare a real -rc cycle, so tonight's pushout is -rc0.
--------------------------------------------------
[Graduated to "master"]
* ab/compat-regex (2010-08-26) 9 ...
| Sep 6, 12:41 am 2010 |
| J. Bakshi | git over http configuration problem
Hello,
I am a newbie in git technology, please bear with me. I am interested to implement git over http along with gitweb.
At first I have already created a demo git repository in the server , After restating apache I can see gitweb at http://192.168.1.1/gitweb
Here is the apache related configuration
```````````````
Alias /gitweb /var/gitdir/
RewriteEngine On
RewriteRule ^gitweb$ gitweb/ [R]
SetEnv GITWEB_CONFIG /etc/gitweb.conf
<Directory "/var/gitdir/">
AllowOverride ...
| Sep 5, 11:31 pm 2010 |
| David Barr | [PATCH] RFC: help.autocorrect prompt
Added a new configuration value for help.autocorrect.
A value of 'prompt' causes git to wait for confirmation
before executing the assumed command.
---
help.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/help.c b/help.c
index 7f4928e..924ce60 100644
--- a/help.c
+++ b/help.c
@@ -267,8 +267,12 @@ static struct cmdnames aliases;
static int git_unknown_cmd_config(const char *var, const char *value, void *cb)
{
- if (!strcmp(var, ...
| Sep 5, 7:28 pm 2010 |
| David Barr | Re: [PATCH] RFC: help.autocorrect prompt
The existing docs say that negative values correspond to immediate execution,
zero to never, and positive to a delay in deciseconds.
That looks much nicer, I was hoping for such a suggestion.
--
David Barr.
--
| Sep 6, 12:16 am 2010 |
| Jonathan Nieder | Re: [PATCH] RFC: help.autocorrect prompt
(+cc: Dscho and Heiko)
Any particular significance to INT_MAX rather than, e.g., -1 here?
(Just curious; it seems unlikely someone would use INT_MAX and
accidentally trip on this.)
Not a problem introduced by your patch: should we be checking for
Funny. :)
It might be better to actually always write this prompt to the
terminal, rather than popping up a gui $GIT_ASKPASS if the user has
set that up. Maybe something like Heiko Voigt's "mingw: make failures
to unlike or move raise a ...
| Sep 5, 7:59 pm 2010 |
| David Barr | [PATCH] help.autocorrect prompt
Added a new configuration value for help.autocorrect.
A value of 'prompt' causes git to wait for confirmation
before executing the assumed command.
Signed-off-by: David Barr <david.barr@cordelta.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
---
help.c | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/help.c b/help.c
index 7f4928e..2282885 100644
--- a/help.c
+++ b/help.c
@@ -267,8 +267,12 @@ static struct cmdnames aliases;
static ...
| Sep 6, 12:27 am 2010 |
| Olaf Dabrunz | [TopGit PATCH] add section POINTERS to README
[Empty message]
| Sep 5, 5:02 pm 2010 |
| Felipe Contreras | git top links: 2010-8
Hi,
git top links is my attempt to gather all the links people have been
tagging as "git" in delicious.com[1] (these are not chosen by me).
It seems the amount of new links has decreased significantly, so this
time I’m going to post recurring links too. Enjoy ;)
The fancier blog version is here:
http://gitlog.wordpress.com/2010/09/06/git-top-links-2010-8/
= New =
1. A few git tips you didn't know about (157)
Very useful tips, even for git ...
| Sep 5, 5:19 pm 2010 |
| Thiago Farina | [Patch v3] string-list: Document STRING_LIST_INIT_* macros.
Clarify the modern ways to initialize a string_list. Text roughly
based on the analogous passage from api-strbuf.txt.
(Note: Based on the demo patch of Jonathan Nieder).
Signed-off-by: Thiago Farina <tfransosi@gmail.com>
---
Documentation/technical/api-string-list.txt | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Documentation/technical/api-string-list.txt b/Documentation/technical/api-string-list.txt
index 3f575bd..f689163 100644
--- ...
| Sep 5, 5:13 pm 2010 |
| Thiago Farina | Re: [Patch v3] string-list: Document STRING_LIST_INIT_* ...
I already done in the test-string-list.c patch I sent. :-)
--
| Sep 5, 5:38 pm 2010 |
| Jonathan Nieder | Re: [Patch v3] string-list: Document STRING_LIST_INIT_* ...
If we do not have a string_list_init() function, maybe it is worth
mentioning how a person can use
memset(&list, 0, sizeof(struct string_list));
list.strdup_strings = 1 or 0;
too?
The previous text tried (too subtly, perhaps) to imply that with the
"clears" (for memset) and "might want to set the flag `strdup_strings`"
Probably worth copying and pasting this code to another file and
trying it to make sure it works for the final draft.
Also, I am afraid I will not be able to send ...
| Sep 5, 5:22 pm 2010 |
| Thiago Farina | Re: [PATCH v2] string-list: Document STRING_LIST_INIT_* ...
OK, removed that section.
--
| Sep 5, 5:15 pm 2010 |
| Nicolas Pitre | Sep 5, 5:23 pm 2010 | |
| Jeff King | Re: Determining commit reachability
I think that is about as fast as you will get. You could try something
with git-merge-base, but it should be about the same speed.
Note that neither will tell you _which_ head the target was reachable
from. For that, given the current interface you have to test each head
individually. If you write some C code, you can do it all in a single
traversal. See this thread for some discussion of how "git tag
--contains" can be sped up:
...
| Sep 5, 8:17 pm 2010 |
| Sverre Rabbelier | Re: Determining commit reachability
Heya,
Junio added it that way back in "git-branch --contains=commit"
v1.5.3.6-879-g694a577 (Nov 7 2007) when the feature was added. Junio,
do you remember why you added "--with" as a hidden alias?
--
Cheers,
Sverre Rabbelier
--
| Sep 6, 2:05 pm 2010 |
| Artur Skawina | Re: Determining commit reachability
As i think i'll only need this to prevent leaking (private) commits that
wouldn't be reachable from the (public) heads, just catching the
unreachable ones should be enough.
$ time git rev-list -n1 v2.6.12 ^v33 ^v35
0m2.333s user 0m0.040s system 0m2.379s elapsed 99.77% CPU
$ time git rev-list -n1 v2.6.36-rc2 ^v33 ^v35
76be97c1fc945db08aae1f1b746012662d643e97
0m0.500s user 0m0.010s system 0m0.514s elapsed 99.13% CPU
A bit expensive, but I guess should it become a problem I could ...
| Sep 5, 10:04 pm 2010 |
| Ævar Arnfjörð Bjarmason | Re: Determining commit reachability
Maybe it should be documented?
--
| Sep 6, 1:53 pm 2010 |
| Junio C Hamano | Re: Determining commit reachability
Depends on the definition of "best", but I often find myself typing
git branch --with C
where C often is somewhere between 'master' and 'ko/master' (the 'master'
branch everybody else has already seen on k.org). When I have second
thoughts sometime after applying a patch directly on top of 'master', I
need to see if I have built a new topic branch forking from the faulty
commit before rewinding it, as such a topic branch also needs to be
rewound.
--
| Sep 5, 11:47 pm 2010 |
| Sverre Rabbelier | Re: Determining commit reachability
Heya,
In case anyone else is wondering, '--with' is a hidden alias for '--contains'.
--
Cheers,
Sverre Rabbelier
--
| Sep 6, 1:45 pm 2010 |
| Junio C Hamano | Re: Determining commit reachability
It was originally called --with. I wrote it to help me in the exact use
case in this thread, and the option was naturally named --with, as the
request I wanted to make was "Give me branches _with_ this commit, so that
I know which ones I need to rewind before reintegrating and publishing".
Somehow people wanted to see an option with a longer name, but by that
time my fingers were well trained, so I kept "--with" but didn't bother
advertising duplicated options.
--
| Sep 6, 4:38 pm 2010 |
| Sitaram Chamarty | Re: [PATCH] po/hi.po: Add Hindi Translation
On Sun, Sep 5, 2010 at 11:57 PM, Ramkumar Ramachandra
looks OK to me. Some of those words will never be encountered in
colloquial Hindi (I had to think for a bit on निर्देशिका and
प्रतीकात्मक लिंक!) , but that's the way it always is. We end up just
using the English word within Hindi/Telugu/whatever :-)
--
| Sep 5, 5:54 pm 2010 |
| Ramkumar Ramachandra | Re: [PATCH] po/hi.po: Add Hindi Translation
Hi Sitaram,
Thanks for the feedback. Yes, that's true- even among my friends, only
a few expert Hindi speakers were able to follow hindi.po
completely. However, I figured that only those people who are more
comfortable in Hindi than English will actually use hindi.po, so we
might as well do it right :)
I also discovered another thing- even expert Hindi speakers don't seem
to understand Hindi grammar very well :p After a few hours of
studying, I was able to correct a few more mistakes that ...
| Sep 5, 9:29 pm 2010 |
| Junio C Hamano | Re: [PATCH v3 3/3] New send-email option smtpserveroption.
I didn't mean a test that makes sure --sso=foo is parsed into @sso array;
that would be a _mechanism_ test you alluded to, but I think we probably
do not need such a test as long as we trust Getopt::Long().
What I meant was to make sure that the result is correctly propagated to
the invocation of "exec($smtp_server, @sendmail_params)"; presumably the
check will use a custom $smtp_server command that checks individual
command line parameters. And that _is_ exactly within the scope of ...
| Sep 6, 2:13 pm 2010 |
| Ævar Arnfjörð Bjarmason | Re: [PATCH v3 3/3] New send-email option smtpserveroption.
I can tell you that I *didn't* solve a similar problem with t/harness:
? (test_args => [ split /\s+/, $ENV{GIT_TEST_OPTS} ])
That'll fail if the GIT_TEST_OPTS contains a space,
e.g. GIT_TEST_OPTS='--root="/tmp/a space"'. But I just ignored it at
the time.
It would be useful for both of these if we had a str_to_options()
utility function in e.g. Git.pm. If nothing else it's probably more
user friendly to specify them in one smtpserveroption string, since
you can copy/paste an ...
| Sep 6, 2:27 am 2010 |
| Jakub Narebski | Re: [PATCH v3 3/3] New send-email option smtpserveroption.
Actually because *all* options use the same mechanism (%config_settings
which is used in read_config, and GetOptions from Getopt::Long), it would
be better to just test the mechanism, I think.
But that is outside the scope of this patch... and probably require
We do it this way, the same as for 'sendemail.to'... though I admit
that it is much more natural for 'sendemail.to' than for
Yes, there would be a problem with something like this:
[sendemail]
smtpserveroption = ...
| Sep 6, 3:23 am 2010 |
| Junio C Hamano | Re: [PATCH v3 3/3] New send-email option smtpserveroption.
And test if it is easy to arrange (otherwise I'll take a look myself, so
That is a good and important point.
We could
[sendemail]
smtpserveroption = opt1
smtpserveroption = opt2
or if we choose to split at WS
[sendemail]
smtpserveroption = "opt1 opt2"
but with the second form there always is this nagging "how would you
specify an option with WS in it" issue, so the former might be easier.
If we take the latter route, we should ...
| Sep 5, 11:38 pm 2010 |
| Sitaram Chamarty | Re: [PATCH] Add ERR support to smart HTTP
I'm going to try the patch that Ilari sent when I get to work but to
answer this sub-thread about HTTP status codes and messages, none of
that gets printed by the curl code, as Ilari pointed out. Here's a
transcript:
Notice the 403 on this one... I do send that back:
06:30:37 sitaram@sita-lt:http-test $ git clone `genurl alice foo/sitaram/try1`
Cloning into try1...
error: The requested URL returned error: 403 while ...
| Sep 5, 6:04 pm 2010 |
| Sitaram Chamarty | Re: [PATCH] Add ERR support to smart HTTP
turns out all this was moot. It was *because* I was using something
other than "200 OK" that the user was not seeing the message. Ilari's
patch just makes the message *look* better/cleaner, but I still have
to send it out with a "200 OK" status.
That was... a surprise :-)
Thanks all
sitaram
--
| Sep 5, 10:45 pm 2010 |
| Sitaram Chamarty | Re: [PATCH] Add ERR support to smart HTTP
are those counts accurate for the specific example you show or just made up?
It seems the first line has a count in hex that includes the newline
at the end, and the second one has a count in decimal that does not
ok... what about all the other service commands? like /info/refs?
What should I put there?
Sorry if I'm being stupid but I couldn't find this info anywhere (my C
grokking isn't as good as it used to be anyway). I've tried all sorts
of combinations of sending out two such lines ...
| Sep 6, 10:59 am 2010 |
| Jakub Narebski | Re: [PATCH] Add ERR support to smart HTTP
From what I remember from smart HTTP discussion (during fleshing-out
the protocol/exchange details), the fact that errors from git are send
with "200 OK" HTTP status are very much conscious decision. But I don't
remember *why* it was chosen this way. If I remember correctly it was
something about transparent proxies and caches... Is it documented
anywhere? Can anyone explain it?
Nevertheless I think it would be a good idea to make *client* more
accepting, which means:
1. Printing full ...
| Sep 6, 1:49 am 2010 |
| Sitaram Chamarty | Re: [PATCH] Add ERR support to smart HTTP
I didn't understand this bit about leaking info. If the bits are
coming into my machine I know what they are anyway (or am able to find
out easily enough, even if git itself isn't showing them to me).
Where's the leak?
And I do see the point that Joshua made that the 200 reflects HTTP
status, not git status. Makes sense, and answers my original
question...
regards
sitaram
--
| Sep 6, 7:24 am 2010 |
| Joshua Juran | Re: [PATCH] Add ERR support to smart HTTP
I wasn't involved in the decision process, but I suspect it's because
HTTP is the transport layer to the Git application. It's the same
logic as trying to log in to a Web application with bogus credentials
and getting back a page (HTTP 200 OK) stating that the login failed.
As far as HTTP is concerned, the transaction succeeded.
Josh
--
| Sep 6, 2:15 am 2010 |
| Ævar Arnfjörð Bjarmason | Re: [PATCH] Add ERR support to smart HTTP
You can still send it out with a "200 <anything you want here>" if you
want to give a warning/error even on 200.
--
| Sep 6, 1:45 am 2010 |
| Jakub Narebski | Re: [PATCH] Add ERR support to smart HTTP
I meant here that programs (including git) do not provide full details
about error condition, especially if it has to do womething with
authentication, to avoid leaking sensitive information (like e.g.
saying that username + password combination is invalid, instead of
telling which one is wrong, to avoid disclosing usernames).
--
Jakub Narebski
Poland
--
| Sep 6, 9:31 am 2010 |
| Shawn O. Pearce | Re: [PATCH] Add ERR support to smart HTTP
Exactly correct.
FWIW, I meant for the standard git:// ERR type error to be used
here under smart-HTTP. I'm not sure why we need Ilari's original
patch at all.
That is, the following will trigger a correct error on the client:
200 OK
Content-Type: application/x-git-upload-pack-advertisement
001e# service=git-upload-pack
0022ERR You shall not do this
Likewise if you wanted to do this with receive-pack, replace upload
with receive above and adjust the pkt-line ...
| Sep 6, 7:56 am 2010 |
| Shawn O. Pearce | Re: [PATCH] Add ERR support to smart HTTP
Feh. I can't count. The first count is correct. The second count
should also be 001e. I guess that should be obvious by just looking
The only other command that matters is info/refs.
For smart clients, its what I said above.
For dumb clients, you have to use some sort of HTTP error status
that isn't 404. Dumb clients pre-1.6.6 use a curl error message
buffer to print out an error. But they don't check the format of
info/refs at all, and skip over garbage and/or interpret garbage
as ...
| Sep 6, 11:19 am 2010 |
| Junio C Hamano | Re: [ANNOUNCE] gitolite now supports smart http
Nice ;-)
--
| Sep 5, 11:28 pm 2010 |
| Junio C Hamano | Re: [PATCH/RFC] Restructure some of the checkout opts.
Correct. I do not think they are outside the structure because they are
overlooked.
They simply do not make sense outside the context of "builtin/checkout.c"
where "struct checkout" is used (e.g. what would patch-mode possibly mean
in the context of "builtin/apply" where the struct is used to check out a
path that is not checked out to the working tree). Moving them into the
structure would thus make no sense and _will_ confuse people.
--
| Sep 5, 11:25 pm 2010 |
| Elijah Newren | Re: [PATCH 00/17] Narrow clone v3 (was subtree clone)
Ah, thanks for the reminder. I probably should have mentioned that I
tried master and next too and had similar conflicts (I believe from
some of AEvar's testing changes in master modifying the makefile in
nearby locations, among other things). But in any event, I'm in good
shape now.
I might have been able to make progress too, if I weren't being
distracted from sparse clones by this rename+D/F conflict problem
(though I think I've got it licked now...)
Elijah
--
| Sep 6, 1:40 pm 2010 |
| Elijah Newren | Re: [PATCH 00/17] Narrow clone v3 (was subtree clone)
Hi,
So, I downloaded your patches and even made sure to sort them
appropriately to fix the order, but I'm getting conflicts trying to
You're too modest; your comparison simply omitted some of the areas
where your series shines, such as the get_pathspec fixes (my stuff was
broken and much less complete), merge support, and nicer
fetch/push/clone support. You also had some other nice touches
(documentation updates, new rev-parse flag) that may not have been a
big deal, but they're still ...
| Sep 5, 10:17 pm 2010 |
| Nguyen Thai Ngoc Duy | Re: [PATCH 00/17] Narrow clone v3 (was subtree clone)
b5442ca (was master in Aug 24) with en/object-list-with-pathspec
applied on top. Sorry I don't want to change my base too often so it's
Well, looking forward to your fake commit implementation. I think it's
more or less the same as graft.
--
Duy
--
| Sep 5, 10:24 pm 2010 |
| Sverre Rabbelier | Re: [PATCH 00/17] Narrow clone v3 (was subtree clone)
Heya,
It's considered best practice to base your patches on master if
possible. You should only base them on next if you rely on a
particular series that has already landed there. You should never base
your patches on pu itself, on a topic in pu perhaps, but never on pu.
--
Cheers,
Sverre Rabbelier
--
| Sep 6, 1:29 pm 2010 |
| Junio C Hamano | Re: [PATCH] Add test-string-list.c
Quote Documentation/CodingGuidelines here, too. And use of these headers
is not merely "niceties"--some exotic platforms tend to want standard
system headers in particular inclusion order and what git-compat-util.h
* this may be built but nothing exercises it. Is it worth adding
tNNNN-run-string-list-test.sh for some value of NNNN?
I tend to agree with your second point and have a moderately negative
feeling against the patch. An addition to API documentation like you
suggested ...
| Sep 5, 11:12 pm 2010 |
| Thiago Farina | Re: [PATCH] Add test-string-list.c
I read it, but I'm not sure how to do this. Maybe you could point me
It is basic, so anyone can read it, and say "Oh, I can do this.".
Looking through the code maybe not so easy.
It can be expanded later by anyone to test many other things though.
So, why not? (Is it so bad to not have it at all?).
--
| Sep 6, 4:48 pm 2010 |
| =?UTF-8?q?Nguy=E1=BB ... | [PATCH 0/4] en/object-list-with-pathspec update
Yes, please. And I'd rather see it done sooner than later, before
tree_entry_interesting() usage is spread over the place.
Elijah Newren (2):
Add testcases showing how pathspecs are ignored with rev-list
--objects
Make rev-list --objects work together with pathspecs
Nguyễn Thái Ngọc Duy (2):
tree-walk: copy tree_entry_interesting() as-is from tree-diff.c
tree-walk: actually move tree_entry_interesting() to tree-walk.c
list-objects.c | 25 ++++++++++
revision.c ...
| Sep 5, 9:47 pm 2010 |
| Elijah Newren | Re: [RFC PATCH 07/15] cache_tree_update(): Capability to ...
Hmm..maybe before I get ahead of myself, I should back up for a
second. Which way do we think is better -- handling this in
cache_tree_update() or doing a fixup in commit_tree()? If the latter,
then I should just drop my 7/15 and 8/15 for your 13/17 and 14/17. If
the former, then it makes sense to look into this change you suggest.
In that case, we'd probably keep my 7/15 but drop 8/15 for patch(es)
that implement your idea above. But you're more familiar with the
index format than I am and ...
| Sep 5, 9:42 pm 2010 |
| Elijah Newren | Re: [PATCH 2/4] tree-walk: copy tree_entry_interesting() ...
Why copy instead of move?
--
| Sep 6, 8:22 am 2010 |
| Nguyen Thai Ngoc Duy | Re: [PATCH 2/4] tree-walk: copy tree_entry_interesting() ...
Right. I wanted to keep it in buildable state at anytime so I made
zero changes to tree-diff.c. But you're right, that should be a move
and make sure the code builds.
--
Duy
--
| Sep 6, 3:09 pm 2010 |
| Nguyen Thai Ngoc Duy | Re: [RFC PATCH 01/15] README-sparse-clone: Add a basic w ...
Hmm.. just got a fresh alt-git.git from repo.or.cz and did
narrow/sparse clone from that. "git clone" reported 16.27MB for both
narrow/sparse version.
--
Duy
--
| Sep 5, 8:14 pm 2010 |
| =?UTF-8?q?Nguy=E1=BB ... | [PATCH 3/4] tree-walk: actually move tree_entry_interest ...
This function can be potentially used in more places than just
tree-diff.c. This patches removes struct diff_options dependency from
the function, and moves it to tree-walk.c.
No functionality change intended.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
tree-diff.c | 121 ++---------------------------------------------------------
tree-walk.c | 25 +++++-------
tree-walk.h | 3 +
3 files changed, 17 insertions(+), 132 deletions(-)
diff --git a/tree-diff.c ...
| Sep 5, 9:47 pm 2010 |
| =?UTF-8?q?Nguy=E1=BB ... | [PATCH 2/4] tree-walk: copy tree_entry_interesting() as ...
Just a straight copy. The function is not used anywhere. It is to
separate changes that will be made to this function in the next patch.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
tree-walk.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 115 insertions(+), 0 deletions(-)
diff --git a/tree-walk.c b/tree-walk.c
index a9bbf4e..bc83fa3 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -2,6 +2,7 @@
#include "tree-walk.h"
#include ...
| Sep 5, 9:47 pm 2010 |
| Nguyen Thai Ngoc Duy | Re: [RFC PATCH 07/15] cache_tree_update(): Capability to ...
The former makes more sense. I still keep an eye on remote merge
support. Think of this case: you request a remote merge and have a
completely new base tree, different from HEAD. Then you get some
conflicts inside narrow/sparse area. By the time you resolve all
conflicts and are about to commit, where do you get the base tree?
It could follow the same way merge does, store it in a file in
$GIT_DIR, similar to $GIT_DIR/MERGE_HEAD, and make "git commit" pick
it up. Or just store it in index. ...
| Sep 5, 10:02 pm 2010 |
| =?UTF-8?q?Nguy=E1=BB ... | [PATCH 1/4] Add testcases showing how pathspecs are igno ...
From: Elijah Newren <newren@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
No changes.
t/t6000-rev-list-misc.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
create mode 100755 t/t6000-rev-list-misc.sh
diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh
new file mode 100755
index ...
| Sep 5, 9:47 pm 2010 |
| =?UTF-8?q?Nguy=E1=BB ... | [PATCH 4/4] Make rev-list --objects work together with p ...
From: Elijah Newren <newren@gmail.com>
When traversing commits, the selection of commits would heed the list of
pathspecs passed, but subsequent walking of the trees of those commits
would not. This resulted in 'rev-list --objects HEAD -- <paths>'
displaying objects at unwanted paths.
Have process_tree() call tree_entry_interesting() to determine which paths
are interesting and should be walked.
Naturally, this change can provide a large speedup when paths are specified
together with ...
| Sep 5, 9:47 pm 2010 |
| Elijah Newren | Re: [PATCH 3/4] tree-walk: actually move tree_entry_inte ...
Thanks for working on this. I like having the declaration of
tree_entry_interesting() moved to tree_walk.h, at the very least. The
change to make tree_entry_interesting() take an entry instead of a
tree_desc makes sense too.
I'm unsure about replacing the diff_options with paths + pathlens +
nr_paths -- that might be exposing too much implementation detail in
the API. In particular, I'm worried that if we try to add support for
negated pathspecs or globs or regexes to ...
| Sep 6, 8:31 am 2010 |
| Junio C Hamano | Re: [PATCH 3/4] tree-walk: actually move tree_entry_inte ...
If you are changing the API and structures around this area, you really
should aim to help us to support the globbing in diff-tree family just
like we do in ls-files family, so yes.
--
| Sep 6, 4:53 pm 2010 |
| Nguyen Thai Ngoc Duy | Re: [PATCH 3/4] tree-walk: actually move tree_entry_inte ...
You're right again. Perhaps something like struct exclude_list from dir.h?
struct pathspec_list {
int nr;
int alloc;
struct pathspec {
const char *path;
int pathlen;
int flags;
} **paths;
};
Hmm.. or just use struct exclude_list, with diff_options.path{s,len}
becoming exclude_list.base{,len}. exclude_list.pattern can be used for
glob/regex matching (if we are ever going to support that).
--
Duy
--
| Sep 6, 3:20 pm 2010 |
| Jonathan Nieder | Re: [PATCH 14/15] gettextize: git-revert split up "could ...
(+cc: Christian)
Right, parts of speech can be a pain. So:
An idea (it may or may not be a good one ;-)): what if we made the gettext
poison into an automatically generated .po file? Then testing poison
would be a special case of running tests with an arbitrary locale:
$ TEST_LANGUAGE=poison prove t[0-9]*.sh
and this test prerequisite could be more intuitively named LOCALE_C or
similar.
--
| Sep 6, 11:55 am 2010 |
| Jonathan Nieder | Re: [PATCH 15/15] gettextize: git-shortlog basic messages
For what it's worth:
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Thanks.
--
| Sep 6, 11:41 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 12/15] gettextize: git-revert mark the "me" varia ...
The "me" variable is used in many later messages to indicate whether
we're using revert or cherry-pick. Mark it for translation for later
use. Also leave a TRANSLATORS message explaining what these are for.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/revert.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index ece0c0f..2f319f8 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -552,7 +552,9 @@ ...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 04/15] gettextize: git-clean clean.requireForce m ...
Split up the "clean.requireForce set/defaults to true..." die()
message to make it easier to translate.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/clean.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index 10dde87..642d767 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -78,8 +78,12 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
die(_("-x and -X cannot be used ...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 07/15] gettextize: git-gc "Auto packing the repos ...
Split up the "Auto packing the repository" message into quiet and
verbose variants to make translation easier.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/gc.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/builtin/gc.c b/builtin/gc.c
index 05aed1f..74e77cb 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -216,13 +216,13 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
*/
if (!need_to_gc())
return ...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 06/15] gettextize: git-gc basic messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/gc.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/gc.c b/builtin/gc.c
index c304638..05aed1f 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -60,7 +60,7 @@ static int gc_config(const char *var, const char *value, void *cb)
if (value && strcmp(value, "now")) {
unsigned long now = approxidate("now");
if (approxidate(value) >= now)
- return error("Invalid %s: '%s'", ...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 08/15] gettextize: git-notes basic commands
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/notes.c | 108 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/builtin/notes.c b/builtin/notes.c
index fbc347c..d171f6f 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -119,13 +119,13 @@ static void write_commented_object(int fd, const unsigned char *object)
show.err = 0;
show.git_cmd = 1;
if (start_command(&show))
- die("unable to ...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 15/15] gettextize: git-shortlog basic messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/shortlog.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 2135b0d..f2cfe97 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -158,7 +158,7 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit)
buffer = eol;
}
if (!author)
- die("Missing author: %s",
+ die(_("Missing author: %s"),
...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 11/15] gettextize: git-revert basic messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/revert.c | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 4b47ace..ece0c0f 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -79,7 +79,7 @@ static void parse_args(int argc, const char **argv)
OPT_END(),
};
if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra))
- die("program ...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 13/15] gettextize: git-revert messages using the ...
Mark messages that used the "me" variable for translation. The
potential values of the variable had already been marked using N_(),
so we can use _(me) here.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/revert.c | 14 +++++++-------
t/t3501-revert-cherry-pick.sh | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 2f319f8..8dff244 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ ...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 00/15] [REDO CONTINUE] Add gettext support to Git
Here's more work on top of my existing 63 patch series, bringing it to
78 patches in total.
With this all of the 'mainporcelain common' *and* 'mainporcelain' in
command-list.txt has been made translatable, aside from these
shellscripts:
git-am mainporcelain
git-bisect mainporcelain common
git-pull mainporcelain common
git-rebase mainporcelain ...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 10/15] gettextize: git-notes "Refusing to %s note ...
The first %s in "Refusing to %s notes in %s" is one of "git notes
ACTION". So we need to mark those actions for translation and later
use _().
Also add a TRANSLATORS comment explaining to translators what the
first %s means.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/notes.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/builtin/notes.c b/builtin/notes.c
index fe58a41..2b417d7 100644
--- a/builtin/notes.c
+++ ...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 05/15] gettextize: git-describe basic messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/describe.c | 36 ++++++++++++++++++------------------
t/t6120-describe.sh | 2 +-
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/builtin/describe.c b/builtin/describe.c
index 43caff2..616d405 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -202,13 +202,13 @@ static void display_name(struct commit_name *n)
if (n->prio == 2 && !n->tag) {
n->tag = lookup_tag(n->sha1);
if (!n->tag ...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 14/15] gettextize: git-revert split up "could not ...
Split up the "could not %s %s... %s" message into "could not revert
%s... %s" and "could not apply %s... %s". This makes it easier for
translators to understand the message.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/revert.c | 5 +++--
t/t3507-cherry-pick-conflict.sh | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 8dff244..7157ee1 100644
--- a/builtin/revert.c
+++ ...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 09/15] gettextize: git-notes GIT_NOTES_REWRITE_MO ...
Use sprintf format for the error message that's displayed if
GIT_NOTES_REWRITE_MODE is invalid, and leave a note in a TRANSLATORS
comment indicating what the message means.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/notes.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/builtin/notes.c b/builtin/notes.c
index d171f6f..fe58a41 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -371,8 +371,10 @@ struct notes_rewrite_cfg ...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 03/15] gettextize: git-clean basic messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/clean.c | 20 ++++++++++----------
t/t7012-skip-worktree-writing.sh | 4 ++--
t/t7300-clean.sh | 6 +++---
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index b508d2c..10dde87 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -75,7 +75,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
dir.flags |= ...
| Sep 6, 5:21 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 02/15] gettextize: git-bundle basic messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/bundle.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/bundle.c b/builtin/bundle.c
index 80649ba..f92970f 100644
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -44,7 +44,7 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
close(bundle_fd);
if (verify_bundle(&header, 1))
return 1;
- fprintf(stderr, "%s is okay\n", bundle_file);
+ fprintf(stderr, _("%s ...
| Sep 6, 5:21 am 2010 |
| Jonathan Nieder | Re: [PATCH 13/15] gettextize: git-revert messages using ...
(+cc: Christian, de facto cherry-pick maintainer)
Ah, now I understand better. Would it be possible to squash this
Not good, in my opinion. The dialogue ought to look like this, I think:
$ git cherry-pick astermay
...
Likewise.
With the exceptions mentioned above,
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Thanks.
--
| Sep 6, 11:50 am 2010 |
| Jonathan Nieder | Re: [PATCH 12/15] gettextize: git-revert mark the "me" v ...
What good does it do to translate it? The command name is the same
Unrelated question: Are reflog actions supposed to be translated? (I
have not thought about that carefully.)
--
| Sep 6, 11:45 am 2010 |
| =?UTF-8?q?=C3=86var= ... | [PATCH 01/15] gettextize: git-archive basic messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/archive.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/builtin/archive.c b/builtin/archive.c
index 6a887f5..b14eaba 100644
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -14,10 +14,10 @@ static void create_output_file(const char *output_file)
{
int output_fd = open(output_file, O_CREAT | O_WRONLY | O_TRUNC, 0666);
if (output_fd < 0)
- die_errno("could not create archive ...
| Sep 6, 5:21 am 2010 |
| Ævar Arnfjörð Bjarmason | Re: [PATCH 12/15] gettextize: git-revert mark the "me" v ...
Not all uses of it are references to git-%s, e.g. in the next patch:
die(_("Your local changes would be overwritten by %s.\n"), _(me));
But maybe it's used in enough contexts for it to be useless to
translate it like this, i.e. we'll have to fix it later, but we'll see
In this updated series I've explicitly reverted patches that
(accidentally) translated some of the reflog.
I'm only translating things which'll be viewed by human eyes, and
human eyes alone. That doesn't apply to the ...
| Sep 6, 1:06 pm 2010 |
| Ævar Arnfjörð Bjarmason | Re: [PATCH 14/15] gettextize: git-revert split up "could ...
The issue with that is that gettext depends on setlocale(), which
requires a *valid* locale. This is why I skip the t/lib-gettext.sh
tests unless `locale -a` says is_IS is there, because even if we
compile is.po using it won't work without the locale.
So to do this we'd have steal some locale.
Also, the set of tests we want to skip under POISON (i.e. automated
garbage) is slightly different from the tests we want to skip under
TEST_LOCALE=, because some of those tests are checking for the ...
| Sep 6, 1:25 pm 2010 |
| Jonathan Nieder | Re: [PATCH 12/15] gettextize: git-revert mark the "me" v ...
Right, forget about this comment. Maybe this patch should be squashed
Thanks for explaining.
--
| Sep 6, 1:08 pm 2010 |
| Ævar Arnfjörð Bjarmason | Re: [PATCH 13/15] gettextize: git-revert messages using ...
Thanks. In most cases I haven't been CC-ing people,
a) because I'd probably end up CC-ing everyone who ever touched git
b) the nature of the changes probalby doesn't especially benefit from
me bothering all these people. But maybe that's the wrong assumption.
And now I see the reply I just sent off was useless, oh well, that's
what I get for reading things sequentially :)
Sure, it can be squashed. I'm just trying to keep things as granular
I don't know if all of the above hold ...
| Sep 6, 1:12 pm 2010 |
| Tilo Schwarz | Re: [PATCH 1/2] po/de.po: add German translation
On Mon, 06 Sep 2010 18:24:58 +0200, Jens Lehmann <Jens.Lehmann@web.de>
Full Ack again! Many german IT people use many english special terms daily
(like compiler, linker, terminal, interrupt). Normally the translation of
the special terms generates confusion all over the place. That's why I
also start git-gui or gitk only in english (and the manpages too, by the
way).
Thus the git special terms should not be translated, even though I might
be helpful to have a glossary which ...
| Sep 6, 12:58 pm 2010 |
| Ævar Arnfjörð Bjarmason | Re: [PATCH 1/2] po/de.po: add German translation
As noted on IRC this would also be flagged by a compile error if we
were using `msgfmt --check` in the Makefile:
- $(QUIET_MSGFMT)$(MSGFMT) -o $@ $<
+ $(QUIET_MSGFMT)$(MSGFMT) --check -o $@ $<
I'll add that along with some other planned fixes after Junio pulls
the outstanding stuff we have queued up.
It'll break compatibility with Solaris gettext. There are ways to work
around that, but I think we should just drop support for it
anyway. GNU gettext is needed anyway if we want ...
| Sep 6, 10:06 am 2010 |
| Jan Krüger | Re: [PATCH 1/2] po/de.po: add German translation
Hi Thomas,
thanks for your comments so far. I pretty much agree with all of your
thoughts, so below I'm going to focus on those where I have something
That's me being careless. I will add an additional check to my workflow
This was one of the more difficult things to decide on while
translating. Both are difficult to translate into something that
"flows", and individually I think both work okay the way I decided to
translate them (but see the next paragraph), but of course it would ...
| Sep 6, 9:09 am 2010 |
| Jens Lehmann | Re: [PATCH 1/2] po/de.po: add German translation
Full Ack, I can't find my way through git-gui or gitk when I forget
to start them with "LC_ALL=C" (And when you use git mainly via these
guis, you will have to learn /every/ git command again when you
start using the command line). IMHO terms that have a special in git
should not be translated, so I would even vote for leaving terms like
"fetch", "fast-forward" and maybe even "tracking-branch" as they are.
But however, translations should be consistent between gitk/git-gui
and the command ...
| Sep 6, 9:24 am 2010 |
| Ævar Arnfjörð Bjarmason | Re: [PATCH 1/2] po/de.po: add German translation
git-gui/po/glossary/git-gui-glossary.txt also has something like
that. It would be useful to merge this and that into some
Something msgfmt --check wouldn't flag, but running the test suite
I think Fast-forward should be changed to "Update without merge" in
the English version, although that might not be viable at this point.
It would probably improve Git for newbies a lot if we clearly told
them during every "git pull" that whether we did a merge or not by
using wording to that effect ...
| Sep 6, 10:15 am 2010 |
| Thomas Rast | Re: [PATCH 1/2] po/de.po: add German translation
Hi Jan
First off thanks for taking on the mammoth job of translating this. I
skimmed the entire file, and apart from the comments below everything
looks sane, though I may of course have missed something.
I already like the translation way better than the one that
gitk/git-gui have, because it doesn't try so hard to translate *every*
term. Maybe it would help to make a little translation glossary,
here's a start:
bare repository Lager-Repository
blob object ...
| Sep 6, 8:41 am 2010 |
| Elijah Newren | Re: cherry-picking a commit clobbers a file which is a d ...
It's a bug in the recursive merge strategy (i.e. the default one), and
affects current master as well as 1.7.0.4. The resolve strategy
(which can be used with cherry-pick since 1.7.2) handles this
correctly:
$ git cherry-pick --strategy=resolve branch1
Trying simple merge.
Simple merge failed, trying Automatic merge.
[master e95e377] added falafel
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 falafel
I'll investigate.
Elijah
--
| Sep 6, 8:20 am 2010 |
| Nick | Re: cherry-picking a commit clobbers a file which is a d ...
I've been Warnocked. Can anyone point me in the right direction?
--
| Sep 6, 2:50 am 2010 |
| Elijah Newren | [PATCH 0/3] Fix resolvable rename + D/F conflict testcases
This fixes an issue reported by Nick, as well as a closely related
issue in the handling of rename + directory/file conflicts,
particularly where a file on one side of the rename is a directory
name on the other side of the merge.
Elijah Newren (3):
t3509: Add rename + D/F conflict testcases that recursive strategy
fails
merge-recursive: Small code cleanup
merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
merge-recursive.c | 50 ...
| Sep 6, 1:47 pm 2010 |
| Junio C Hamano | Re: [PATCH 2/3] merge-recursive: Small code cleanup
Good thinking.
The real polishing of this series will happen after 1.7.3 anyway, so for
now a series forking from ks/recursive-rename-add-identical (which I
expect to be in 1.7.3) is fine.
Thanks.
--
| Sep 6, 4:49 pm 2010 |
| Elijah Newren | Re: [PATCH 2/3] merge-recursive: Small code cleanup
Hmmm...should I have split this off from the rest of the series (its
only relation is that it cleans up code that made it harder for me to
find the real fix)? If I did that, I could rebase the rest of the
series on maint...
--
| Sep 6, 2:25 pm 2010 |
| Elijah Newren | Re: [PATCH 0/3] Fix resolvable rename + D/F conflict testcases
I forgot to mention; this patch series is based on next, since it
--
| Sep 6, 1:49 pm 2010 |
| Elijah Newren | [PATCH 1/3] t3509: Add rename + D/F conflict testcases t ...
When one side of a file rename matches a directory name on the other side,
the recursive merge strategy will fail. This is true even if the merge is
trivially resolvable.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
t/t3509-cherry-pick-merge-df.sh | 66 +++++++++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh
index a5ccdbf..eb5826f 100755
--- ...
| Sep 6, 1:47 pm 2010 |
| Elijah Newren | [PATCH 2/3] merge-recursive: Small code cleanup
process_renames() had a variable named "stage" and derived variables
src_other and dst_other whose purpose was not entirely clear to me. Make
the name of stage slightly more descriptive and add a brief comment
explaining what is occurring.
Also, in d5af510 (RE: [PATCH] Avoid rename/add conflict when contents are
identical 2010-09-01), a separate if-block was added to provide a special
case for the rename/add conflict case that can be resolved (namely when
the contents on the destination side ...
| Sep 6, 1:47 pm 2010 |
| Elijah Newren | [PATCH 3/3] merge-recursive: D/F conflicts where was_a_d ...
In merge-recursive.c, whenever there was a rename where a file name on one
side of the rename matches a directory name on the other side of the merge,
then the very first check that
string_list_has_string(&o->current_directory_set, ren1_dst)
would trigger forcing it into marking it as a rename/directory conflict.
However, if the path is only renamed on one side and a simple three-way
merge between the separate files resolves cleanly, then we don't need to
mark it as a rename/directory ...
| Sep 6, 1:47 pm 2010 |
| Michael J Gruber | [PATCHv2] install-webdoc: quell diff output on stdout
When installing html-doc, install-webdoc.sh compares the installed html
with the version to be installed using diff. Currently, the diff output
fills up stdout.
install-webdoc.sh actually uses $DIFF, and is the only user. Redefine
DIFF from "diff" to "diff -q" to quell the output which is a more useful
general default and in line with the default "QUIET" make rules.
This can be easily overriden by prefixing make with "DIFF=diff" or
putting this in config.mak.
Signed-off-by: Michael J ...
| Sep 5, 11:18 pm 2010 |
| Junio C Hamano | Re: [PATCHv2] install-webdoc: quell diff output on stdout
I think you broke "tNNNN-X.sh -v"; isn't $DIFF used in t/ scripts
everywhere?
Even if install-webdoc.sh were the sole user (which is not), please don't
do it this way. Instead, introduce "SHOW_PATCH_WHILE_INSTALLING_WEBDOC"
or something, and run "$DIFF" with "-q" when it is not set.
Otherwise you would forbid people from using $DIFF for its intended
purpose: name a diff binary that can be used that is different from a
crappy diff your platform gives you by default.
--
| Sep 6, 12:07 am 2010 |
| Michael J Gruber | Re: [PATCHv2] install-webdoc: quell diff output on stdout
Um, OK, sorry. I grepped for it but not everywhere it seems. I'll be
partially online only this week but I'll try to come up with something
agreeable.
Michael
--
| Sep 6, 6:24 am 2010 |
| Nicolas Pitre | Re: git pack/unpack over bittorrent - works!
Well, either you'll come to the same conclusion as the other people
before you (myself included), or you'll surprise us all with some clever
solution. But that part is up to you. In either cases, I think it is a
good thing if I can help you grasp the technical limitations and issues
faster so you don't waste your time on false assumptions.
Nicolas
| Sep 5, 5:05 pm 2010 |
| Luke Kenneth Casson ... | Re: git pack/unpack over bittorrent - works!
i kinda get it - but i realise that's not good enough: i need to be
mmm packs not being to do with object enumeration i get. i
understand that .idx files contain "lists of objects" which isn't the
same thing (and also happen to contain pointers/offsets to the objects
of its associated .pack)
at some point i'd really like to know what the object list is (not
the objects themselves) that comes out of "git pack-objects --thin"
ok - this tells me (and it's confirmed, below) that ...
| Sep 6, 6:23 am 2010 |
| Junio C Hamano | Re: git pack/unpack over bittorrent - works!
I didn't want to get into this discussion, but where in the above picture
does the usual "want/ack" exchange fit?
The biggest trouble before object transfer actually happens is that the
sending end needs to find a set of commits that are known to exist at the
receiving end, but it needs to do that starting from a state where the tip
commits the receiving end has are not known by it. That is why the
receiver must go back in his history and keep asking the sender "I have
this, this, this, ...
| Sep 6, 4:34 pm 2010 |
| Nicolas Pitre | Re: git pack/unpack over bittorrent - works!
You need to feed 'git pack-objects' a list of objects in the first
place for it to pack anything. So you must have that list even before
pack-objects can produce any output. And that list is usually generated
by 'git rev-list'. So, typically, you'd do:
git rev-list --objects <commit_range> | git pack-objects foo
But these days the ability to enumerate objects was integrated into
pack-objects directly, so you can do:
echo "<commit_range>" | git pack-objects --revs foo
Well, ...
| Sep 6, 9:51 am 2010 |
| Nicolas Pitre | Re: git pack/unpack over bittorrent - works!
Before object enumeration obviously. But I think that Luke has enough
to play with already by only assuming the easy case for now. If Git P2P
is to be viable, it has to prove itself at least with the easy case
first.
Nicolas
--
| Sep 6, 4:57 pm 2010 |
| Luke Kenneth Casson ... | Re: git pack/unpack over bittorrent - works!
nicolas, thank you very brief reply (busy for 2 days)
ah _haa_ - thank you! ok, so i have to create a pack-object-like
format, putting the object type at the beginning of the format, then
put the contents of "git cat-file" after it.
so - apologies, will be dealing with some work-related stuff for a
day or so. thank you for everything so far nicolas.
l.
--
| Sep 6, 3:33 pm 2010 |
| =?UTF-8?q?Nguy=E1=BB ... | [PATCH] doc: technical details about the index file format
This bases on the original work by Robin Rosenberg.
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
"nanoseconds (modulo 1G)" is changed to "nanosecond fractions"
Documentation/technical/index-format.txt | 144 ++++++++++++++++++++++++++++++
1 files changed, 144 insertions(+), 0 deletions(-)
create mode 100644 Documentation/technical/index-format.txt
diff --git a/Documentation/technical/index-format.txt ...
| Sep 6, 3:37 am 2010 |
| Geoff Russell | Re: Large pack causes git clone failures ... what to do?
I've moved the "master" repository to a faster machine with plenty of
memory and all the problems have gone away. I was making wrong
guesses about the cause. A fresh clone gives a huge pack, but no problems
and everything runs much better
Thanks for your help.
Geoff.
--
| Sep 5, 5:34 pm 2010 |
| Casey Dahlin | Re: [RFC PATCH] Introduce git-hive
Plan is to kill hive-fetch in favor of a fetch helper so the ordinary git
retrieval commands may be used.
--CJD
--
| Sep 5, 7:25 pm 2010 |
| Casey Dahlin | Re: [RFC PATCH] Introduce git-hive
I believe Luke outlined some issues earlier, particularly the difficulty of
getting avahi on Windows. If others would like to continue that flame without
Good to know :)
--CJD
--
| Sep 5, 7:28 pm 2010 |
| Marcus Comstedt | Re: Fix for normalization of foreign idents
Hi.
Was this patch simply forgotten, or are there some remaining
concerns about it?
Should I submit a new patch which simply fixes the inconsistency
which breaks checkout, and leaves the removal of foreign idents
on commit to user interaction or hook scripts, as suggested by
Jonathan? That would at least restore deterministic behavior...
// Marcus
--
| Sep 6, 2:42 am 2010 |
| Jonathan Nieder | Re: Fix for normalization of foreign idents
Hi Marcus,
I assume it is just that no one using the $ident$ feature took a
look at it, which leaves us without a sanity-check that it
consistently works and improves things.
If you have the time, a test and documentation might help (the former
plays the role of an artificial user, who can describe the feature and
That doesn't sound necessary to me.
--
| Sep 6, 2:07 pm 2010 |
| previous day | today | next day |
|---|---|---|
| September 5, 2010 | September 6, 2010 | September 7, 2010 |
