Some users apparently create local heads with the same basename as the remote branch they're tracking. Signed-off-by: Eric Wong <normalperson@yhbt.net> --- git-svn.perl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index a092be8..56f1700 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1086,7 +1086,7 @@ sub graft_merge_msg { my ($grafts, $l_map, $u, $p, @re) = @_; my $x = $l_map->{$u}->{$p}; - my $rl = rev_list_raw($...

Currently there is no way to set up configuration variable to a value with preceding whitespace, trailing whitespace, or one of comment delimiters ('#' or ';'). And one can't use "..." for that, because even encompassing doublequotes gets escaped. I think that git-repo-config should detect if value needs to be quoted, and do that automatically... $ declare -x GIT_CONFIG=gitconf $ git repo-config section.key "value with # inside" $ git repo-config --get section.key value wit...

It can point to both. Usually it is either unset, and then we do find over $projectroot, or it is a file (URI escaped path relative to $projectroot, SPACE, and URI escaped owner of a project; you can get the file clicking on TXT on projects_list page). -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -

With this patch, cvsimport will skip commits made in the last 10 minutes. The recent-ness test is of 5 minutes + cvsps fuzz window (5 minutes default). When working with a CVS repository that is in use, importing commits that are too recent can lead to partially incorrect trees. This is mainly due to - Commits that are within the cvsps fuzz window may later be found to have affected more files. - When performing incremental imports, clock drift between the systems may lead to skipped ...

That probably means I should have added a --force-fetch-all-and-i-mean-it flag to override the cautious behaviour. I'll repost ina few hours, with doco too. I'll try harder next time ;-) cheers martin -

you are getting soft in your old age, man :-) More seriously, as soon as I sent the patch I thought of the use case you describe. Not everyone is as patient as you are, and someone may have things scripted. If the cvs repo is local/fast and under your control, it doesn't make sense to be _so_ conservative. Also -- by having the flag we get an excuse to mention it in the doco. m -

When called with "--walk-reflogs", as long as there are reflogs available, the walker will take this information into account, rather than the parent information in the commit object. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- I do not have any idea if this will help bisecting through reflogs... Also, this is only lightly tested on the hard cases: circular reflogs, ranges, and mixed logging (log overlapping reflogged and non-reflogged revisions). Ma...

Perhaps. I did it that way deliberately because all existing users did not have to pay overhead of parsing. Thanks. Will queue in 'pu' initially as I do not have much time to look at it tonight. -

That is better but the description is too commit centric. The set of reachable objects from a tag is the tag itself and the set of reachable objects from the object it tags. The set of reachable objects from a commit is the commit itself, and the set of reachable objects from its parents and its tree. The set of reachable objects from a tree is the tree itself, and the set of reachable objects from the trees and blobs contained within it. ...

On Sun, 7 Jan 2007 15:05:53 -0500 Dave Jones <davej@redhat.com> wrote: -

Le dimanche 07 janvier 2007

Hi, I've been using cogito and stg together on cairo and I ran into problems attempting to do a cg-push. $ cg-push error: src refspec master matches more than one. fatal: unexpected EOF It turns out this is matching refs/heads/master and refs/bases/master; the second of these is an stg artifact, but not the current branch. I think there's a bug in cogito here, in cg-Xlib: [ ! -s "$_git/HEAD" ] || { _git_head="$(git-symbolic-ref HEAD)"; _git_head="${_git_head#refs/heads/}"; } This sets _gi...

I was just looking at the documentation of the post-commit hook in order to fix a problem on one of my repositories and I came across this:- "The default 'post-commit' hook, when enabled, demonstrates how to send out a commit notification e-mail." So I went looking in the templates/hooks--post-commit file and it has nothing (literally :-) ). and as far as I can see looking over git's history it has always been like that. I don't have an example to submit a patch - but I am sure lots of pe...

May I repeat my ignored request to check the update-hook-example in Documentation/howto/ for working correctly? It doesn't. I am no bash guru, but as far as i understand the code, the size of an argument is checked with matchlen. That is imho bad for regexp. I built the scenario described there and i couldn't commit to the tmp/* branches. I also couldn't commit to the bw/ topics and i couldn't tag anything as the specific role proposed in this example. as long as the length of the refs-stri...

Hey guys, So I'm trying to figure out the best way to pull out a checkout of the entire tree as of a given revision ID. I have a whole bunch of revision IDs, and I'd like to know what the git equivalent of (say) the following is: svn co -r280600 file:///path/to/svn/repo For the sake of argument, let's say that r280600 imported as 07058310db903317faa300b93004a5a2e0fc2dcc into my git tree. How do I get a pristine checkout in my working copy of the entire tree as the repository saw it at 07058...

These two do vastly different things (but the latter is flawed and does _not_ do what it is trying to do). - If this checkout is just to look-see, and if you are on a branch that is precious to you (say, you intend to keep importing from svn or other repository onto that branch), then you should use a temporary branch. Eric's suggestion is this approach -- but "git checkout -b $branch $start" is about CREATING a new branch, so once you used the temporary branch name, you cann...

Heh. He's going to kill me for continuing to drag his name throught he What I've been doing is 'rm -rf *' from the working directory and Eric's shows the same problem - for some revision IDs, when I do a I assume 'removing everything in the working tree' counts as "local modifications"? :) -

So, if I were starting with an empty working directory, and I had just synced over the .git folder from the place where I'm doing the actual importing - how would I populate the working directory with a copy of the contents of the tree from (say) 07058310db903317faa300b93004a5a2e0fc2dcc ? -

Okay, thanks :) (I don't really care about trying to do actual development on any of the branches that I've imported - I mostly am interested in finding out some numbers on things like 'How much faster is git when rewinding the directory tree to a given commit ID?' and related issues.) -

Stefan-W. Hahn writes: > Also sprach Juergen Ruehle am Sat, 06 Jan 2007 at 22:40:52 +0100: > > Could you enumerate the other compatability problems? > > The problem that one cannot use one version of cygwin.dll and > simultaniously another (incomatible) version. (Having a local > installed cygwin window open and trying to build in a branch where > another version is used.) Yes that is an unfortunate (though probably unavoidable) downside of cygwin. But my question ...

our trunk's maintainer is lazy in merging branches, I'd like to merge the branch kkmao, and now there are so many the conflicts. I want to just use my version and overcome all the conflicts. i try in this way: git-checkout -b trunk remotes/trunk git-rebase --merge -s ours remotes/kkmao git-svn dcommit -i trunk diff-tree 9b75e30191838431810aec4eda98482a8d6935ed~1 9b75e30191838431810aec4eda98482a8d6935ed Transaction is out of date: Out of date: 'trunk/Targets/Bonito/conf/Bonito.lmbox' in transac...

The patches to prevent Porcelainish that require working tree from doing any damage in a bare repository make a lot of sense, and I want to make the is_bare_git_dir() function more reliable. In order to allow the repository owner override the heuristic implemented in is_bare_git_dir() if/when it misidentifies a particular repository, it would make sense to introduce a new configuration variable "[core] bare = true/false", and make is_bare_git_dir() notice it. The scripts would do a 'repo-config ...

Here is what I have as a follow-up patch to the one you are responding to. -- diff --git a/builtin-init-db.c b/builtin-init-db.c index 97fd82f..e78222f 100644 --- a/builtin-init-db.c +++ b/builtin-init-db.c @@ -252,9 +252,13 @@ static int create_default_files(const char *git_dir, const char *template_path) } git_config_set("core.filemode", filemode ? "true" : "false"); - /* Enable logAllRefUpdates if a working tree is attached */ - if (!is_bare_git_dir(git_dir)) + if (is_bare_reposi...

Sometimes, people have only fetch access into a bare repository that is used as a back-up location (or a distribution point) but does not have a push access for networking reasons, e.g. one end being behind a firewall, and updating the "current branch" in such a case is perfectly fine. This allows such a fetch without --update-head-ok, which is a flag that should never be used by end users otherwise. Signed-off-by: Junio C Hamano <junkio@cox.net> --- "Shawn O. Pearce" <spearce@spear...

Looks like I broke it in 747fa12cef73b6ca04fffaddaad7326cf546cdea but never noticed. Signed-off-by: Eric Wong <normalperson@yhbt.net> --- git-svn.perl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index 5377762..1da31fd 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -536,7 +536,7 @@ sub show_ignore { my $repo; $SVN ||= libsvn_connect($SVN_URL); my $r = defined $_revision ? $_revision : $SVN->get_latest_revnum; - libsvn...