On Wed, Oct 24, 2012 at 12:21 PM, Uri Moszkowicz wrote:
> Continuing to work on improving clone times, using "git gc
> --aggressive" has resulted in a large number of tags combining into a
> single file but now I have a large number of files in the objects
> directory - 131k for a ~2.7GB repositor
On Wed, Oct 24, 2012 at 08:33:15AM +0200, Johannes Sixt wrote:
> Am 10/24/2012 0:35, schrieb Jeff King:
> > -test_expect_success 'non-match value' \
> > - 'test wow = $(git config --get nextsection.nonewline !for)'
> > +test_expect_success 'non-match value' '
> > + test wow = $(git config --ge
All looked sane. Thanks for a pleasant read!
-- Hannes
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Am 10/24/2012 0:35, schrieb Jeff King:
> -test_expect_success 'non-match value' \
> - 'test wow = $(git config --get nextsection.nonewline !for)'
> +test_expect_success 'non-match value' '
> + test wow = $(git config --get nextsection.nonewline !for)
> +'
Here's a case you forgot to update
Am 10/24/2012 0:23, schrieb Jeff King:
> For the fold-on-rebase idea, I'd think you would want something similar,
> like setting rebase.foldNotes to "foo" to say "refs/notes/foo contains
> pseudo-headers that should be folded in like a signed-off-by".
If you are rebasing anyway, you can already us
* Linus Torvalds wrote:
> On Wed, Oct 24, 2012 at 12:25 AM, Thomas Gleixner wrote:
> >>
> >> It is spelled:
> >>
> >> git notes add -m SHA1
> >
> > Cool!
>
> Don't use them for anything global.
>
> Use them for local codeflow, but don't expect them to be
> distributed. It's a separate "fl
Continuing to work on improving clone times, using "git gc
--aggressive" has resulted in a large number of tags combining into a
single file but now I have a large number of files in the objects
directory - 131k for a ~2.7GB repository. Any way to reduce the number
of these files to speed up clones
On Wed, Oct 24, 2012 at 1:30 AM, Uri Moszkowicz wrote:
> I have a large repository which I ran "git gc --aggressive" on that
> I'm trying to clone on a local file system. I would expect it to
> complete very quickly with hard links but it's taking about 6min to
> complete with no checkout (git clo
On Wed, Oct 24, 2012 at 4:56 AM, Al Viro wrote:
>
> How about git commit --allow-empty, with
> "belated ACK for
Don't bother. It's not that important, and it's just distracting.
It's not like this is vital information. If you pushed it out without
the ack, it's out without the ack. Big deal.
On Wed, Oct 24, 2012 at 04:02:49AM +0300, Linus Torvalds wrote:
> On Wed, Oct 24, 2012 at 12:25 AM, Thomas Gleixner wrote:
> >>
> >> It is spelled:
> >>
> >> git notes add -m SHA1
> >
> > Cool!
>
> Don't use them for anything global.
>
> Use them for local codeflow, but don't expect them to b
On Wed, Oct 24, 2012 at 12:25 AM, Thomas Gleixner wrote:
>>
>> It is spelled:
>>
>> git notes add -m SHA1
>
> Cool!
Don't use them for anything global.
Use them for local codeflow, but don't expect them to be distributed.
It's a separate "flow", and while it *can* be distributed, it's not
goi
On Tue, Oct 23, 2012 at 08:46:47PM -0400, John Szakmeister wrote:
> On Tue, Oct 23, 2012 at 10:13 AM, Ævar Arnfjörð Bjarmason
> wrote:
> [snip]
> > And git config --get foo.bar will give you:
> >
> > $ git config -f /tmp/test --get foo.bar
> > one
> > error: More than one value for th
On Tue, Oct 23, 2012 at 10:13 AM, Ævar Arnfjörð Bjarmason
wrote:
[snip]
> And git config --get foo.bar will give you:
>
> $ git config -f /tmp/test --get foo.bar
> one
> error: More than one value for the key foo.bar: two
> error: More than one value for the key foo.bar: three
>
>
[PATCH 1/2] Teach --recursive to submodule sync
[PATCH 2/2] Add tests for submodule sync --recursive
This series implements and tests git submodule sync --recursive
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordom
Signed-off-by: Phil Hord
---
t/t7403-submodule-sync.sh | 55 +--
1 file changed, 53 insertions(+), 2 deletions(-)
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 524d5c1..94e26c4 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t
The submodule sync command was somehow left out when
--recursive was added to the other submodule commands.
Teach sync to handle the --recursive switch by recursing
when we're in a submodule we are sync'ing.
Change the report during sync to show submodule-path
instead of submodule-name to be cons
On Tue, Oct 23, 2012 at 10:57:57PM +0200, Jens Lehmann wrote:
> Am 22.10.2012 14:37, schrieb W. Trevor King:
> > but cloning a remote repository (vs. checking out a local branch)
> > seems to be baked into the submodule implementation. Should I be
> > thinking about generalizing git-submodule.sh,
Jonathan Nieder wrote:
> Until Subversion 1.7 (more precisely r873487), the standard way to
> canonicalize a URI was to call svn_path_canonicalize(). Use it.
>
> This saves "git svn" from having to rely on our imperfect
> reimplementation of the same. If the function doesn't exist or
> returns
git commit -S, --gpg-sign was mentioned in the program's help message,
but not in the manpage.
This adds an equivalent entry for the option in the manpage.
Signed-off-by: Tom Jones
---
On Sun, Oct 21, 2012 at 01:15:16PM -0700, Junio C Hamano wrote:
> Are you sure about this? The order [...]
Go
The git-config command has always implemented its own file
lookup and parsing order. This was necessary because its
duplicate-entry handling did not match the way git's
internal callbacks worked. Now that this is no longer the
case, we are free to reuse the existing parsing code.
This saves us a f
If git-config is asked for a single value, it will complain
and exit with an error if it finds multiple instances of
that value. This is unlike the usual internal config
parsing, however, which will generally overwrite previous
values, leaving only the final one. For example:
[set a multivar]
This is a refactor that will allow us to more easily tweak
the behavior for multi-valued variables, and it will
ultimately allow us to remove a lot git-config's custom code
in favor of the regular git_config code.
It does mean we're no longer streaming, and we're storing
more in memory for the --g
The get_value function has a goto label for cleaning up on
errors, but it only cleans up half of what the function
might allocate. Let's also clean up the key and regexp
variables there.
Note that we need to take special care when compiling the
regex fails to clean it up ourselves, since it is in
This is only called once per invocation, so it's not a major
leak, but it's easy to fix.
Signed-off-by: Jeff King
---
builtin/config.c | 4
1 file changed, 4 insertions(+)
diff --git a/builtin/config.c b/builtin/config.c
index e1c33e0..e660d48 100644
--- a/builtin/config.c
+++ b/builtin/co
We check that we can "--get-all" a multi-valued variable,
but we do not actually confirm that the output is sensible.
Doing so reveals that it works fine, but this will help us
ensure we do not have regressions in the next few patches,
which will touch this area.
Signed-off-by: Jeff King
---
t/t
This test checks that git-config fails for an ambiguous
"get", but we check the exact same thing 3 tests beforehand.
Signed-off-by: Jeff King
---
I update the matching test later in the series, and I didn't want to
have to do it twice.
t/t1300-repo-config.sh | 4
1 file changed, 4 deletion
The t1300 test script is quite old, and does not use our
modern techniques or styles. This patch updates it in the
following ways:
1. Use test_cmp instead of cmp (to make failures easier to
debug).
2. Use test_cmp instead of 'test $(command) = expected'.
This makes failures much eas
On Tue, Oct 23, 2012 at 04:13:44PM +0200, Ævar Arnfjörð Bjarmason wrote:
> > It fails a few tests in t1300, but it looks like those tests are testing
> > for the behavior we have identified as wrong, and should be fixed.
>
> I think this patch looks good.
Thanks. It had a few minor flaws (like a
On Tue, Oct 23, 2012 at 03:06:59PM -0700, Marc Gauthier wrote:
> Can a later commit be eventually be made to reference some set
> of notes added so far, so they become part of the whole history
> signed by the HEAD SHA1? hence pulled/pushed automatically as
> well. Otherwise do you not end up wi
On 2012-10-23 13:36, Jens Lehmann wrote:
Am 23.10.2012 21:16, schrieb Nahor:
Last issue, the branch that exists in your local repository may not
>> exist in someone else's repository, either because the branch is
>> purely local, or because it has a different name on the remote repo.
You'll a
From: "W. Trevor King"
This option allows you to record a submodule..branch option in
.gitmodules. Git does not currently use this configuration option for
anything, but users have used it for several things, so it makes sense
to add some syntactic sugar for initializing the value.
Current cons
On Tue, Oct 23, 2012 at 10:36:44PM +0200, Jens Lehmann wrote:
> Except recording the branch name might raise expectations about what git
> will do with it. And as far as this patch goes, git won't do anything
> with it (yet).
As Phil pointed out, doing anything with this variable is ambiguous:
On
On Tue, Oct 23, 2012 at 11:25:06PM +0200, Thomas Gleixner wrote:
> > The resulting notes are stored in a separate revision-controlled branch
>
> Which branch(es) is/are that ? What are the semantics of that?
They are stored in refs/notes/commits by default, but you can have
multiple notes refs i
On 2012-10-23 12:44, W. Trevor King wrote:
On Tue, Oct 23, 2012 at 12:16:22PM -0700, Nahor wrote:
On 2012-10-22 09:34, W. Trevor King wrote:
For instance, the module may later be updated to a commit in branch B
instead of branch A. Unless you remember to also update .gitmodule, you
have then inc
On Tue, Oct 23, 2012 at 03:44:36PM -0400, W. Trevor King wrote:
> On Tue, Oct 23, 2012 at 12:16:22PM -0700, Nahor wrote:
> > On 2012-10-22 09:34, W. Trevor King wrote:
> > For instance, the module may later be updated to a commit in branch B
> > instead of branch A. Unless you remember to also upd
On Tue, 23 Oct 2012, Jeff King wrote:
> On Tue, Oct 23, 2012 at 10:47:28PM +0200, Thomas Gleixner wrote:
>
> > I agree that this is a common issue. Acked-by/Reviewed-by mails come
> > in after the fact that the patch has been committed to an immutable
> > (i.e no-rebase mode) branch or if the cha
On Tue, Oct 23, 2012 at 10:09:46PM +0100, Catalin Marinas wrote:
> > It is spelled:
> >
> > git notes add -m SHA1
> >
> > The resulting notes are stored in a separate revision-controlled branch
> > and can be pushed and pulled like regular refs. Note, though, that the
> > default refspecs do no
On 23 October 2012 21:51, Jeff King wrote:
> On Tue, Oct 23, 2012 at 10:47:28PM +0200, Thomas Gleixner wrote:
>
>> I agree that this is a common issue. Acked-by/Reviewed-by mails come
>> in after the fact that the patch has been committed to an immutable
>> (i.e no-rebase mode) branch or if the ch
From: "W. Trevor King"
Use "-b " instead of "-b branch". This brings the usage
strings in line with other options, e.g. "--reference ".
Signed-off-by: W. Trevor King
---
Documentation/git-submodule.txt | 2 +-
git-submodule.sh| 2 +-
2 files changed, 2 insertions(+), 2 deletio
Am 22.10.2012 14:37, schrieb W. Trevor King:
> I have a bunch of branches in my repo (a, b, c, …), and I'd like to
> check them out into subdirectories of another branch (index). My
> initial inclination was to use something like
>
> $ git checkout index
> $ git branch
> a
> b
> c
On Tue, Oct 23, 2012 at 10:47:28PM +0200, Thomas Gleixner wrote:
> I agree that this is a common issue. Acked-by/Reviewed-by mails come
> in after the fact that the patch has been committed to an immutable
> (i.e no-rebase mode) branch or if the change in question already hit
> Linus tree.
>
> St
On Tue, 23 Oct 2012, Al Viro wrote:
> On Tue, Oct 23, 2012 at 01:30:26PM -0400, Chris Metcalf wrote:
>
> > I fetched the series from your arch-tile branch and built it, and it works
> > fine. It looks good from my inspection:
> >
> > Acked-by: Chris Metcalf
>
> Thanks; Acked-by applied, branch
On Tue, Oct 23, 2012 at 12:16:22PM -0700, Nahor wrote:
> On 2012-10-22 09:34, W. Trevor King wrote:
> For instance, the module may later be updated to a commit in branch B
> instead of branch A. Unless you remember to also update .gitmodule, you
> have then inconsistent information.
But you're e
Add Signed-off-by...
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
git pull --rebase does some clever tricks to find the base
for $upstream , but it forgets that we may not have any
branch at all. When this happens, git merge-base reports its
"usage" help in the middle of an otherwise successful
rebase operation, because git-merge is called with one too
few param
Am 23.10.2012 21:16, schrieb Nahor:
> On 2012-10-22 09:34, W. Trevor King wrote:
>> From: "W. Trevor King"
>>
>> This removes a configuration step if you're trying to setup Ævar's
>>
>>$ git submodule foreach 'git checkout $(git config --file
>> $toplevel/.gitmodules submodule.$name.branch) &
Recently git-status learned to display the state of the git
sequencer in long form to help the user remember an interrupted
command. This information is also useful in short form to
humans and scripts, but no option is available to boil it down.
Teach git-status to report the sequencer state in s
Updated per Matthieu's comments, adding Sign-off and fixing my prefix to have a
little "v2" on the end.
Sorry for the extra noise.
Phil
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.ker
On 2012-10-22 09:34, W. Trevor King wrote:
From: "W. Trevor King"
This removes a configuration step if you're trying to setup Ævar's
$ git submodule foreach 'git checkout $(git config --file $toplevel/.gitmodules
submodule.$name.branch) && git pull'
workflow from
commit f030c96d8643fa
Recently git-status learned to display the state of the git
sequencer in long form to help the user remember an interrupted
command. This information is also useful in short form to
humans and scripts, but no option is available to boil it down.
Teach git-status to report the sequencer state in s
I have a large repository which I ran "git gc --aggressive" on that
I'm trying to clone on a local file system. I would expect it to
complete very quickly with hard links but it's taking about 6min to
complete with no checkout (git clone -n). I see the message "Clining
into 'repos'... done." appear
That did the trick - thanks!
On Mon, Oct 22, 2012 at 5:46 PM, Andreas Schwab wrote:
>
> Uri Moszkowicz writes:
>
> > Perhaps Git should switch to a single-file block text or binary format
> > once a large number of tags becomes present in a repository.
>
> This is what git pack-refs (called by g
Matthieu Moy wrote:
> Phil Hord writes:
>
>> +merge a git-merge is in progress
>> +am a git-am is in progress
>> +rebase a git-rebase is in progress
>> +rebase-interactive a git-rebase--interactive is in progress
>> +cherry-pick
- target "html" creates html for all files in Documentation/howto and
Documentation/technical
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefi
This patch adds rules to the "html" taget in Documentation/Makefile to create
html
also for the new asciidoc files in Documentation/technical and
Documentation/howto
which were added in this topic.
---
Thomas
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a mes
On Mon, Oct 22, 2012 at 11:27 PM, Joey Jiao wrote:
> It looks like the client is waiting the pushing result status from
> server although by checking server side, the real object has already
> been upload succeed.
>
> Below is the log after adding time info.
> $ time git push -v ssh://git.qrd.qual
乙酸鋰 writes:
> Hi,
>
> Could you launch a separate program for HTTPS prompt like SSH_ASKPASS?
> This allows GUI programs to answer the trust or not, not via stdin.
Read about credential helpers, this is what they are meant for, and they
do launch separate programs.
--
Matthieu Moy
http://www-ve
Hi,
Could you launch a separate program for HTTPS prompt like SSH_ASKPASS?
This allows GUI programs to answer the trust or not, not via stdin.
Regards,
ch3cooli
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo i
On Mon, Oct 22, 2012 at 11:15 PM, Jeff King wrote:
> On Mon, Oct 22, 2012 at 05:55:00PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> I was hoping to write something like this:
>>
>> [user]
>> name = Luser
>> email = some-defa...@example.com
>> [include]
>> path = ~/.g
On Mon, Oct 22, 2012 at 08:37:14AM -0400, W. Trevor King wrote:
> but cloning a remote repository (vs. checking out a local branch)
> seems to be baked into the submodule implementation.
Perhaps --local would set submodule.$name.url to '.', and ome
combination of GIT_WORK_TREE, GIT_DIR, and object
The output of "git diff --stat", "git show --stat" and "git log" should be
translated to the local user language. The output of "git format-patch"
should not, however. Add localization where needed, and add a flag for
making sure that "format-patch"'s output remains in English.
This partially rev
When outputting a normal log, without having specified which date format
to use, we should output the current user locale's default format. Do this
by initializing LC_TIME properly and using strftime() to format the date.
---
date.c| 4 +++-
gettext.c | 1 +
strbuf.c | 10 ++
strbu
v/commits/fix-diff-translation-20121023-1.8.0
with an updated Swedish translation.
Peter Krefting (2):
Use localized date in log output
Localize diff and log output
builtin/apply.c | 2 +-
builtin/commit.c | 4 +--
builtin/log.c| 6 ++--
commit.h | 3 +-
date.c |
Angelo Borsotti writes:
> Hi Matthieu,
>
> the upstream branch can also be a local branch.
In this case, it's:
[branch "branch"]
remote = .
merge = refs/heads/master
which can arguably be considered as a special case of remote branch
whose location happens to be ".". But as sai
This change was already done by 0e615b252f3 (Matthieu Moy, Tue Nov 2
2010, Replace "remote tracking" with "remote-tracking"), but new
instances of remote tracking (without dash) were introduced in the
meantime.
Signed-off-by: Matthieu Moy
---
Here's the patch.
I'm not opposed to dropping complet
The --log-window-size parameter to git-svn fetch is undocumented.
Minimally describe what it does and why the user might change it.
Signed-off-by: Gunnlaugur Þór Briem
---
Documentation/git-svn.txt | 6 ++
1 file changed, 6 insertions(+)
diff --git a/Documentation/git-svn.txt b/Documentati
Well, after checked pushing directly to git which takes only 6
seconds. So it should be not a issue of git in c. But might be an
issue with jgit or gerrit.
2012/10/23 Joey Jiao :
> Hi Git Listeners,
> I'm facing one problem when pushing to git repository via gerrit port.
> Don't stop to look into
I just ran git pull, and it suggested that I should use `git branch
--set-upstream`. Yet when I used it, git-branch told me that the flag is
deprecated. Git version 1.8.0.
tom
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
Mo
Angelo Borsotti writes:
> Hello,
>
> the git merge man page, OPTIONS, ... states:
>
>"If no commit is given from the command line, and if
> merge.defaultToUpstream configuration variable is set, merge the
> remote tracking branches that the current branch is configured to use
> as its upstre
69 matches
Mail list logo
