[PATCH v2] all: new command used for multi-repo operations

2013-01-23 Thread Lars Hjemli
When working with multiple, unrelated (or loosly related) git repos, there is often a need to locate all repos with uncommitted work and perform some action on them (say, commit and push). Before this patch, such tasks would require manually visiting all repositories, running `git status` within

Re: [PATCH] all: new command used for multi-repo operations

2013-01-23 Thread Duy Nguyen
On Wed, Jan 23, 2013 at 4:10 AM, Lars Hjemli hje...@gmail.com wrote: When working with multiple, unrelated (or loosly related) git repos, there is often a need to locate all repos with uncommitted work and perform some action on them (say, commit and push). Before this patch, such tasks would

Re: [PATCH] all: new command used for multi-repo operations

2013-01-23 Thread Lars Hjemli
On Wed, Jan 23, 2013 at 9:39 AM, Duy Nguyen pclo...@gmail.com wrote: On Wed, Jan 23, 2013 at 4:10 AM, Lars Hjemli hje...@gmail.com wrote: When working with multiple, unrelated (or loosly related) git repos, there is often a need to locate all repos with uncommitted work and perform some action

[PATCH] all: new command used for multi-repo operations

2013-01-23 Thread Lars Hjemli
[*git@vger.kernel.org accidentally dropped from cc *] On Wed, Jan 23, 2013 at 7:52 AM, Junio C Hamano gits...@pobox.com wrote: Lars Hjemli hje...@gmail.com writes: +static int walk(struct strbuf *path, int argc, const char **argv) +{ + DIR *dir; + struct dirent *ent; + size_t

Re: [PATCH v2] all: new command used for multi-repo operations

2013-01-23 Thread Duy Nguyen
On Wed, Jan 23, 2013 at 3:12 PM, Lars Hjemli hje...@gmail.com wrote: +NAME + +git-all - Execute a git command in multiple repositories I agree with Junio git-all is too generic. Maybe git-for-each-repo +static int get_repo_state() +{ + const char *diffidx[] = {diff, --quiet,

Aw: Re: [PATCH v3 3/6] Change 'git' to 'Git' whenever the whole system is referred to #2

2013-01-23 Thread Thomas Ackermann
Thomas, I do not want to see many rounds of entire rerolls of this series on the list (nobody will look at the whole series multiple times with fine toothed comb). I do not think you want to do that either. Can you collect remaining fixups like David's message, turn them into patch form

Re: [PATCH v2] all: new command used for multi-repo operations

2013-01-23 Thread Lars Hjemli
On Wed, Jan 23, 2013 at 9:55 AM, Duy Nguyen pclo...@gmail.com wrote: Perhaps we could add the subrepo's object data to the in-memory object database of git-all, then do the diff without launching new commands? The `git all` command is regularly invoked outside of git repos, so I'm not sure if

Re: What's cooking in git.git (Jan 2013, #08; Tue, 22)

2013-01-23 Thread John Keeping
On Tue, Jan 22, 2013 at 04:11:59PM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: Would you mind holding off on this? As it stands there are a couple of issues with the cvsimport-3 script including: ... Actually I do. I think this, at least the early part of it, should

Re: [PATCH 0/3] fixup remaining cvsimport tests

2013-01-23 Thread Michael Haggerty
On 01/20/2013 09:17 PM, Chris Rorvick wrote: I probably won't be sending any more patches on this. My hope was to get cvsimport-3 (w/ cvsps as the engine) in a state such that one could transition from the previous version seamlessly. But the break in t9605 has convinced me this is not worth

Re: [PATCH v2] all: new command used for multi-repo operations

2013-01-23 Thread Duy Nguyen
On Wed, Jan 23, 2013 at 4:24 PM, Lars Hjemli hje...@gmail.com wrote: On Wed, Jan 23, 2013 at 9:55 AM, Duy Nguyen pclo...@gmail.com wrote: Perhaps we could add the subrepo's object data to the in-memory object database of git-all, then do the diff without launching new commands? The `git all`

git-svn problems with white-space in tag names

2013-01-23 Thread Hans-Juergen Euler
I have discussed already the problem a bit more in this thread groups.google.com/d/topic/git-users/kfMFZ3uEFsM/discussion -Operating system (specifically which version) windows 7 64 bit --Git version (git --version) Git version 1.8.0 for windows obviously. git bash and git gui installed

git-svn does not like format=4

2013-01-23 Thread Hans-Juergen Euler
it's part of a sequence of problems you can find on groups.google.com/d/topic/git-users/kfMFZ3uEFsM/discussion windows 7 64 bit Git version 1.8.0 git bash and git gui installed and using using subversion TortoiseSVN 1.7.11 Subversion 1.7.8 Was typically always up-to-date (within 2 months or so)

Re: git-svn does not like format=4

2013-01-23 Thread Erik Faye-Lund
On Wed, Jan 23, 2013 at 11:43 AM, Hans-Juergen Euler waas.n...@gmail.com wrote: it's part of a sequence of problems you can find on groups.google.com/d/topic/git-users/kfMFZ3uEFsM/discussion windows 7 64 bit Git version 1.8.0 git bash and git gui installed and using using subversion

Re: [PATCH 0/3] fixup remaining cvsimport tests

2013-01-23 Thread John Keeping
On Wed, Jan 23, 2013 at 10:54:36AM +0100, Michael Haggerty wrote: On 01/20/2013 09:17 PM, Chris Rorvick wrote: I have never used cvs2git, but I suspect Eric's efforts in making it a potential backend for cvsimport are a better use of time. Is it possible to perform an incremental import with

Re: Bug in latest gitk - can't click lines connecting commits

2013-01-23 Thread Paul Mackerras
On Tue, Jan 22, 2013 at 09:28:23AM -0800, Junio C Hamano wrote: I notice that I have a handful of commits that I haven't pulled from your repository, and the last commit on your 'master' is about 20 days old. Is it safe for me to pull these now? Yes, please pull them now. Regards, Paul. --

Moving commits from one branch to another

2013-01-23 Thread Stefan Schulze
Hi, my team uses a central git-repo since 1500 commits and now we have to sync (only one-way is necessary for now) our repository every three weeks with an external svn-repo. I created the new base-directory (incl. trunk/tags/branches) in svn and added it to my local repo using git svn init git

Re: [PATCH v3 0/2] Make git-svn work with gitdir links

2013-01-23 Thread Barry Wardell
On Wed, Jan 23, 2013 at 2:32 AM, Eric Wong normalper...@yhbt.net wrote: Barry Wardell barry.ward...@gmail.com wrote: These patches fix a bug which prevented git-svn from working with repositories which use gitdir links. Changes since v2: - Rebased onto latest master. - Added

Re: Moving commits from one branch to another

2013-01-23 Thread John Keeping
On Wed, Jan 23, 2013 at 01:04:03PM +0100, Stefan Schulze wrote: my team uses a central git-repo since 1500 commits and now we have to sync (only one-way is necessary for now) our repository every three weeks with an external svn-repo. I created the new base-directory (incl.

Re: What's cooking in git.git (Jan 2013, #08; Tue, 22)

2013-01-23 Thread Chris Rorvick
On Wed, Jan 23, 2013 at 3:28 AM, John Keeping j...@keeping.me.uk wrote: In my opinion the incremental import support really is substantially worse in cvsimport-3 than cvsimport-2. cvsimport-2 looks at the output of git-for-each-ref to calculate the dates from which to continue each branch.

[PATCH/RFC] Revoke write access to refs and odb after importing another repo's odb

2013-01-23 Thread Nguyễn Thái Ngọc Duy
add_submodule_odb() can be used to import objects from another repository temporarily. After this point we don't know which objects are ours, which are external. If we create an object that refers to an external object, next time git runs, it may find a hole in the object graph because the

Re: [PATCH/RFC] Revoke write access to refs and odb after importing another repo's odb

2013-01-23 Thread Duy Nguyen
On Wed, Jan 23, 2013 at 8:34 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: add_submodule_odb() can be used to import objects from another repository temporarily. After this point we don't know which objects are ours, which are external. If we create an object that refers to an external

Re: What's cooking in git.git (Jan 2013, #08; Tue, 22)

2013-01-23 Thread John Keeping
On Wed, Jan 23, 2013 at 07:26:24AM -0600, Chris Rorvick wrote: On Wed, Jan 23, 2013 at 3:28 AM, John Keeping j...@keeping.me.uk wrote: In my opinion the incremental import support really is substantially worse in cvsimport-3 than cvsimport-2. cvsimport-2 looks at the output of

Minor gitk bug - update on empty project : can't read viewmainheadid_orig(1): no such variable

2013-01-23 Thread Indigo Frankencastle
One of these weird usage causes weird bugs. One way to reproduce: mkdir foo cd foo git init git commit -am Initial gitk # or gitk --all F5 Resulting in (gitk-git/gitk line 503 - 512): can't read viewmainheadid_orig(1): no such variable can't read viewmainheadid_orig(1): no such variable

AW: Moving commits from one branch to another

2013-01-23 Thread Stefan Schulze
Is there any way to move/copy commits from one branch to another without a common base-commit and without a forced push of master? Did you try git rebase with --onto? You probably want something like this: git rebase --onto svnbranch publishedToSvn master I already tried this some

segmentation fault (nullpointer) with git log --submodule -p

2013-01-23 Thread Armin
Hello dear git people. I experience a reproducible segmentation fault on one of my repositories when doing a git log --submodule -p, tested with newest version on Arch Linux (git version 1.8.1.1) and built fresh (git version 1.8.1.1.347.g9591fcc), tried on 2 seperate systems: Program

Re: GIT get corrupted on lustre

2013-01-23 Thread Sébastien Boisvert
On 01/22/2013 05:14 PM, Thomas Rast wrote: Eric Chamberland eric.chamberl...@giref.ulaval.ca writes: So, hum, do we have some sort of conclusion? Shall it be a fix for git to get around that lustre behavior? If something can be done in git it would be great: it is a *lot* easier to change

Re: Moving commits from one branch to another

2013-01-23 Thread John Keeping
On Wed, Jan 23, 2013 at 03:13:19PM +0100, Stefan Schulze wrote: Is there any way to move/copy commits from one branch to another without a common base-commit and without a forced push of master? Did you try git rebase with --onto? You probably want something like this: git

Re: GIT get corrupted on lustre

2013-01-23 Thread Sébastien Boisvert
[I forgot to subscribe to the git mailing list, sorry for that] On 01/22/2013 05:14 PM, Thomas Rast wrote: Eric Chamberland eric.chamberl...@giref.ulaval.ca writes: So, hum, do we have some sort of conclusion? Shall it be a fix for git to get around that lustre behavior? If something can be

Re: GIT get corrupted on lustre

2013-01-23 Thread Erik Faye-Lund
On Tue, Jan 22, 2013 at 11:14 PM, Thomas Rast tr...@student.ethz.ch wrote: Eric Chamberland eric.chamberl...@giref.ulaval.ca writes: Other than that I agree with Junio, from what we've seen so far, Lustre returns EINTR on all sorts of calls that simply aren't allowed to do so. I don't think

Re: GIT get corrupted on lustre

2013-01-23 Thread Thomas Rast
Erik Faye-Lund kusmab...@gmail.com writes: On Tue, Jan 22, 2013 at 11:14 PM, Thomas Rast tr...@student.ethz.ch wrote: Eric Chamberland eric.chamberl...@giref.ulaval.ca writes: Other than that I agree with Junio, from what we've seen so far, Lustre returns EINTR on all sorts of calls that

Re: GIT get corrupted on lustre

2013-01-23 Thread Erik Faye-Lund
On Wed, Jan 23, 2013 at 4:32 PM, Thomas Rast tr...@student.ethz.ch wrote: Erik Faye-Lund kusmab...@gmail.com writes: On Tue, Jan 22, 2013 at 11:14 PM, Thomas Rast tr...@student.ethz.ch wrote: Eric Chamberland eric.chamberl...@giref.ulaval.ca writes: Other than that I agree with Junio, from

AW: Moving commits from one branch to another

2013-01-23 Thread Schulze, Stefan
git rebase --onto svnbranch publishedToSvn master^0 git checkout -B svnbranch HEAD Great! This does exactly what I want! Thanks for your support, Stefan Schulze -- ckc ag Sitz: Am Alten Bahnhof 13 38122 Braunschweig Telefon +49 (0)531 / 80 110 0 Telefax +49 (0)531 /

Re: GIT get corrupted on lustre

2013-01-23 Thread Thomas Rast
Erik Faye-Lund kusmab...@gmail.com writes: On Wed, Jan 23, 2013 at 4:32 PM, Thomas Rast tr...@student.ethz.ch wrote: Erik Faye-Lund kusmab...@gmail.com writes: POSIX allows error codes to be generated other than those defined. From

Re: GIT get corrupted on lustre

2013-01-23 Thread Erik Faye-Lund
On Wed, Jan 23, 2013 at 4:44 PM, Thomas Rast tr...@inf.ethz.ch wrote: Erik Faye-Lund kusmab...@gmail.com writes: On Wed, Jan 23, 2013 at 4:32 PM, Thomas Rast tr...@student.ethz.ch wrote: Erik Faye-Lund kusmab...@gmail.com writes: POSIX allows error codes to be generated other than those

Re: [PATCH v2 2/3] push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE

2013-01-23 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Mon, Jan 21, 2013 at 10:30:29PM -0800, Junio C Hamano wrote: When we push to update an existing ref, if: * we do not have the object at the tip of the remote; or * the object at the tip of the remote is not a commit; or * the object we are pushing is

Re: Bug in latest gitk - can't click lines connecting commits

2013-01-23 Thread Junio C Hamano
Paul Mackerras pau...@samba.org writes: On Tue, Jan 22, 2013 at 09:28:23AM -0800, Junio C Hamano wrote: I notice that I have a handful of commits that I haven't pulled from your repository, and the last commit on your 'master' is about 20 days old. Is it safe for me to pull these now?

Re: [PATCH v2] all: new command used for multi-repo operations

2013-01-23 Thread Junio C Hamano
Lars Hjemli hje...@gmail.com writes: +static int walk(struct strbuf *path, int argc, const char **argv) +{ + DIR *dir; + struct dirent *ent; + struct stat st; + size_t len; + + dir = opendir(path-buf); + if (!dir) + return errno; +

Re: [PATCH/RFC] Revoke write access to refs and odb after importing another repo's odb

2013-01-23 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: add_submodule_odb() can be used to import objects from another repository temporarily. After this point we don't know which objects are ours, which are external. If we create an object that refers to an external object, next time git runs, it

Re: [PATCH v2] all: new command used for multi-repo operations

2013-01-23 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: But I still do not think this loop is correct. In a repository that has a working tree, you would learn that directory $D has $D/.git in it, feed $D to handle_repo(), and then descend into $D/.git/objects/, $D/.git/refs, and other random directories

Re: What's cooking in git.git (Jan 2013, #08; Tue, 22)

2013-01-23 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: My preference would be for something like this, possibly with an expanded examples section showing how to pipe the output of cvsps-3 or cvs2git into git-fast-import: -- 8 -- diff --git a/Documentation/git-cvsimport.txt

Re: GIT get corrupted on lustre

2013-01-23 Thread Jonathan Nieder
Thomas Rast wrote: Taken together this should mean that the bug is in fact simply that the calls do not *restart*. They are (like you say) allowed to return EINTR despite not being specified to, *but* SA_RESTART should restart it. Now, does that make it a lustre bug or a glibc bug? :-) The

Defensive publication on Git replication

2013-01-23 Thread Don Marti
Just wanted to get this simple scheme out there in the hope of minimizing patent troll risks for people working on replication. You run an update hook that blocks pushes unless the branch reference in the repository matches the corresponding reference stored in a synchronized system, and flood

Re: [PATCH v2] all: new command used for multi-repo operations

2013-01-23 Thread Lars Hjemli
On Wed, Jan 23, 2013 at 5:52 PM, Junio C Hamano gits...@pobox.com wrote: Lars Hjemli hje...@gmail.com writes: +static int walk(struct strbuf *path, int argc, const char **argv) +{ + DIR *dir; + struct dirent *ent; + struct stat st; + size_t len; + + dir =

Re: [PATCH v2] all: new command used for multi-repo operations

2013-01-23 Thread Lars Hjemli
On Wed, Jan 23, 2013 at 6:04 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: But I still do not think this loop is correct. In a repository that has a working tree, you would learn that directory $D has $D/.git in it, feed $D to handle_repo(), and then

Re: GIT get corrupted on lustre

2013-01-23 Thread Sébastien Boisvert
Hello, Here is a patch (with git format-patch) that removes any timer if NO_SETITIMER is set. Éric: To test it with your workflow: $ module load apps/git/1.8.1.1.348.g78eb407-NO_SETITIMER-patch $ git clone ... Sébastien On 01/22/2013 05:14 PM, Thomas Rast

Re: [PATCH v3 1/8] git_remote_helpers: Allow building with Python 3

2013-01-23 Thread Sverre Rabbelier
On Sun, Jan 20, 2013 at 5:15 AM, John Keeping j...@keeping.me.uk wrote: Change inline Python to call print as a function not a statement. This is harmless because Python 2 will see the parentheses as redundant grouping but they are necessary to run this code with Python 3. Signed-off-by:

Re: [PATCH v3 3/8] git_remote_helpers: Force rebuild if python version changes

2013-01-23 Thread Sverre Rabbelier
On Sun, Jan 20, 2013 at 5:15 AM, John Keeping j...@keeping.me.uk wrote: When different version of python are used to build via distutils, the behaviour can change. Detect changes in version and pass --force in this case. Signed-off-by: John Keeping j...@keeping.me.uk Someone else's review

[PATCH] Ignore gitk-wish buildproduct

2013-01-23 Thread Lars Hjemli
After running `make` on latest master, gitk-git/gitk-wish shows up as untracked. This fixes it. Signed-off-by: Lars Hjemli hje...@gmail.com --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index aa258a6..63d4904 100644 --- a/.gitignore +++ b/.gitignore

Re: [PATCH v3 2/8] git_remote_helpers: fix input when running under Python 3

2013-01-23 Thread Sverre Rabbelier
On Sun, Jan 20, 2013 at 5:15 AM, John Keeping j...@keeping.me.uk wrote: Although 2to3 will fix most issues in Python 2 code to make it run under Python 3, it does not handle the new strict separation between byte strings and unicode strings. There is one instance in git_remote_helpers where

Re: [PATCH v3 2/8] git_remote_helpers: fix input when running under Python 3

2013-01-23 Thread John Keeping
On Wed, Jan 23, 2013 at 11:20:39AM -0800, Sverre Rabbelier wrote: On Sun, Jan 20, 2013 at 5:15 AM, John Keeping j...@keeping.me.uk wrote: Although 2to3 will fix most issues in Python 2 code to make it run under Python 3, it does not handle the new strict separation between byte strings and

RE: Question re. git remote repository

2013-01-23 Thread Lang, David
Thanks Matt and Dave and everyone else for your feedback on this. Ok, I've done some more reading in the Pro Git manual and I think I have an idea of how to get started. Could I run this by you just in case I'm missing anything? Currently (pre-git status) what we have is two developers both

Re: [PATCH] Ignore gitk-wish buildproduct

2013-01-23 Thread Junio C Hamano
Lars Hjemli hje...@gmail.com writes: After running `make` on latest master, gitk-git/gitk-wish shows up as untracked. This fixes it. Signed-off-by: Lars Hjemli hje...@gmail.com The removal was very much deliberate [*1*]; Christian was going to send a corresponding updates to gitk maintainer

[PATCH v3 0/2] Add git-for-each-repo

2013-01-23 Thread Lars Hjemli
Lars Hjemli (2): for-each-repo: new command used for multi-repo operations git: rewrite `git -a` to become a git-for-each-repo command .gitignore | 1 + Documentation/git-for-each-repo.txt | 62 +++ Makefile| 1 +

[PATCH v3 1/2] for-each-repo: new command used for multi-repo operations

2013-01-23 Thread Lars Hjemli
When working with multiple, unrelated (or loosly related) git repos, there is often a need to locate all repos with uncommitted work and perform some action on them (say, commit and push). Before this patch, such tasks would require manually visiting all repositories, running `git status` within

[PATCH v3 2/2] git: rewrite `git -a` to become a git-for-each-repo command

2013-01-23 Thread Lars Hjemli
With this rewriting, it is now possible to run e.g. `git -ad gui` to start up git-gui in each repo within the current directory which contains uncommited work. Signed-off-by: Lars Hjemli hje...@gmail.com --- git.c| 36

Re: [PATCH] Ignore gitk-wish buildproduct

2013-01-23 Thread Junio C Hamano
From: Christian Couder chrisc...@tuxfamily.org gitk, when bound into the git.git project tree, used to live at the root level, but in 62ba514 (Move gitk to its own subdirectory, 2007-11-17) it was moved to a subdirectory. The code used to track changes to TCLTK_PATH (which should cause gitk to

Re: segmentation fault (nullpointer) with git log --submodule -p

2013-01-23 Thread Jeff King
On Wed, Jan 23, 2013 at 03:38:16PM +0100, Armin wrote: Hello dear git people. I experience a reproducible segmentation fault on one of my repositories when doing a git log --submodule -p, tested with newest version on Arch Linux (git version 1.8.1.1) and built fresh (git version

Re: [PATCH v2] all: new command used for multi-repo operations

2013-01-23 Thread Jens Lehmann
Am 23.01.2013 09:55, schrieb Duy Nguyen: On Wed, Jan 23, 2013 at 3:12 PM, Lars Hjemli hje...@gmail.com wrote: +NAME + +git-all - Execute a git command in multiple repositories I agree with Junio git-all is too generic. +1 +static int get_repo_state() +{ + const char

Re: [PATCH v3 2/8] git_remote_helpers: fix input when running under Python 3

2013-01-23 Thread Junio C Hamano
Sverre Rabbelier srabbel...@gmail.com writes: On Wed, Jan 23, 2013 at 11:47 AM, John Keeping j...@keeping.me.uk wrote: When did we last revisit what minimal python version we are ok with requiring? I was wondering if people would weigh in discussing that in response to [1] but no one has

Re: [PATCH/RFC] Revoke write access to refs and odb after importing another repo's odb

2013-01-23 Thread Jens Lehmann
Am 23.01.2013 18:01, schrieb Junio C Hamano: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: add_submodule_odb() can be used to import objects from another repository temporarily. After this point we don't know which objects are ours, which are external. If we create an object that refers to

Re: [PATCHv2 5/8] submodule: use parse_config_key when parsing config

2013-01-23 Thread Jens Lehmann
Am 23.01.2013 07:25, schrieb Jeff King: This makes the code a lot simpler to read by dropping a whole bunch of constant offsets. As a bonus, it means we also feed the whole config variable name to our error functions: [before] $ git -c submodule.foo.fetchrecursesubmodules=bogus

Re: [PATCHv2 6/8] submodule: simplify memory handling in config parsing

2013-01-23 Thread Jens Lehmann
Am 23.01.2013 07:26, schrieb Jeff King: We keep a strbuf for the name of the submodule, even though we only ever add one string to it. Let's just use xmemdupz instead, which is slightly more efficient and makes it easier to follow what is going on. Unfortunately, we still end up having to

Re: [PATCH v3 1/2] for-each-repo: new command used for multi-repo operations

2013-01-23 Thread Junio C Hamano
Lars Hjemli hje...@gmail.com writes: diff --git a/Documentation/git-for-each-repo.txt b/Documentation/git-for-each-repo.txt new file mode 100644 index 000..be49e96 --- /dev/null +++ b/Documentation/git-for-each-repo.txt @@ -0,0 +1,62 @@ +git-for-each-repo(1) + +

Re: [PATCH/RFC] Revoke write access to refs and odb after importing another repo's odb

2013-01-23 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: This is a false positive. The merge algorithm picked a fast-forward in a submodule as a proper merge result and records that in a gitlink. But as Duy pointed out this could be easily fixed by turning the readonly flag off in that case. I see that as

Re: What's cooking in git.git (Jan 2013, #08; Tue, 22)

2013-01-23 Thread John Keeping
On Wed, Jan 23, 2013 at 09:13:27AM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: My preference would be for something like this, possibly with an expanded examples section showing how to pipe the output of cvsps-3 or cvs2git into git-fast-import: -- 8 --

[PATCH] parse_object: clear parsed when freeing buffers

2013-01-23 Thread Jonathon Mah
Add a new function free_object_buffer, which marks the object as un-parsed and frees the buffer. Only trees and commits have buffers; other types are not affected. If the tree or commit buffer is already NULL, the parsed flag is still cleared so callers can control the free themselves

Re: Bug in EOL conversion?

2013-01-23 Thread Philip Oakley
The msysgit list msys...@googlegroups.com may be a better place for this. It is likely that you have a windows specific EOL conversion set within the wider config's (i.e. --system, --global). You may have core.safecrlf set which does a round trip test so tests the conversion both ways.

[PATCH v4 0/3] Finishing touches to push advises

2013-01-23 Thread Junio C Hamano
This builds on Chris Rorvick's earlier effort to forbid unforced updates to refs/tags/ hierarchy and giving sensible error and advise messages for that case (we are not rejecting such a push due to fast forwardness, and suggesting to fetch and integrate before pushing again does not make sense).

[PATCH v4 1/3] push: further clean up fields of struct ref

2013-01-23 Thread Junio C Hamano
The nonfastforward and update fields are only used while deciding what value to assign to the status locally in a single function. Remove them from the struct ref. The requires_force field is not used to decide if the proposed update requires a --force option to succeed, or to record such a

[PATCH v4 2/3] push: further simplify the logic to assign rejection reason

2013-01-23 Thread Junio C Hamano
First compute the reason why this push would fail if done without --force, and then fail it by assigning that reason when the push was not forced (or if there is no reason to require force, allow it to succeed). Record the fact that the push was forced in the forced_update field only when the

[PATCH v4 3/3] push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE

2013-01-23 Thread Junio C Hamano
When we push to update an existing ref, if: * the object at the tip of the remote is not a commit; or * the object we are pushing is not a commit, it won't be correct to suggest to fetch, integrate and push again, as the old and new objects will not merge. If we do not have the current object

Re: [PATCH] parse_object: clear parsed when freeing buffers

2013-01-23 Thread Junio C Hamano
Jonathon Mah j...@me.com writes: Add a new function free_object_buffer, which marks the object as un-parsed and frees the buffer. Only trees and commits have buffers; other types are not affected. If the tree or commit buffer is already NULL, the parsed flag is still cleared so callers can

Re: [msysGit] Re: Bug in EOL conversion?

2013-01-23 Thread Erik Faye-Lund
On Wed, Jan 23, 2013 at 10:55 PM, Philip Oakley philipoak...@iee.org wrote: The msysgit list msys...@googlegroups.com may be a better place for this. It is likely that you have a windows specific EOL conversion set within the wider config's (i.e. --system, --global). You may have

Re: [PATCH] parse_object: clear parsed when freeing buffers

2013-01-23 Thread Jonathon Mah
[Adding Jeff King to CC; I meant to copy you in the original but forgot, sorry] On 2013-01-23, at 14:19, Junio C Hamano gits...@pobox.com wrote: Jonathon Mah j...@me.com writes: Add a new function free_object_buffer, which marks the object as un-parsed and frees the buffer. Only trees and

Re: [PATCH v3 0/2] Make git-svn work with gitdir links

2013-01-23 Thread Eric Wong
Barry Wardell barry.ward...@gmail.com wrote: On Wed, Jan 23, 2013 at 2:32 AM, Eric Wong normalper...@yhbt.net wrote: Does squashing this on top of your changes fix all your failures? I plan on squashing both your changes together with the below: Yes, I can confirm that applying this patch

[PATCH] git-svn: cleanup sprintf usage for uppercasing hex

2013-01-23 Thread Eric Wong
We do not need to call uc() separately for sprintf(%x) as sprintf(%X) is available. Signed-off-by: Eric Wong normalper...@yhbt.net --- perl/Git/SVN.pm| 4 ++-- perl/Git/SVN/Editor.pm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm

[PULL] git-svn updates for master

2013-01-23 Thread Eric Wong
The following changes since commit ec3ae6ec46ed48383ae40643990f169b65a563cc: Merge git://ozlabs.org/~paulus/gitk (2013-01-23 08:35:03 -0800) are available in the git repository at: git://bogomips.org/git-svn master for you to fetch changes up to 812ed405ac961093b7eb916246d5f288630edfb2:

Re: [PATCH] git-svn: cleanup sprintf usage for uppercasing hex

2013-01-23 Thread Jonathan Nieder
Eric Wong wrote: We do not need to call uc() separately for sprintf(%x) as sprintf(%X) is available. For what it's worth, Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

[PATCH] don't use timers if NO_SETITIMER is set

2013-01-23 Thread Sébastien Boisvert
With NO_SETITIMER, the user experience on legacy Lustre is fixed, but there is no early progress. The patch has no effect on the resulting git executable if NO_SETITIMER is not set (the default). So by default this patch has no effect at all, which is good. git tests: $ make clean $ make

Re: auto packing with simultaneous pushes: error: Could not stat 'objects/[…]/[…]'

2013-01-23 Thread Ivan D Vasin
On Wed, Jan 23, 2013 at 7:28 PM, Junio C Hamano gits...@pobox.com wrote: Ivan D Vasin nisa...@gmail.com writes: my suggestion is that an auto pack should lock the repository, preventing at least other auto packs (and perhaps other operations) ... ``git fsck`` is successful on both of our

Re: [PATCH 0/3] fixup remaining cvsimport tests

2013-01-23 Thread Michael Haggerty
On 01/23/2013 12:03 PM, John Keeping wrote: On Wed, Jan 23, 2013 at 10:54:36AM +0100, Michael Haggerty wrote: On 01/20/2013 09:17 PM, Chris Rorvick wrote: I have never used cvs2git, but I suspect Eric's efforts in making it a potential backend for cvsimport are a better use of time. Is it

Re: [PATCH v3 01/10] wildmatch: fix ** special case

2013-01-23 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: If we do that, we need to do the same in tree_entry_interesting(). In other words, pathspec learns the new glob syntax. It's fine for an experimental flag like USE_WILDMATCH. But after fnmatch is replaced by wildmatch unconditionally (thus USE_WILDMATCH

Re: What's cooking in git.git (Jan 2013, #08; Tue, 22)

2013-01-23 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: Is it it does not work yet with cvsps3, or it will not ever work with cvsps3? The impression I am getting is that it is the latter. The existing script (git-cvsimport.perl) won't ever work with cvsps-3 since features it relies on have been removed. I

Re: [PATCH v3 0/2] Make git-svn work with gitdir links

2013-01-23 Thread Junio C Hamano
Eric Wong normalper...@yhbt.net writes: diff --git a/git-svn.perl b/git-svn.perl index c232798..e5bd292 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -332,11 +332,13 @@ if ($cmd $cmd =~ /(?:clone|init|multi-init)$/) { $ENV{GIT_DIR} = command_oneline([qw/rev-parse

Re: [PATCH v3 01/10] wildmatch: fix ** special case

2013-01-23 Thread Duy Nguyen
On Thu, Jan 24, 2013 at 11:49 AM, Junio C Hamano gits...@pobox.com wrote: The only problem I see is, without the version string, there's no way to know if ** is supported. Old git versions will happily take ** and interpret as *. When you advise someone to use ** you might need to add check if

Re: [PATCH/RFC] Revoke write access to refs and odb after importing another repo's odb

2013-01-23 Thread Duy Nguyen
On Thu, Jan 24, 2013 at 4:06 AM, Junio C Hamano gits...@pobox.com wrote: Jens Lehmann jens.lehm...@web.de writes: This is a false positive. The merge algorithm picked a fast-forward in a submodule as a proper merge result and records that in a gitlink. But as Duy pointed out this could be

Re: [PATCH] parse_object: clear parsed when freeing buffers

2013-01-23 Thread Jeff King
On Wed, Jan 23, 2013 at 04:25:01PM -0800, Junio C Hamano wrote: With the object cache, isn't modifying the object unsafe in general? Instead of auditing code paths, it's now necessary to audit _all_ code that uses struct object, which seems infeasible. The object layer was designed

Re: [PATCH v2 2/3] push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE

2013-01-23 Thread Jeff King
On Wed, Jan 23, 2013 at 08:28:49AM -0800, Junio C Hamano wrote: How about doing this? For needs force cases, we say this instead: hint: you cannot update a ref that points at a non-commit object, or hint: update a ref to point at a non-commit object, without --force. Being explicit

Re: [PATCH v4 3/3] push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE

2013-01-23 Thread Jeff King
On Wed, Jan 23, 2013 at 01:55:30PM -0800, Junio C Hamano wrote: If we do not have the current object at the tip of the remote, we do not even know that object, when fetched, is something that can be merged. In such a case, suggesting to pull first just like non-fast-forward case may not be

Re: [PATCH] parse_object: clear parsed when freeing buffers

2013-01-23 Thread Jeff King
On Wed, Jan 23, 2013 at 01:25:04PM -0800, Jonathon Mah wrote: Several areas of code would free buffers for object structs that contained them (struct tree and struct commit), but without clearing the parsed flag. parse_object would clear the flag for struct tree, but commits would remain in

links of london sale developed because of a person

2013-01-23 Thread falimie
Through 1990, strong links of london sale http://www.linksoflondonbraceletsweetie.co.uk/ /strong developed because of a person obtain few of perch cufflinks on a hometown restaurateur what individuals sought after an extraordinary item for the purpose of routine shoppers. After that, typically

What makes links of london friendship bracelet have out from the herd

2013-01-23 Thread falimie
Inbound links connected with Liverpool undoubtedly are a well known service provider connected with both ladies and men necklaces. Recognized the government financial aid 1990, strong links of london sale http://www.cheaplinksoflondonbracelet.co.uk/ /strong happened on account of an effective ask

[PATCH 1/3] mergetool--lib: fix startup options for gvimdiff tool

2013-01-23 Thread Alexey Shumkin
Options are taken from Git source/mergetools/vim Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- git-gui/lib/mergetool.tcl | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl index 3c8e73b..4fc1cab 100644 ---

[PATCH 2/3] mergetool--lib: Add diffuse as a tool

2013-01-23 Thread Alexey Shumkin
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- git-gui/lib/mergetool.tcl | 9 + 1 file changed, 9 insertions(+) diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl index 4fc1cab..837ce17 100644 --- a/git-gui/lib/mergetool.tcl +++ b/git-gui/lib/mergetool.tcl @@

[PATCH 3/3] mergetool--lib: Add TortoiseMerge as a tool

2013-01-23 Thread Alexey Shumkin
Also added Russian translation of the added error message %s cannot be used without a base Signed-off-by: Alexey Shumkin alex.crez...@gmail.com --- git-gui/lib/mergetool.tcl | 10 ++ git-gui/po/ru.po | 4 2 files changed, 14 insertions(+) diff --git

Re: [PATCH 1/2] upload-pack: avoid parsing objects during ref advertisement

2013-01-23 Thread Jeff King
On Fri, Jan 18, 2013 at 03:12:52PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: When we advertise a ref, the first thing we do is parse the pointed-to object. This gives us two things: 1. a struct object we can use to store flags 2. the type of the object, so we