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

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 ea

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

On Wed, Jan 23, 2013 at 4:10 AM, Lars Hjemli 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 require manua

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

On Wed, Jan 23, 2013 at 9:39 AM, Duy Nguyen wrote: > On Wed, Jan 23, 2013 at 4:10 AM, Lars Hjemli 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 p

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

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

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

On Wed, Jan 23, 2013 at 3:12 PM, Lars Hjemli 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", "--cach

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

> > 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

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

On Wed, Jan 23, 2013 at 9:55 AM, Duy Nguyen 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 this would work.

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

On Tue, Jan 22, 2013 at 04:11:59PM -0800, Junio C Hamano wrote: > John Keeping 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 > be merged

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

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 wo

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

On Wed, Jan 23, 2013 at 4:24 PM, Lars Hjemli wrote: > On Wed, Jan 23, 2013 at 9:55 AM, Duy Nguyen 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 invoke

git-svn problems with white-space in tag names

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 a

git-svn does not like format=4

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) w

Re: git-svn does not like format=4

On Wed, Jan 23, 2013 at 11:43 AM, Hans-Juergen Euler 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 > TortoiseSVN 1.7.

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

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 wi

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

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

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 && gi

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

On Wed, Jan 23, 2013 at 2:32 AM, Eric Wong wrote: > > Barry Wardell 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 test case which verifies that th

Re: Moving commits from one branch to another

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. trunk/tags/bran

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

On Wed, Jan 23, 2013 at 3:28 AM, John Keeping 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. cvsps cannot be

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

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 external

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

On Wed, Jan 23, 2013 at 8:34 PM, Nguyễn Thái Ngọc Duy 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 object, next time

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

On Wed, Jan 23, 2013 at 07:26:24AM -0600, Chris Rorvick wrote: > On Wed, Jan 23, 2013 at 3:28 AM, John Keeping 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 calc

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

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 & 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 variab

AW: Moving commits from one branch to another

> > 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 trie

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

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 termin

Re: GIT get corrupted on lustre

On 01/22/2013 05:14 PM, Thomas Rast wrote: Eric Chamberland 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 git than the lustre filesystem so

Re: Moving commits from one branch to another

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:

Re: GIT get corrupted on lustre

[I forgot to subscribe to the git mailing list, sorry for that] On 01/22/2013 05:14 PM, Thomas Rast wrote: Eric Chamberland 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:

Re: GIT get corrupted on lustre

On Tue, Jan 22, 2013 at 11:14 PM, Thomas Rast wrote: > Eric Chamberland 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 this analysis is 100% accurate, POSIX allows error

Re: GIT get corrupted on lustre

Erik Faye-Lund writes: > On Tue, Jan 22, 2013 at 11:14 PM, Thomas Rast wrote: >> Eric Chamberland 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 this analysis is

Re: GIT get corrupted on lustre

On Wed, Jan 23, 2013 at 4:32 PM, Thomas Rast wrote: > Erik Faye-Lund writes: > >> On Tue, Jan 22, 2013 at 11:14 PM, Thomas Rast wrote: >>> Eric Chamberland 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

AW: Moving commits from one branch to another

> 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

Erik Faye-Lund writes: > On Wed, Jan 23, 2013 at 4:32 PM, Thomas Rast wrote: >> Erik Faye-Lund writes: >> >>> POSIX allows error codes >>> to be generated other than those defined. From >>> http://pubs.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_03.html: >>> >>> "Implementations may

Re: GIT get corrupted on lustre

On Wed, Jan 23, 2013 at 4:44 PM, Thomas Rast wrote: > Erik Faye-Lund writes: > >> On Wed, Jan 23, 2013 at 4:32 PM, Thomas Rast wrote: >>> Erik Faye-Lund writes: >>> POSIX allows error codes to be generated other than those defined. From http://pubs.opengroup.org/onlinepubs/009695

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

Jeff King 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 no

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

Paul Mackerras 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? > > Yes, ple

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

Lars Hjemli 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; > + strbuf_addstr(path,

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

Nguyễn Thái Ngọc Duy 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 may find a hole

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

Junio C Hamano 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 to see if you c

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

John Keeping 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 b/Documentation/git-cvsimport.txt > index

Re: GIT get corrupted on lustre

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? :-)

Defensive publication on Git replication

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 the

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

On Wed, Jan 23, 2013 at 5:52 PM, Junio C Hamano wrote: > Lars Hjemli 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); >> +

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

On Wed, Jan 23, 2013 at 6:04 PM, Junio C Hamano wrote: > Junio C Hamano 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/

Re: GIT get corrupted on lustre

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 w

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

On Sun, Jan 20, 2013 at 5:15 AM, John Keeping 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: John Keeping

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

On Sun, Jan 20, 2013 at 5:15 AM, John Keeping 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 Someone else's review on this would be appreciated, the

[PATCH] Ignore gitk-wish buildproduct

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

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

On Sun, Jan 20, 2013 at 5:15 AM, John Keeping 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 we are caught by

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

On Wed, Jan 23, 2013 at 11:20:39AM -0800, Sverre Rabbelier wrote: > On Sun, Jan 20, 2013 at 5:15 AM, John Keeping 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 stri

RE: Question re. git remote repository

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 wor

Re: [PATCH] Ignore gitk-wish buildproduct

Lars Hjemli writes: > After running `make` on latest master, gitk-git/gitk-wish shows up as > untracked. This fixes it. > > Signed-off-by: Lars Hjemli The removal was very much deliberate [*1*]; Christian was going to send a corresponding updates to gitk maintainer [*2*, *3*] but I guess we hav

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

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 + built

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

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 ea

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

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 --- git.c| 36 t/t6400-for-each-repo.sh | 6 ++

Re: [PATCH] Ignore gitk-wish buildproduct

From: Christian Couder 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 be rebuilt to point at th

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

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 1.8

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

On Wed, Jan 23, 2013 at 11:47 AM, John Keeping 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 commented on that part of it. As another datapoint, > Brando

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

Am 23.01.2013 09:55, schrieb Duy Nguyen: > On Wed, Jan 23, 2013 at 3:12 PM, Lars Hjemli 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 *diffidx[

Re: Question re. git remote repository

"Lang, David" writes: > Thanks Matt and Dave and everyone else for your feedback on this. [administrivia: please wrap your lines to reasonable length] > 1. Download and install git for Windows on the 2 networked developer's > PC's and the 1 networked server. > > 2. On the server... > A) I

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

Sverre Rabbelier writes: > On Wed, Jan 23, 2013 at 11:47 AM, John Keeping 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 commented on that part of i

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

Am 23.01.2013 18:01, schrieb Junio C Hamano: > Nguyễn Thái Ngọc Duy 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 >> ext

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

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=bogu

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

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

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

Lars Hjemli 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) > + > + > +NAM

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

Jens Lehmann 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 "easily circumven

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

On Wed, Jan 23, 2013 at 09:13:27AM -0800, Junio C Hamano wrote: > John Keeping 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

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

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 (index-pa

Re: Bug in EOL conversion?

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. The

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

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). T

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

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 su

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

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 pu

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

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 objec

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

Jonathon Mah 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 contro

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

On Wed, Jan 23, 2013 at 10:55 PM, Philip Oakley 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 core.safecrlf set > which doe

Re: Bug in EOL conversion?

Stefan Norgren writes: > $ git add * > warning: LF will be replaced by CRLF in withlf.txt. > The file will have its original line endings in your working directory. [...] > $ ls -la > total 10 > d-+ 1 Stefan None 0 Jan 23 02:12 . > d-+ 1 Stefan None 0 Jan 23 02:10 .. > d-+

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

From: "Erik Faye-Lund" Sent: Wednesday, January 23, 2013 10:36 PM On Wed, Jan 23, 2013 at 10:55 PM, Philip Oakley 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.

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

[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 wrote: > Jonathon Mah 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;

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

Jonathon Mah writes: > No, I haven't audited the code paths (I have only the loosest > familiarity with the source). Indeed, I found that clearing the > 'parsed' flag in fsck.c (traverse_one_object()) is incorrect and > causes test failures. > > With the object cache, isn't modifying the object u

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

Barry Wardell wrote: > On Wed, Jan 23, 2013 at 2:32 AM, Eric Wong 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 on top of mine makes all > git-svn tes

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

We do not need to call uc() separately for sprintf("%x") as sprintf("%X") is available. Signed-off-by: Eric Wong --- 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 index 59215fa..490

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

On Thu, Jan 24, 2013 at 12:01 AM, Junio C Hamano wrote: > I however have this suspicion that this will become a losing battle > and we would be better off getting rid of add_submodule_odb(); > instead operations that work across repositories will be done as a > subprocess, which will get us back c

[PULL] git-svn updates for master

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

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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo in

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

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 NO_SETI

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

On Wed, Jan 23, 2013 at 7:28 PM, Junio C Hamano wrote: > Ivan D Vasin 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 repos and on the bare rep

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

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. >

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

Duy Nguyen 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 becomes obsolete

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

John Keeping 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 think y

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

Eric Wong 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 --git-dir/]); > }

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

On Thu, Jan 24, 2013 at 11:49 AM, Junio C Hamano 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

On Thu, Jan 24, 2013 at 4:06 AM, Junio C Hamano wrote: > Jens Lehmann 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 r

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

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 d

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

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 e

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

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 b

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

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

links of london sale developed because of a person

Through 1990, links of london sale 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 the fine Engli

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

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, links of london sale happened on account of an effective ask a couple sp

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

Options are taken from /mergetools/vim Signed-off-by: Alexey Shumkin --- 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 --- a/git-gui/lib/mergetool.tcl +++ b/

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

Signed-off-by: Alexey Shumkin --- 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 @@ -194,6 +194,15 @@ proc me

  1   2   >