I have been holding back this series during the RC phase but now I think
it is ready for another round. The most important changes:
* The API is using a singleton now. No need to pass in the cache
object anymore.
* Local configuration can be looked up by passing in the null_sha1
* We
David Turner dturner at twopensource.com writes:
$ cd [some existing git repo]
$ git git foo
WARNING: You called a Git command named 'git', which does not exist.
Continuing under the assumption that you meant 'init'
in 0.1 seconds automatically...
fatal: internal error: work tree has
This allows a reader to immediately know which options can be used and
what this parameter is about.
Signed-off-by: Heiko Voigt hvo...@hvoigt.net
---
Documentation/technical/api-hashmap.txt | 2 +-
diffcore-rename.c | 2 +-
hashmap.c | 2 +-
This submodule configuration cache allows us to lazily read .gitmodules
configurations by commit into a runtime cache which can then be used to
easily lookup values from it. Currently only the values for path or name
are stored but it can be extended for any value needed.
It is expected that
This is one step towards using the new configuration API. We just
extract these functions to make replacing the actual code easier.
Signed-off-by: Heiko Voigt hvo...@hvoigt.net
---
This refactoring is included in the series to make following the series easier
(and because it was one step I did).
We remove the extracted functions and directly parse into and read out
of the cache. This allows us to have one unified way of accessing
submodule configuration values specific to single submodules. Regardless
whether we need to access a configuration from history or from the
worktree.
We should not die when reading the submodule config cache since the user
might not be able to get out of that situation when the configuration is
part of the history.
We should handle this condition later when the value is about to be
used.
Signed-off-by: Heiko Voigt hvo...@hvoigt.net
---
David Turner dturner at twopensource.com writes:
(I am extremely unlikely to fix this bug myself, since it only arises in
very rare circumstances).
I see now that `git init foo` and `git git foo` (with git corrected
to init) behave differently. Is this the bug you're referring to?
--
To
On Thu, Jun 5, 2014 at 10:49 AM, David Turner dtur...@twopensource.com wrote:
fatal: internal error: work tree has already been set
Current worktree: /home/dturner/git
New worktree: /home/dturner/git/foo
This is the part you complain about, right? I think I might know
what's going on here. But
Hello,
How to you uninstall properly Git on a Mac? Unfortunately, it seems to not be
documented on your website…
Thanks for your help!
Romain
--
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
On 05/06/14 07:42, Heiko Voigt wrote:
On Wed, Jun 04, 2014 at 10:24:06AM -0700, Junio C Hamano wrote:
Chris Packham judge.pack...@gmail.com writes:
On 04/06/14 09:05, Junio C Hamano wrote:
Also, going --recursive when the user did not want is a lot more
expensive mistake to fix than not
From: Johannes Schindelin johannes.schinde...@gmx.de
Date: Wed, 2 Jun 2010 00:41:33 +0200
If HOME is not set, use $HOMEDRIVE$HOMEPATH
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
Signed-off-by: Stepan Kasal ka...@ucw.cz
---
Hello Karsten,
thanks for your explanation. There are
mingw.c defines several wrapper functionsi, like mingw_unlink().
These wrappers are deployed by macros like this:
#define unlink mingw_unlink
The function itself is preceded by #undef, leaving the wrapper out
of the game for the rest of mingw.c.
This was not probably intentional; for
On Thu, 2014-06-05 at 13:29 +0700, Duy Nguyen wrote:
On Thu, Jun 5, 2014 at 10:49 AM, David Turner dtur...@twopensource.com
wrote:
fatal: internal error: work tree has already been set
Current worktree: /home/dturner/git
New worktree: /home/dturner/git/foo
This is the part you complain
On 2014-06-05 10.03, Stepan Kasal wrote:
From: Johannes Schindelin johannes.schinde...@gmx.de
Date: Wed, 2 Jun 2010 00:41:33 +0200
If HOME is not set, use $HOMEDRIVE$HOMEPATH
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
Signed-off-by: Stepan Kasal ka...@ucw.cz
---
Kedves felhasználók e-mailben;
Túllépte 23432 box set
Web Service / Admin, és akkor nem lesz probléma a küldő és
fogadhat e-maileket, amíg újra ellenőrizni. Kérjük, frissítse kattintva
linkre, és töltse ki az adatokat, hogy ellenőrizze a számla
Kérjük, kövesse az alábbi linkre, és majd másolja és
Am 05.06.2014 10:03, schrieb Stepan Kasal:
From: Johannes Schindelin johannes.schinde...@gmx.de
Date: Wed, 2 Jun 2010 00:41:33 +0200
If HOME is not set, use $HOMEDRIVE$HOMEPATH
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
Signed-off-by: Stepan Kasal ka...@ucw.cz
---
On Thu, Jun 5, 2014 at 11:40 AM, Karsten Blees karsten.bl...@gmail.com wrote:
Am 05.06.2014 10:03, schrieb Stepan Kasal:
From: Johannes Schindelin johannes.schinde...@gmx.de
Date: Wed, 2 Jun 2010 00:41:33 +0200
If HOME is not set, use $HOMEDRIVE$HOMEPATH
Signed-off-by: Johannes Schindelin
From: Johannes Schindelin johannes.schinde...@gmx.de
Date: Wed, 2 Jun 2010 00:41:33 +0200
If HOME is not set, use $HOMEDRIVE$HOMEPATH
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
Signed-off-by: Stepan Kasal ka...@ucw.cz
---
On Thu, Jun 05, 2014 at 10:32:44AM +0200, Torsten
Hello,
On Thu, Jun 05, 2014 at 11:40:50AM +0200, Karsten Blees wrote:
Am 05.06.2014 10:03, schrieb Stepan Kasal:
I hope you can ack this patch as a step forward.
No, not really. It's sure better than introducing a special
get_home_directory(), but it still increases the diff between
Hi Karsten,
On Thu, 5 Jun 2014, Karsten Blees wrote:
After a bit of digging in the history and the old googlegroups issue
tracker, I think this patch is completely unrelated to the non-ASCII
problems.
Actually, the non-ASCII problems were the trigger for my patch.
In summary, this patch
Dear Friend,
I am Song Chen I have a Business Proposal of $12.8m USD for you to handle
with me from
my bank contact me for more information (song_chen.2...@foxmail.com)
Regards,
Mr Song Chen
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Hi,
On Thu, Jun 05, 2014 at 02:03:39PM +0200, Johannes Schindelin wrote:
Render me even more convinced that the API call is the cleanest way to go,
But not me.
In a paralel post, Duy Nguyen wrote:
Thank you for working on pushing msysgit patches upstream. I don't use
git on windows, but
On 2014-06-04 23.16, David Turner wrote:
Sure! I actually went with 120k to make measurement easier:
https://github.com/dturner-tw/many-refs
Hm, I didn't get so man
git remote -v
origin https://github.com/dturner-tw/many-refs
wc .git/packed-refs
7501130 38868
On Thu, Jun 05, 2014 at 02:30:17PM +0200, Torsten Bögershausen wrote:
On 2014-06-04 23.16, David Turner wrote:
Sure! I actually went with 120k to make measurement easier:
https://github.com/dturner-tw/many-refs
Hm, I didn't get so man
git remote -v
origin
Hi Karsten,
On Thu, 5 Jun 2014, Karsten Blees wrote:
Am 05.06.2014 10:03, schrieb Stepan Kasal:
* even if $HOME was empty, git should setenv(HOME) so that child
processes can benefit from it (similar to TMPDIR and TERM in current
msysgit's mingw_startup()). Not setting $HOME because it
Hi,
My name is Fran, we are a development team who uses git. We have our
Development Environment in the server office (Windows 2008 R2) where everything
runs without problems. We are planning to move to Windows Azure so we bought a
virtual server to try our Development Environment and check
I have a question regarding submodules and their applicability given
our workflow at the place I work.
When I work on a feature, I normally create a feature branch. If I
happen to make changes to the submodule that only work with the
changes introduced in my feature branch, that seems to
On Tuesday, May 27, 2014 03:49:24 PM Johan Herland wrote:
Search the mailing list archives for git-interpret-trailers. It's coming.
Nice!
I started a table to collect how different projects or tools use trailers:
https://git.wiki.kernel.org/index.php/CommitMessageConventions#Trailers
It would
Am 05.06.2014 14:03, schrieb Johannes Schindelin:
Hi Karsten,
On Thu, 5 Jun 2014, Karsten Blees wrote:
After a bit of digging in the history and the old googlegroups issue
tracker, I think this patch is completely unrelated to the non-ASCII
problems.
Actually, the non-ASCII problems
Am 05.06.2014 10:05, schrieb Stepan Kasal:
mingw.c defines several wrapper functionsi, like mingw_unlink().
These wrappers are deployed by macros like this:
#define unlink mingw_unlink
The function itself is preceded by #undef, leaving the wrapper out
of the game for the rest of
I've never contributed to the Git project before. I'm a Windows user,
so I use msysgit, but I'd be happy to install linux just so I can help
implement this feature if everyone feels it would be useful.
Right now AFAIK, there is no way to prune tags through Git. The way I
currently do it is like
Hello Karsten,
On Thu, Jun 05, 2014 at 04:51:39PM +0200, Karsten Blees wrote:
In the current msysgit HEAD, most of these #undef's can simply be
removed or have already been removed [...]
not most of. According to my quick count, 6 of 20 have been removed,
2 more can be removed. The remaining
On Thu, Jun 05, 2014 at 09:03:25AM -0500, Robert Dailey wrote:
When I work on a feature, I normally create a feature branch. If I
happen to make changes to the submodule that only work with the
changes introduced in my feature branch, that seems to complicate
things. For the purposes of the
On 14-06-04 06:17 PM, Junio C Hamano wrote:
Marc Branchaud mbranch...@xiplink.com writes:
[jc: omitted good suggestions I'll use in amending]
+ the refspecs to be used to fetch. The example above will fetch
/to be used//
I have a problem with that change, actually, because you do not
Signed-off-by: Marc Branchaud marcn...@xiplink.com
---
Documentation/git-fetch.txt| 4 ++--
Documentation/pull-fetch-param.txt | 17 ++---
2 files changed, 16 insertions(+), 5 deletions(-)
On 14-06-04 06:17 PM, Junio C Hamano wrote:
Perhaps
...
On 14-06-04 06:28 PM, Junio C Hamano wrote:
Marc Branchaud mbranch...@xiplink.com writes:
Teach the command to pay attention to the --refmap=lhs:rhs
command-line options that can be used to override the use of
configured remote.*.fetch as the refmap.
(Your 0/9 message merely said The new
On Thu, Jun 5, 2014 at 10:15 AM, W. Trevor King wk...@tremily.us wrote:
So you have:
On the trunk host: On your public host: Locally:
superproject superproject superproject
submodulesubmodule `-- submodule
In that case, a corresponding
On Thu, Jun 05, 2014 at 10:57:17AM -0500, Robert Dailey wrote:
I was planning on creating a submodule for our third party libs and
store them extracted in there.
3rd party libraries sound loosely-coupled to me ;). In one of my more
mature projects I did a similar thing, and just used relative
On Thu, Jun 5, 2014 at 4:10 PM, Thomas Koch tho...@koch.ro wrote:
On Tuesday, May 27, 2014 03:49:24 PM Johan Herland wrote:
Search the mailing list archives for git-interpret-trailers. It's coming.
Nice!
I started a table to collect how different projects or tools use trailers:
Am 05.06.2014 10:05, schrieb Stepan Kasal:
mingw.c defines several wrapper functionsi, like mingw_unlink().
These wrappers are deployed by macros like this:
#define unlink mingw_unlink
The function itself is preceded by #undef, leaving the wrapper out
of the game for the rest of
On Thu, Jun 05, 2014 at 08:07:50AM +0200, Heiko Voigt wrote:
+The caller can look up information about submodules by using the
+`submodule_from_path()` or `submodule_from_name()` functions.
That's for an already-known submodule. Do we need a way to list
submodules (e.g. for 'submodule foreach'
Jens Lehmann jens.lehm...@web.de writes:
... I believe we
should have one or two switches telling Git I want my submodules be
updated without having to use the 'git submodule' command. And
after that submodule specific overrides can kick in, e.g. when
submodule.name.update is set to none the
On Thu, Jun 5, 2014 at 11:23 AM, W. Trevor King wk...@tremily.us wrote:
3rd party libraries sound loosely-coupled to me ;). In one of my more
mature projects I did a similar thing, and just used relative URLs [1]
and sibling mirrors/forks [2,3,4].
Cheers,
Trevor
[1]:
Marc Branchaud marcn...@xiplink.com writes:
I don't have any objection to the option per se. But I do wonder if there's
a need to add yet another knob to git just for completeness. Has anyone ever
needed this?
It is not a good yardstick, as everybody has survived without it
since Git's
On Thu, Jun 05, 2014 at 11:18:28AM -0700, Junio C Hamano wrote:
Jens Lehmann jens.lehm...@web.de writes:
We had two settings in mind,...
So what if clone would just do an git submodule init for now when
submodule.autoinit is set but submodule.autoupdate isn't [?]
... and a single
On Thu, Jun 05, 2014 at 01:31:39PM -0500, Robert Dailey wrote:
On Thu, Jun 5, 2014 at 11:23 AM, W. Trevor King wrote:
3rd party libraries sound loosely-coupled to me ;). In one of my more
mature projects I did a similar thing, and just used relative URLs [1]
and sibling mirrors/forks
On Thu, Jun 05, 2014 at 12:00:33PM -0700, W. Trevor King wrote:
On Thu, Jun 05, 2014 at 01:31:39PM -0500, Robert Dailey wrote:
Instead of just creating my branch and starting to make commits, I
now have to setup my submodule branch first. Also pull requests
won't show the changes to the
On Thu, 2014-06-05 at 14:30 +0200, Torsten Bögershausen wrote:
On 2014-06-04 23.16, David Turner wrote:
Sure! I actually went with 120k to make measurement easier:
https://github.com/dturner-tw/many-refs
Hm, I didn't get so man
git remote -v
origin
On Wed, 2014-06-04 at 14:46 -0700, Junio C Hamano wrote:
David Turner dtur...@twopensource.com writes:
On Wed, 2014-06-04 at 10:04 +0200, Torsten Bögershausen wrote:
[snip discussion of compiler flags; I'll look into a cpuid approach]
H, I am not sure if the complexity is really
Am 05.06.2014 15:39, schrieb Johannes Schindelin:
And in particular with your changes to Unicodify the complete environment,
I am *highly* doubtful that child processes will be able to handle
themselves properly, unless we spend a whole lot of time converting back
and forth the environment
Robert Dailey rcdailey.li...@gmail.com writes:
I've never contributed to the Git project before. I'm a Windows user,
so I use msysgit, but I'd be happy to install linux just so I can help
implement this feature if everyone feels it would be useful.
Right now AFAIK, there is no way to prune
Richard Hansen rhan...@bbn.com writes:
Because test_eval_ is defined while zsh is in sh emulation mode, the
shell code passed as an argument to test_expect_success would normally
be evaluated in sh emulation mode. However, with this change, it is
now possible to evaluate the test code in zsh
The first version of test 23 did simply check that no output was send
to stderr.
Commit 5e2c7cd2 verified that the expected tags were actually cloned.
Since the day git clone printed Cloning into 'too-many-refs' to stderr,
the test failed because stderr was not empty.
Remove the check for
On 2014-06-05 21.26, David Turner wrote:
On Thu, 2014-06-05 at 14:30 +0200, Torsten Bögershausen wrote:
On 2014-06-04 23.16, David Turner wrote:
Sure! I actually went with 120k to make measurement easier:
https://github.com/dturner-tw/many-refs
Hm, I didn't get so man
git remote -v
Am 05.06.2014 11:58, schrieb Erik Faye-Lund:
On Thu, Jun 5, 2014 at 11:40 AM, Karsten Blees karsten.bl...@gmail.com
wrote:
Am 05.06.2014 10:03, schrieb Stepan Kasal:
From: Johannes Schindelin johannes.schinde...@gmx.de
Date: Wed, 2 Jun 2010 00:41:33 +0200
If HOME is not set, use
Christian Couder chrisc...@tuxfamily.org writes:
+static int create_graft(int argc, const char **argv, int force)
+{
+ unsigned char old[20], new[20];
+ const char *old_ref = argv[0];
+ struct commit *commit;
+ struct strbuf buf = STRBUF_INIT;
+ struct strbuf
Christian Couder chrisc...@tuxfamily.org writes:
diff --git a/contrib/convert-grafts-to-replace-refs.sh
b/contrib/convert-grafts-to-replace-refs.sh
new file mode 100755
index 000..8472879
--- /dev/null
+++ b/contrib/convert-grafts-to-replace-refs.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+#
Am 05.06.2014 18:56, schrieb Johannes Sixt:
Am 05.06.2014 10:05, schrieb Stepan Kasal:
mingw.c defines several wrapper functionsi, like mingw_unlink().
These wrappers are deployed by macros like this:
#define unlink mingw_unlink
The function itself is preceded by #undef, leaving the
On Thu, 2014-06-05 at 23:42 +0200, Torsten Bögershausen wrote:
On 2014-06-05 21.26, David Turner wrote:
On Thu, 2014-06-05 at 14:30 +0200, Torsten Bögershausen wrote:
On 2014-06-04 23.16, David Turner wrote:
Sure! I actually went with 120k to make measurement easier:
Marc Branchaud marcn...@xiplink.com writes:
This patch applies atop your 8/9. I feel strongly that some kind of
reference should accompany this description, and your new CONFIGURED
REMOTE-TRACKING BRANCHES section seems like a good one for the fetch
variant, but since pull's variant doesn't
Am 05.06.2014 17:13, schrieb Stepan Kasal:
Hello Karsten,
On Thu, Jun 05, 2014 at 04:51:39PM +0200, Karsten Blees wrote:
In the current msysgit HEAD, most of these #undef's can simply be
removed or have already been removed [...]
not most of. According to my quick count, 6 of 20 have
Sup Yut Sum ch3co...@gmail.com writes:
async is in C# 5.0
foreach is in C# 1.0
instanceof is in Java. The similar keywords are typeof, is, as in C# 1.0
This one made me read it twice, until I realized you meant
instanceof() is listed as keywords, but there is no such thing
(it is in
Steve Hoelzer shoel...@gmail.com writes:
There is consensus that the default should change because it will
benefit nearly all users (some just a little, but some a lot).
See [1] and replies.
[1]:
This series is based on ref-transactions-reflog
It is also available at
https://github.com/rsahlberg/git/tree/ref-transactions-rename
This series adds support to perform rename_ref as a single transaction for
both deleting/re-creating the ref and updating the reflog.
Since we no longer use
Make the deletion of refs during a transaction more atomic.
Start by first copying all loose refs we will be deleting to the packed
refs file and then commit the packed refs file. Then re-lock the packed refs
file to avoid anyone else from modifying the refs we are to delete during this
Change refs.c to use a single transaction to copy/rename both the refs and
its reflog. Since we are no longer using rename() to move the reflog file
we no longer need to disallow rename_ref for refs with a symlink for its reflog
so we can remove that test from the testsuite.
Signed-off-by: Ronnie
When we are updating more than one single ref, i.e. not a commit, then
write the updated refs directly to the packed refs file instead of writing
them as loose refs.
Change clone to use a transaction instead of using the pacekd refs api.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
We no longer need to expose the lock/add/commit/rollback functions
for packed refs anymore so make them static and remove them from the api.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
refs.c | 8
refs.h | 28
2 files changed, 4 insertions(+), 32
In many places in the code we do not have access to the individual fields
in the committer data. Instead we might only have access to prebaked data
such as what is returned by git_committer_info() containing a string
that consists of email, timestamp, zone etc.
This makes it inconvenient to use
This patch adds support to the transaction system to update all non-refs as
packed refs instead of loose refs.
This series can also be found at
https://github.com/rsahlberg/git/tree/ref-transactions-req-packed-refs
This series adds support to have transaction write updates to packed refs
instead
Since Junio has picked up the first patch from previous versions of
this series, I'm just going to send the second (SSE) one. I decided
not to s/NO_SSE42/!HAVE_SSE42/ because it looks like git mostly uses
the former convention (for instance, that's what GIT_PARSE_WITH
generates).
Thanks for all
Optimize check_refname_component using SSE4.2, where available.
git rev-parse HEAD is a good test-case for this, since it does almost
nothing except parse refs. For one particular repo with about 60k
refs, almost all packed, the timings are:
Look up table: 29 ms
SSE4.2:25 ms
This is
It is possible to have two refs which are the same but for case.
This works great on the case-sensitive filesystems, but not so well on
case-insensitive filesystems. It is fairly typical to have
case-insensitive clients (Macs, say) with a case-sensitive server
(GNU/Linux).
Should a user attempt
On 2014-06-05 17:11, Junio C Hamano wrote:
Richard Hansen rhan...@bbn.com writes:
Because test_eval_ is defined while zsh is in sh emulation mode, the
shell code passed as an argument to test_expect_success would normally
be evaluated in sh emulation mode. However, with this change, it is
On Fri, Jun 6, 2014 at 7:52 AM, David Turner dtur...@twopensource.com wrote:
Create the option receive.denycaseclonerefs, which checks pushed
refs to ensure that they are not case clones of an existing
ref. This setting is turned on by default if core.ignorecase is
set, but not otherwise.
On Fri, 2014-06-06 at 08:37 +0700, Duy Nguyen wrote:
On Fri, Jun 6, 2014 at 7:52 AM, David Turner dtur...@twopensource.com wrote:
Create the option receive.denycaseclonerefs, which checks pushed
refs to ensure that they are not case clones of an existing
ref. This setting is turned on by
On Thu, Jun 05, 2014 at 10:46:10AM -0700, W. Trevor King wrote:
On Thu, Jun 05, 2014 at 08:07:50AM +0200, Heiko Voigt wrote:
+The caller can look up information about submodules by using the
+`submodule_from_path()` or `submodule_from_name()` functions.
That's for an already-known
On Thu, Jun 05, 2014 at 11:18:28AM -0700, Junio C Hamano wrote:
Jens Lehmann jens.lehm...@web.de writes:
We had two settings in mind,...
So what if clone would just do an git submodule init for now when
submodule.autoinit is set but submodule.autoupdate isn't [?]
... and a single
Change lock_ref_sha1_basic to return an error instead of dying when
we fail to lock a file during a transaction.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
refs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index e3a0383..ab0b629 100644
---
On Thu, Jun 05, 2014 at 07:48:33PM +1200, Chris Packham wrote:
On 05/06/14 07:42, Heiko Voigt wrote:
I like this idea of specifying different views by giving tags. But
does it rule out a boolean clone.recursesubmodules? For the simple case
some people might not want to worry about
81 matches
Mail list logo
