On Fri, May 03, 2013 at 07:59:09AM +0200, Johannes Sixt wrote:
Am 5/2/2013 17:46, schrieb Jeff King:
On Thu, May 02, 2013 at 09:05:01AM +0200, Johannes Sixt wrote:
BTW, do you notice that the function is now modifying an object (the hash
table) even though this is rather unexpected from a
On Fri, May 03, 2013 at 02:02:44AM -0400, Jeff King wrote:
Can we be sure that the function is never invoked in concurrently from
different threads? I attempted to audit code paths, but quickly gave up
because I know too little about this machinery.
I didn't check explicitly, but in
Duy Nguyen pclo...@gmail.com writes:
My setup is a bit peculiar where I do git development on three
different machines. Say I updated branch long-branch-name on machine
A. Then I continue my work on machine B. I would want to hard reset
that long-branch-name on machine B before resuming my
Duy Nguyen pclo...@gmail.com writes:
What do you mean by partial history? Do we have dangling pointers
after doing that commit walker?
^C will leave the objects and it is safe because it will not
update refs.
But your code that does not verify the full connectivity from such
an object (that
A good cutting edge on line store by using a main difference, you bet What
i'm saying is any * links of london sale
http://www.linksoflondonoutletstore.co.uk/ * . It's an individual retail
outlet the fact that justifies way that will a a fact feel. Pc training
courses merchandise or simply
Junio C Hamano gits...@pobox.com writes:
Duy Nguyen pclo...@gmail.com writes:
My setup is a bit peculiar where I do git development on three
different machines. Say I updated branch long-branch-name on machine
A. Then I continue my work on machine B. I would want to hard reset
that
On Thu, May 2, 2013 at 9:51 PM, Duy Nguyen pclo...@gmail.com wrote:
Hi,
My setup is a bit peculiar where I do git development on three
different machines. Say I updated branch long-branch-name on machine
A. Then I continue my work on machine B. I would want to hard reset
that
EW Ilya Basin basini...@gmail.com wrote:
Hi. I won't send you updated patches until I import and test my huge
repo. Everything will be here:
https://github.com/basinilya/git/commits/v1.8.2.2-git-svn-fixes
At the moment I've decided not to implement the Junio's proposal:
JCH comment line #
On Fri, May 3, 2013 at 4:38 PM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
Duy Nguyen pclo...@gmail.com writes:
My setup is a bit peculiar where I do git development on three
different machines. Say I updated branch long-branch-name on machine
A. Then I
Junio C Hamano gits...@pobox.com writes:
Duy Nguyen pclo...@gmail.com writes:
What do you mean by partial history? Do we have dangling pointers
after doing that commit walker?
^C will leave the objects and it is safe because it will not
update refs.
But your code that does not verify the
On Thu, May 02, 2013 at 11:55:57PM -0700, Junio C Hamano wrote:
Let's illustrate. Imagine your project as a whole has this history:
[snip]
OK I agree my approach is flawed. But if all these are met, we can be
sure the new refs are good, correct?
- all refs point to an object in the pack
-
Earliest attention for Pandora, you may realise with regards to the wonder *
pandora jewelry http://www.cheappandorausshop.net/ * ? Good, such as the
glistening brightness with your girlfriend, Pandora earrings at the same
time does well everyone and the great approximately everyone.
Wouldn't
* thomas sabo charms http://www.genuinethomassaboringsshop.co.uk/ * for a
make really likes a advantage to be revealed perfectly by using excellent
plus really sophisticated jewellery. This is certainly mainly real by using
charms plus silver products and solutions. Products and solutions
On Fri, May 3, 2013 at 3:09 AM, Duy Nguyen pclo...@gmail.com wrote:
Subject: [PATCH] clone: open a shortcut for connectivity check
In order to make sure the cloned repository is good, we run rev-list
--objects --not --all $new_refs on the repository. This is expensive
on large repositories.
On Thu, May 2, 2013 at 3:29 PM, Ramsay Jones ram...@ramsay1.demon.co.uk wrote:
Commit 380a4d92 (Update cygwin.c for new mingw-64 win32 api headers,
11-11-2012) solved an header include order problem on cygwin 1.7 when
using the new mingw-64 WIN32 API headers. The solution involved using
a new
* pandora uk http://www.pandoracharmsvipsale.co.uk/ * building start out
outside around Denmark together with the human being labeled Enevoldsen.
Enevoldsen appeared to be your goldsmith plus your dog as well as girlfriend
viewed as considering and even promotion rings manufactured from drops
I found another race related to the packed-refs code. Consider for a
moment what happens when we are looking at refs and another process does
a simultaneous git pack-refs --all --prune, updating packed-refs and
deleting the loose refs.
If we are resolving a single ref, then we will either find
Duy Nguyen pclo...@gmail.com writes:
On Fri, May 3, 2013 at 4:38 PM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
Duy Nguyen pclo...@gmail.com writes:
My setup is a bit peculiar where I do git development on three
different machines. Say I updated branch
On Fri, May 3, 2013 at 10:38 AM, Jeff King p...@peff.net wrote:
I found another race related to the packed-refs code. Consider for a
moment what happens when we are looking at refs and another process does
a simultaneous git pack-refs --all --prune, updating packed-refs and
deleting the loose
deg d...@degel.com writes:
I'm having this same problem.
Here's one more clue that may help: The problem is dependent on the exact
type of NAS drive.
I moved from a Buffalo LS-X2.0, which worked fine, to a WD My Book Live
(MBL), which has this problem.
I don't know much more yet about why
Usability observations below...
On Thu, May 2, 2013 at 11:49 PM, Jiang Xin worldhello@gmail.com wrote:
The interactive git clean combines `git clean -n` and `git clean -f`
together to do safe cleaning, and has more features.
First it displays what would be removed in columns (so that you
v3 is more like check_everything_connected's special case for clone
because check_everything_connected is not really replaced.
GIT_SHALLOW_FILE in 2/4 is now replaced by --shallow-file to avoid
unintended propagation to child processes.
Nguyễn Thái Ngọc Duy (4):
clone: let the user know when
check_everything_connected could take a long time, especially in the
clone case where the whole DAG is traversed. The user deserves to know
what's going on.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/clone.c | 4
1 file changed, 4 insertions(+)
diff --git
index-pack --strict looks up and follows parent commits. If shallow
information is not ready by the time index-pack is run, index-pack may
be lead to non-existent objects. Make fetch-pack save shallow file to
disk before invoking index-pack.
git learns new global option --shallow-file to pass on
In order to make sure the cloned repository is good, we run rev-list
--objects --not --all $new_refs on the repository. This is expensive
on large repositories. This patch attempts to mitigate the impact in
this special case.
In the good clone case, we only have one pack. If all of the
following
On Fri, May 3, 2013 at 8:35 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
index-pack --strict looks up and follows parent commits. If shallow
information is not ready by the time index-pack is run, index-pack may
be lead to non-existent objects. Make fetch-pack save shallow file to
On Fri, May 3, 2013 at 8:35 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
In order to make sure the cloned repository is good, we run rev-list
--objects --not --all $new_refs on the repository. This is expensive
on large repositories. This patch attempts to mitigate the impact in
this
Jiang Xin worldhello@gmail.com writes:
Rewrite the log as following:
That's probably more than needed ;-). Thanks,
Show items of interactive git-clean in columns
When there are lots of items to be cleaned, it is hard to see them all
in one screen. Show them in columns instead of in one
Jiang Xin worldhello@gmail.com writes:
The interactive git clean combines `git clean -n` and `git clean -f`
together to do safe cleaning, and has more features.
First it displays what would be removed in columns (so that you can
see them all in one screen). The user must confirm before
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
In order to make sure the cloned repository is good, we run rev-list
--objects --not --all $new_refs on the repository. This is expensive
on large repositories. This patch attempts to mitigate the impact in
this special case.
In the good clone
On Fri, May 03, 2013 at 11:26:11AM +0200, Johan Herland wrote:
You don't really need to be sure that packed-refs is up-to-date. You
only need to make sure that don't rely on lazily loading loose refs
_after_ you have loaded packed-refs.
True. As long as you load them both together, and always
Felipe Contreras felipe.contre...@gmail.com writes:
There's no point in storing blob, they would increase the time of
loading the marks, and the vast majority of them will never be used
again.
This also makes fast-export and fast-import marks compatible.
[...]
- if
On Fri, May 3, 2013 at 12:56 PM, Thomas Rast tr...@inf.ethz.ch wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
How do we know that this doesn't break any users of fast-import? Your
comment isn't very reassuring:
the vast majority of them will never be used again
So what's with
On Fri, May 03, 2013 at 01:28:53PM -0400, Jeff King wrote:
The following solution might work in both the resolve-a-single-ref and
enumerating-refs case:
0. Look for ref already cached in memory. If found, OK.
1. Look for loose ref. If found, OK.
2. If not found, load all loose
Am 03.05.2013 15:45, schrieb shawn wilson:
So, I actually have another question I wasn't able to get to in this
example (which has color - sorry - less -F displays it decently)
What is shown here is that trying to add submodules in this repo
doesn't add the .gitmodules file - I can do it
Am 03.05.2013 03:23, schrieb Dale R. Worley:
Several people have made similar mistakes in beliving that git
submodule init can be used for adding submodules to a working
directory, whereas git submodule add is the command that should be
used. That *is* documented at the top of the manual page
On Fri, May 3, 2013 at 8:26 PM, Jeff King p...@peff.net wrote:
On Fri, May 03, 2013 at 01:28:53PM -0400, Jeff King wrote:
The following solution might work in both the resolve-a-single-ref and
enumerating-refs case:
0. Look for ref already cached in memory. If found, OK.
1. Look for
On Fri, May 03, 2013 at 04:38:47AM -0400, Jeff King wrote:
For reference, here's a script that demonstrates the problem during
enumeration (sometimes for-each-ref fails to realize that
refs/heads/master exists at all):
# run this in one terminal
git init repo
cd repo
git commit
zsh is smart enough to add the right suffix while completing, there's no
point in trying to do the same as bash.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/completion/git-completion.zsh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
Felipe Contreras felipe.contre...@gmail.com writes:
There's no point in calling get_sha1() if we know they are SHA-1s.
If we know they _have to be_ 40-hex object names, calling get_sha1()
is not just pointless but outright wrong and these calls have to be
get_sha1_hex().
Looks like a good
Felipe Contreras felipe.contre...@gmail.com writes:
We don't care about blobs, or any object other than commits, but in
order to find the type of object, we are parsing the whole thing, which
is slow, specially in big repositories with lots of big files.
There's no need for that, we can
Felipe Contreras felipe.contre...@gmail.com writes:
We don't need the parsed objects at this point, merely the information
that they have marks.
Seems to be three times faster in my setup with lots of objects.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Thomas Rast tr...@inf.ethz.ch writes:
IIUC, you are unconditionally storing only marks to commit objects.
Are you allowed to do that at this point? I notice that
git-fast-export(1) says
--export-marks=file
Dumps the internal marks table to file when complete. Marks are
Junio C Hamano gits...@pobox.com writes:
Duy Nguyen pclo...@gmail.com writes:
My setup is a bit peculiar where I do git development on three
different machines. Say I updated branch long-branch-name on machine
A. Then I continue my work on machine B. I would want to hard reset
that
On Fri, May 3, 2013 at 5:08 PM, Junio C Hamano gits...@pobox.com wrote:
Thomas Rast tr...@inf.ethz.ch writes:
IIUC, you are unconditionally storing only marks to commit objects.
Are you allowed to do that at this point? I notice that
git-fast-export(1) says
--export-marks=file
I am building a small git wrapper around puppet, and one of the
actions it performs is auto-fastforwarding of branches without
checking them out.
In simplified code... we ensure that we are on a head called master,
and in some cases ppg commit, will commit to master and...
## early on
#
The SVN::Fetcher module is now able to filter for inclusion as well
as exclusion (as used by --ignore-path). Also added tests, documentation
changes and git completion script.
If you have an SVN repository with many top level directories and you
only want a git-svn clone of some of them then
A release candidate Git v1.8.3-rc1 is now available for testing
at the usual places.
The release tarballs are found at:
http://code.google.com/p/git-core/downloads/list
and their SHA-1 checksums are:
68160a9e9246a4857ccab0e68b466e0e442c1da5 git-1.8.3.rc1.tar.gz
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The tip of the 'master' branch is tagged as v1.8.3-rc1. We seem to
have a few interesting topics that are being discussed but it is
unlikely
If there's already a remote-helper tracking ref, we can fetch the SHA-1
to report proper push messages (as opposed to always reporting
[new branch]).
The remote-helper currently can specify the old SHA-1 to avoid this
problem, but there's no point in forcing all remote-helpers to be aware
of git
Felipe Contreras felipe.contre...@gmail.com writes:
A safe and sane approach may be to teach these an option to tell
them to omit non-commits or to emit all kinds, and make remote-bzr
use that to exclude non-commits.
This has nothing to do with remote-bzr, or any remote helper. These
On Fri, May 3, 2013 at 6:45 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
A safe and sane approach may be to teach these an option to tell
them to omit non-commits or to emit all kinds, and make remote-bzr
use that to exclude non-commits.
If origin/foo exists, but foo doesn't:
$ git merge foo
fatal: foo - not something we can merge
This patch series improves the error message. If a remote branch exists with the
same name, it now says:
$ git merge foo
fatal: foo - not something we can merge
Did you mean
When a ref is not known, currently functions call die() with an error message.
Add helper function help_unknown_ref to take care of displaying an error
message along with a list of suggested refs the user might have meant.
Example:
$ git merge foo
merge: foo - not something we can
Use help.c:help_unknown_ref instead of die to provide a friendlier error
message before exiting, when one of the refs specified in a merge is unknown.
Signed-off-by: Vikrant Varma vikrant.varm...@gmail.com
---
builtin/merge.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
On Fri, May 3, 2013 at 4:54 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
We don't need the parsed objects at this point, merely the information
that they have marks.
Seems to be three times faster in my setup with lots of objects.
Hi,
A few fixes to be applied on top of the massive changes already queued. Nothing
major.
Felipe Contreras (2):
remote-bzr: convert all unicode keys to str
remote-bzr: avoid bad refs
contrib/remote-helpers/git-remote-bzr | 32
1 file changed, 20
Otherwise some versions of bazaar might barf.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-bzr | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-bzr
Turns out fast-export throws bad 'reset' commands because of a behavior
in transport-helper that is not even needed.
We should ignore them, otherwise we will threat them as branches and
fail.
This was fixed in v1.8.2, but some people use this script in older
versions of git.
Also, check if the
On Fri, May 3, 2013 at 7:22 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
A few fixes to be applied on top of the massive changes already queued.
Nothing major.
Felipe Contreras (2):
remote-bzr: convert all unicode keys to str
remote-bzr: avoid bad refs
There's a problem with
Hi,
The previous version had an indentation bug (did I mention I hate python?).
A few fixes to be applied on top of the massive changes already queued. Nothing
major.
Felipe Contreras (2):
remote-bzr: convert all unicode keys to str
remote-bzr: avoid bad refs
Otherwise some versions of bazaar might barf.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-bzr | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-bzr
Turns out fast-export throws bad 'reset' commands because of a behavior
in transport-helper that is not even needed.
We should ignore them, otherwise we will threat them as branches and
fail.
This was fixed in v1.8.2, but some people use this script in older
versions of git.
Also, check if the
2013/5/3 Eric Sunshine sunsh...@sunshineco.com:
WARNING: The following items will be removed permanently. Press y
WARNING: to start cleaning, and press n to abort the cleaning.
WARNING: You can also enter the edit mode, and select items
WARNING: to be excluded from the
On Fri, May 3, 2013 at 11:15 PM, Junio C Hamano gits...@pobox.com wrote:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
In order to make sure the cloned repository is good, we run rev-list
--objects --not --all $new_refs on the repository. This is expensive
on large repositories. This patch
Usually foo:bar is interpreted as an ssh url. This patch allows to
clone from such paths by putting at least one slash before the colon
(i.e. /path/to/foo:bar or just ./foo:bar).
file://foo:bar should also work, but local optimizations are off in
that case, which may be unwanted. While at there,
Hi,
Heiko Voigt wrote:
--- a/connect.c
+++ b/connect.c
@@ -49,6 +49,16 @@ static void add_extra_have(struct extra_have_objects
*extra, unsigned char *sha1
extra-nr++;
}
+static void die_initial_contact(int got_at_least_one_head)
+{
+ if (got_at_least_one_head)
+
On Sat, May 4, 2013 at 5:09 AM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
The A/@ could make sense, but I'm wondering whether we're taking the
direction of implementing some kind of Brainfuck dialect in Git revision
specifiers. I'm not sure we want to add more special characters here and
When we get 40 hex digits, we immediately assume it's an SHA-1. Warn
about ambiguity if there's also refs/heads/$sha1 (or similar) on system.
When we successfully resolve a ref like 1234abc and 1234abc
happens to be valid abbreviated SHA-1 on system, warn also.
Signed-off-by: Nguyễn Thái Ngọc
On Sat, May 4, 2013 at 10:26 AM, Duy Nguyen pclo...@gmail.com wrote:
On Sat, May 4, 2013 at 5:09 AM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
The A/@ could make sense, but I'm wondering whether we're taking the
direction of implementing some kind of Brainfuck dialect in Git revision
70 matches
Mail list logo
