* Re: [PATCH 1/2] t7001: add test for git-mv dir1 dir2/
From: Johannes Schindelin @ 2006-07-26 18:47 UTC (permalink / raw)
To: Jon Smirl; +Cc: git, junkio
In-Reply-To: <9e4733910607261050k5f8d8d5dke5ded3a806b46f21@mail.gmail.com>
Hi,
On Wed, 26 Jul 2006, Jon Smirl wrote:
> An exact test case:
>
> git clone git foo
> git clone git foo1
> cd foo
> mkdir zzz
> git mv gitweb zzz
> cg diff >patch
> cd ../foo1
> cg patch <../foo/patch
>
> This patch won't apply because zzz does not exist in foo1
Okay, I got it wrong, then. Thanks for the clarification!
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH 1/2] t7001: add test for git-mv dir1 dir2/
From: Junio C Hamano @ 2006-07-26 18:58 UTC (permalink / raw)
To: Jon Smirl; +Cc: git
In-Reply-To: <9e4733910607261131q195defa7vbedd72cb0b938ba3@mail.gmail.com>
"Jon Smirl" <jonsmirl@gmail.com> writes:
> git diff HEAD makes a much longer patch that deltas out the existing
> files and delta in the new file.
>
> It's applying patches in the extended git format that fails.
Thanks.
^ permalink raw reply
* Re: [PATCH 1/2] t7001: add test for git-mv dir1 dir2/
From: Junio C Hamano @ 2006-07-26 19:05 UTC (permalink / raw)
To: git
In-Reply-To: <200607262039.25155.Josef.Weidendorfer@gmx.de>
Josef Weidendorfer <Josef.Weidendorfer@gmx.de> writes:
> On Wednesday 26 July 2006 19:41, Johannes Schindelin wrote:
>>
>> If dir2 already exists, git-mv should move dir1 _into_dir2/.
>> Noticed by Jon Smirl.
>
> Thanks for adding this test.
> BTW, the original PERL script passes it quite fine.
>
> I just looked at Jon's problem. Doesn't seem to be related to
> git-mv or git at all, but more a cogito problem.
> I have some cogito-0.18pre installed, and cg-patch is patching
> the stuff all itself, not using git for this. Pasky?
"git apply" seems to grok this just fine.
> Doing the same with git, i.e. in a rep with existing dir/
>
> mkdir new
> git mv dir new
> git diff --cached -M -C >patch
> git reset --hard
> git apply <patch
>
> However, "git status" shows the "new/" directory totally
> untracked afterwards. Is this expected?
Running "git apply --index <patch" I see the "renamed: " in
there and zzz (or your "new") is tracked.
^ permalink raw reply
* Re: [PATCH 3/5] git-instaweb: store parameters in config
From: Junio C Hamano @ 2006-07-26 19:16 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, junkio, Eric Wong
In-Reply-To: <Pine.LNX.4.63.0607261633320.29667@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> It already reads the config for defaults, and now it also stores
> the last passed parameters in the config.
This might need to be conditional -- usually people override the
default from the command line as a one-shot thing, and storing
them in the configuration file would upset them.
^ permalink raw reply
* Re: [PATCH 4/5] git-instaweb: Fall back to Apache when LigHTTP was not found
From: Junio C Hamano @ 2006-07-26 19:22 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, junkio, Eric Wong
In-Reply-To: <Pine.LNX.4.63.0607261633560.29667@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Apache is more likely to be installed...
>
> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> ---
> git-instaweb.sh | 12 +++++++++---
> 1 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/git-instaweb.sh b/git-instaweb.sh
> index 1d3ea73..242b55e 100755
> --- a/git-instaweb.sh
> +++ b/git-instaweb.sh
> @@ -25,9 +25,6 @@ conf=$GIT_DIR/gitweb/httpd.conf
>
> # Defaults:
>
> -# if installed, it doesn't need further configuration (module_path)
> -test -z "$httpd" && httpd='lighttpd -f'
> -
> # probably the most popular browser among gitweb users
> test -z "$browser" && browser='firefox'
>
> @@ -135,6 +132,15 @@ do
> shift
> done
>
> +# if installed, it doesn't need further configuration (module_path)
> +if [ -z "$httpd" ]; then
> + httpd='lighttpd -f'
> + which "$httpd" >/dev/null 2>&1 || httpd='apache2 -f'
> + which "$httpd" >/dev/null 2>&1 || httpd='apache -f'
> + which "$httpd" >/dev/null 2>&1 || httpd='httpd -f'
> + which "$httpd" >/dev/null || exit 1
> +fi
> +
Please don't use "which" in scripts. Consult this thread:
http://thread.gmane.org/gmane.comp.version-control.git/23382/focus=23394
^ permalink raw reply
* Re: [PATCH 1/2] t7001: add test for git-mv dir1 dir2/
From: Junio C Hamano @ 2006-07-26 19:31 UTC (permalink / raw)
To: Jon Smirl; +Cc: git
In-Reply-To: <7vejw8ry5f.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> writes:
> "Jon Smirl" <jonsmirl@gmail.com> writes:
>
>> git diff HEAD makes a much longer patch that deltas out the existing
>> files and delta in the new file.
>>
>> It's applying patches in the extended git format that fails.
>
> Thanks.
... and it turns out that "git apply" (with or without --index)
groks it just fine. I suspect the fix is quite recent (not in
v1.4.2-rc1 but in v1.4.2-rc2).
^ permalink raw reply
* Re: [PATCH 3/5] git-instaweb: store parameters in config
From: Johannes Schindelin @ 2006-07-26 19:53 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Eric Wong
In-Reply-To: <7v3bcorxbd.fsf@assigned-by-dhcp.cox.net>
Hi,
On Wed, 26 Jul 2006, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > It already reads the config for defaults, and now it also stores
> > the last passed parameters in the config.
>
> This might need to be conditional -- usually people override the
> default from the command line as a one-shot thing, and storing
> them in the configuration file would upset them.
I agree that this should be conditional, but the other way round, no?
git-instaweb is meant as a one-shot install thing, so I would like to do
this in some arbitrary repo:
git-instaweb
and see a browser. Okay, so it does not work: I do not have LigHTTP, and
my apache is not in the path (and you need to specify the modules-path
anyway, if it is different than /usr/lib/apache2/modules), so I do
git-instaweb --httpd=/usr/local/apache2/bin/httpd\ -f \
--module-path=/usr/local/apache2/modules
Works! After I played a little with it (or rebooted the computer), I would
like to start it again:
git-instaweb
My point being: you do not really need a different configuration with
git-instaweb, once you got it right.
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH 4/5] git-instaweb: Fall back to Apache when LigHTTP was not found
From: Johannes Schindelin @ 2006-07-26 19:57 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Eric Wong
In-Reply-To: <7vr708qih4.fsf@assigned-by-dhcp.cox.net>
Hi,
On Wed, 26 Jul 2006, Junio C Hamano wrote:
> Please don't use "which" in scripts. Consult this thread:
>
> http://thread.gmane.org/gmane.comp.version-control.git/23382/focus=23394
I remembered vaguely, so I searched in git-instaweb:
$ git grep -n which next:git-instaweb.sh
next:git-instaweb.sh:40: [white space...] which $httpd_only >/dev/null
Well, the fallback mechanism might not be that useful anyway: if you have
apache, you have to specify the modules path. I'll do a patch instead
which exits cleanly if either $httpd or $browser could not be executed,
okay?
Ciao,
Dscho
^ permalink raw reply
* Re: [PATCH 2/2] builtin git-mv: support moving directories
From: Junio C Hamano @ 2006-07-26 19:58 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
In-Reply-To: <Pine.LNX.4.63.0607261941210.29667@wbgn013.biozentrum.uni-wuerzburg.de>
Thanks. Will apply.
^ permalink raw reply
* [PATCH] git-cvsserver: support multiline commit messages
From: Johannes Schindelin @ 2006-07-26 19:59 UTC (permalink / raw)
To: git, junkio, Martin Langhoff
Earlier, cvsserver barfed when you tried to check in files with a
multiline commit message.
That is what Argumentx is for... Argument: lines can be followed by
several Argumentx: lines, which means they should be appended.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
git-cvsserver.perl | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index b2837ad..1b70cd9 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -549,12 +549,15 @@ sub req_Argument
{
my ( $cmd, $data ) = @_;
- # TODO : Not quite sure how Argument and Argumentx differ, but I assume
- # it's for multi-line arguments ... somehow ...
+ # Argumentx means: append to last Argument (with a newline in front)
$log->debug("$cmd : $data");
- push @{$state->{arguments}}, $data;
+ if ( $cmd eq 'Argumentx') {
+ ${$state->{arguments}}[$#{$state->{arguments}}] .= "\n" . $data;
+ } else {
+ push @{$state->{arguments}}, $data;
+ }
}
# expand-modules \n
--
1.4.2.rc2.g96f2-dirty
^ permalink raw reply related
* Re: [PATCH 1/2] t7001: add test for git-mv dir1 dir2/
From: Jon Smirl @ 2006-07-26 20:33 UTC (permalink / raw)
To: Junio C Hamano, Petr Baudis; +Cc: git
In-Reply-To: <7vmzawqi1m.fsf@assigned-by-dhcp.cox.net>
On 7/26/06, Junio C Hamano <junkio@cox.net> wrote:
> Junio C Hamano <junkio@cox.net> writes:
>
> > "Jon Smirl" <jonsmirl@gmail.com> writes:
> >
> >> git diff HEAD makes a much longer patch that deltas out the existing
> >> files and delta in the new file.
> >>
> >> It's applying patches in the extended git format that fails.
> >
> > Thanks.
>
> ... and it turns out that "git apply" (with or without --index)
> groks it just fine. I suspect the fix is quite recent (not in
> v1.4.2-rc1 but in v1.4.2-rc2).
I can confirm that git apply is handling this correctly with code from
the current git tree. cogito is failing this case.
--
Jon Smirl
jonsmirl@gmail.com
^ permalink raw reply
* [PATCH] cvsserver: imitate git-update-ref when committing
From: Johannes Schindelin @ 2006-07-26 20:51 UTC (permalink / raw)
To: git, junkio, Martin Langhoff
git-update-ref writes into the lockfile, and renames it afterwards. Like
commit v1.3.0-rc3~22, it is not only cleaner, but also helps with shared
setups: every developer can have a different primary group; what matters
is that $GIT_DIR/refs/heads has to be writable by a group you are in.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
git-cvsserver.perl | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 1b70cd9..2c1b0c7 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -1144,9 +1144,7 @@ sub req_ci
exit;
}
- open FILE, ">", "$ENV{GIT_DIR}refs/heads/$state->{module}";
- print FILE $commithash;
- close FILE;
+ print LOCKFILE $commithash;
$updater->update();
@@ -1173,7 +1171,9 @@ sub req_ci
}
close LOCKFILE;
- unlink($lockfile);
+ my $reffile = "$ENV{GIT_DIR}refs/heads/$state->{module}";
+ unlink($reffile);
+ rename($lockfile, $reffile);
chdir "/";
print "ok\n";
--
1.4.2.rc2.g2b3d-dirty
^ permalink raw reply related
* Challenge: Importing Mozilla CVS into git
From: Jon Smirl @ 2006-07-26 21:08 UTC (permalink / raw)
To: git
If anyone is looking for a project, it is still not possible to import
Mozilla CVS into git and then do increment updates. As I recall from
the last time I played with it, cvsps throws away some of the branches
because it thinks they are in a loop. parsecvs is unable to complete
the entire import without getting errors and aborting.
cvs2svn can import the entire Mozilla repository correctly. But it
imports it to svn and does not have incremental support.
Best solution would be to use the parser from parsecvs, apply the
change set detection algorithm from cvs2svn, and then add cvsps'
incremental update.
It's also not reasonable to fork git processes, there are about a
million change sets in Mozilla and it takes days of CPU time to do 1M
forks. The import app needs to use a library version of git. Another
tactic to reduce CPU time is to directly write pack files with the
delta in a first pass, and add the change set index in a later pass.
--
Jon Smirl
jonsmirl@gmail.com
^ permalink raw reply
* [PATCH] instaweb: Be more clear if httpd or the browser fail
From: Johannes Schindelin @ 2006-07-26 21:11 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Eric Wong
In-Reply-To: <Pine.LNX.4.63.0607262153380.29667@wbgn013.biozentrum.uni-wuerzburg.de>
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
On Wed, 26 Jul 2006, Johannes Schindelin wrote:
> Well, the fallback mechanism might not be that useful anyway: if you have
> apache, you have to specify the modules path. I'll do a patch instead
> which exits cleanly if either $httpd or $browser could not be executed,
> okay?
Here you are
git-instaweb.sh | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 1d3ea73..585ad7c 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -54,6 +54,10 @@ start_httpd () {
fi
done
fi
+ if test $? != 0; then
+ echo "Could not execute http daemon $httpd."
+ exit 1
+ fi
}
stop_httpd () {
@@ -189,7 +193,7 @@ EOF
else
# plain-old CGI
list_mods=`echo "$httpd" | sed "s/-f$/-l/"`
- $list_mods | grep 'mod_cgi\.c' >/dev/null || \
+ $list_mods | grep 'mod_cgi\.c' >/dev/null 2>&1 || \
echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf"
cat >> "$conf" <<EOF
AddHandler cgi-script .cgi
@@ -239,4 +243,5 @@ esac
start_httpd
test -z "$browser" && browser=echo
-$browser http://127.0.0.1:$port
+url=http://127.0.0.1:$port
+$browser $url || echo $url
--
1.4.2.rc2.g84db
^ permalink raw reply related
* Re: [PATCH 3/5] git-instaweb: store parameters in config
From: Johannes Schindelin @ 2006-07-26 21:13 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Eric Wong
In-Reply-To: <Pine.LNX.4.63.0607262147280.29667@wbgn013.biozentrum.uni-wuerzburg.de>
Hi,
On Wed, 26 Jul 2006, Johannes Schindelin wrote:
> On Wed, 26 Jul 2006, Junio C Hamano wrote:
>
> > Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> >
> > > It already reads the config for defaults, and now it also stores
> > > the last passed parameters in the config.
> >
> > This might need to be conditional -- usually people override the
> > default from the command line as a one-shot thing, and storing
> > them in the configuration file would upset them.
>
> I agree that this should be conditional, but the other way round, no?
Being bitten by my own words. It is plain dumb to store parameters for
which instaweb fails. And my patch did that. Oh, well.
So, I'd say: just forget about patches [3-5]/5.
Ciao,
Dscho
^ permalink raw reply
* Better Future, world-copied
From: Kristen Santiago @ 2006-07-26 21:34 UTC (permalink / raw)
To: git-commits-head-owner
Your cre dit doesn't matter to us! If you OWN real est ate
and want IMMEDIATE3 cash to spend ANY way you like, or simply wish
to LOWER your monthly paym ents by a third or more, here are the dea ls
we have TODAY (hurry, these ofers will expre TONIGHT):
$488,000.00 at a 3.67,% fixed-rate3
$372,000.00 at a 3.90,% variable-rate7
$492,000.00 at a 3.21,% interest-onlyD
$248,000.00 at a 3.36,% fixed-rate1
$198,000.00 at a 3.55,% variable-rateU
Hurry, when these deals are gone, they are gone Simply fill out this one-min ute form...
Don't worry about approval, your cre dit will not disqualify you!
http://3UPOYVRD.doolies.net
see the downed helicopter some where on his left and the ore flatcars up
over my head. It's never been any other way. Where is all this gunk coming
secondly, he's been kind of strange lately." Arthur laughed and shook his
Since childhood he had relied on nothing but himself. And since childhood
to him, the quagmire had sucked him in up to his knees.
"Glad to meet you, Mr. Schuhart. How are you? You know, we've met
the joints; it seemed to him, through the hot haze that was enveloping his
more, and Throaty's unblinking angelic eyes stared at Redrick, a porcelain
place. Redrick's parboiled hands ached, and the backpack kept bumping into
nothing.
When they finally scrambled out onto dry land that was covered by
^ permalink raw reply
* Re: [PATCH] Eliminate Scalar::Util usage from private-Error.pm
From: Petr Baudis @ 2006-07-26 21:34 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Junio C Hamano, git
In-Reply-To: <Pine.LNX.4.63.0607260416070.29667@wbgn013.biozentrum.uni-wuerzburg.de>
Hi!
Dear diary, on Wed, Jul 26, 2006 at 04:25:13AM CEST, I got a letter
where Johannes Schindelin <Johannes.Schindelin@gmx.de> said that...
> Nope. The culprit is
>
> use lib (split(/:/, $ENV{GITPERLLIB} || "/Library/Perl/darwin"));
>
> The latter, /Library/Perl/darwin comes from making "instlibdir" in perl/,
> which in turn is generated by "perl Makefile.PL". Calling the latter with
> PREFIX set does not change the output of "instlibdir" in any way.
xpasky@machine[1:0]~/git-pb/perl$ perl Makefile.PL && make instlibdir
Writing Makefile for Git
/usr/lib/perl5/site_perl/5.8.8/i686-linux
xpasky@machine[1:0]~/git-pb/perl$ perl Makefile.PL PREFIX=/home/xpasky && make instlibdir
Writing Makefile for Git
/home/xpasky/lib/perl5/site_perl/5.8.8/i686-linux
But it wouldn't help anyway, you would need to install git "to
itself", which I'm not sure how well works.
I think in previous discussions it was deemed acceptable to require
the user running Git in place to set PERL5LIB so that Git.pm is found.
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Snow falling on Perl. White noise covering line noise.
Hides all the bugs too. -- J. Putnam
^ permalink raw reply
* Licensing and the library version of git
From: Jon Smirl @ 2006-07-26 21:36 UTC (permalink / raw)
To: git
Can the library version of git be licensed LGPL instead of GPL? If it
is GPL then it can't be linked into non-GPL projects like Eclipse.
--
Jon Smirl
jonsmirl@gmail.com
^ permalink raw reply
* Re[2]: from Carolina
From: Carito @ 2006-07-26 21:49 UTC (permalink / raw)
To: Felix
Hello, Felix
I want to start my first letter from a question: "Is it possible to be happy without LOVE?"
I think that you will agree with me if the answer will be "NO WAY". Love is the most beautiful and exciting thing
that may happen between man and woman! It inspires us only for doing positive things towards each other.
One very famous writer said: "The beauty will rescue the world" i agree with his words but still i would add :
" LOVE and Beauty will rescure the world".
I hope you agree with me that Love is a big notion.
There's love to God, to Mother, to a child to the country where you were born, and there's love that joins a man
and woman for all their life. That is the LOVE i'm looking for! And i'm seeking for the man who is also eager to have
this life long adventure full of surprises and new experience we can share together! Will you join me for this trip?
I do realise that it should be very difficult to say "Yes" from the first letter having no idea about me.
That's why i just offer to get to know each other better though correspondence that will help us to reveal many things
about each other whether we mach perfectly or not. In addition you can look at my pictures and read some info about me here
http://dating-foryou.com/passion/
I hope you'll like what you see and read there.
Well closing my first letter to you i just want to thank you for reading it and i really hope that you'll share
my point of view on what i said above. I do really hope that you'll answer me soon.
Best regards.....
Carito
If you think that you were subscribed by mistake for this mail
delivery or if your email has been added without your permission,
please, visit http://dating-foryou.com/passion/ and unsubscribe from our mails.
^ permalink raw reply
* [PATCH] Add description on how to use an HTTP proxy with git.
From: Robin Rosenberg @ 2006-07-26 22:23 UTC (permalink / raw)
To: git
From: Robin Rosenberg <robin.rosenberg@dewire.com>
---
Documentation/urls.txt | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/Documentation/urls.txt b/Documentation/urls.txt
index 7477413..fb94162 100644
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
@@ -8,6 +8,13 @@ to name the remote repository:
- rsync://host.xz/path/to/repo.git/
- http://host.xz/path/to/repo.git/
- https://host.xz/path/to/repo.git/
+===============================================================
+
+If you need to use an HTTP proxy you can set the `http_proxy`
+environment variable to a suitable value, e.g.
+`proxy.mydomain.com:8080`. This is a libcurl feature.
+
+===============================================================
- git://host.xz/path/to/repo.git/
- git://host.xz/~user/path/to/repo.git/
- ssh://host.xz/path/to/repo.git/
@@ -15,7 +22,7 @@ to name the remote repository:
- ssh://host.xz/~/path/to/repo.git
===============================================================
-SSH Is the default transport protocol and also supports an
+SSH is the default transport protocol and also supports an
scp-like syntax. Both syntaxes support username expansion,
as does the native git protocol. The following three are
identical to the last three above, respectively:
^ permalink raw reply related
* Re: [PATCH 5/5] git-instaweb: If firefox was not found, just print the URL
From: Eric Wong @ 2006-07-26 22:40 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, junkio
In-Reply-To: <Pine.LNX.4.63.0607261634200.29667@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
>
> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> ---
> git-instaweb.sh | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/git-instaweb.sh b/git-instaweb.sh
> index 242b55e..340ab98 100755
> --- a/git-instaweb.sh
> +++ b/git-instaweb.sh
> @@ -245,4 +245,5 @@ esac
>
> start_httpd
> test -z "$browser" && browser=echo
> +which "$browser" >/dev/null 2>&1 || browser=echo
> $browser http://127.0.0.1:$port
>From what I hear, 'which' isn't portable on some platforms.
Now this isn't the only place 'which' is used in instaweb, and I've been
meaning to get rid of the other 'which' call in there for a while, but I
haven't had much time to devote to git the past few weeks. Help here
would be good.
--
Eric Wong
^ permalink raw reply
* Re: [PATCH 0/5] Some git-instaweb enhancements
From: Eric Wong @ 2006-07-26 22:41 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, junkio
In-Reply-To: <Pine.LNX.4.63.0607261628020.29667@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
> these are assorted fixes/features for git-instaweb:
>
> 1) do not mind git being installed somewhere else than /usr/bin
> 2) do not mind some Apache having mod_cgi builtin
> 3) store defaults in config
> 4) fall back to apache if lighttp cannot be found
1-4:
Acked-by: Eric Wong <normalperson@yhbt.net>
--
Eric Wong
^ permalink raw reply
* Re: Moving a directory into another fails
From: Nicolas Vilz @ 2006-07-26 22:34 UTC (permalink / raw)
To: Jon Smirl; +Cc: git
In-Reply-To: <9e4733910607260800v618edf0em7b0f5c3332bf8fc5@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1887 bytes --]
On Wed, Jul 26, 2006 at 11:00:48AM -0400, Jon Smirl wrote:
> I cloned a git project. Then in the original I did mkdir for a new
> directory and use git mv to move an existing directory into it. I then
> used cg diff to generate a patch for the move.
>
> When I use cg patch to apply this patch to the cloned tree it fails.
> This seems to be a problem in the git code, not cg. It is not picking
> up the creation of the new intervening subdirectory correctly.
>
> I just synced and this does not work in the current code.
I tried to reproduce your scenario and before that I setup a test
repository.
(1) mkdir git_test
(2) cd git_test
(3) git init-db
(4) vim test.txt
# fill in some bogus text
(5) mkdir testing
(6) cd testing
(7) vim test1.txt
# again, fill in some bogus text
(8) cd ..
(9) cg add test.txt testing/test1.txt
(10) cg commit -C
# just give a fancy commit message...
(11) cd ..
(12) mkdir bare_git
(13) cd bare_git
(14) mkdir git_test.git
(15) GIT_DIR=git_test.git git init-db
(16) cd ../git_test
(17) git push ../bare_git/git_test.git --all
(18) cd ../
(19) git clone bare_git/git_test.git git_test2
(20) cd git_test
(21) mkdir blah_test
(22) git mv testing/ blah_test/
(23) cg diff > ../mkdir_patch.diff
(24) cd ..
(25) cd git_test2/
(26) cg patch < ../mkdir_patch.diff
from the last one (26) i get
patching file blah_test/testing/test1.txt
patching file testing/test1.txt
touch: cannot touch `testing/test1.txt': No such file or directory
Adding file blah_test/testing/test1.txt
Removing file testing/test1.txt
but the result is correct. There is no testing-directory in here
anymore, and inside blah_test, there is my testing dir with the file
test1.txt in it...
did I miss something?
I use cogito-0.17.3 with git version 1.4.1
(obviously without that recently rewritten git-mv...)
Nicolas
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: Moving a directory into another fails
From: Jon Smirl @ 2006-07-26 23:03 UTC (permalink / raw)
To: Nicolas Vilz; +Cc: git
In-Reply-To: <20060726223459.GA30601@vsectoor.geht-ab-wie-schnitzel.de>
This is a simpler sequence
cg clone git foo
cg clone git foo1
cd foo
mkdir zzz
git mv gitweb zzz
cg diff >patch
cg ../foo1
cg patch <../foo/patch
Fails with these errors. We have determined that git apply patch is ok
and this is a bug in cg patch.
[jonsmirl@jonsmirl foo1]$ cg patch <../foo/patch
mv: cannot move `gitweb/README' to `zzz/gitweb/README': No such file
or directory
mv: cannot move `gitweb/gitweb.cgi' to `zzz/gitweb/gitweb.cgi': No
such file or directory
mv: cannot move `gitweb/gitweb.css' to `zzz/gitweb/gitweb.css': No
such file or directory
mv: cannot stat `"gitweb/test/M\\303\\244rchen"': No such file or directory
mv: cannot move `gitweb/test/file with spaces' to
`zzz/gitweb/test/file with spaces': No such file or directory
mv: cannot move `gitweb/test/file+plus+sign' to
`zzz/gitweb/test/file+plus+sign': No such file or directory
patch: **** Only garbage was found in the patch input.
Removing file gitweb/README
Adding file zzz/gitweb/README
error: zzz/gitweb/README: does not exist and --remove not passed
fatal: Unable to process file zzz/gitweb/README
cg-add: warning: not all items could have been added
Removing file gitweb/gitweb.cgi
Adding file zzz/gitweb/gitweb.cgi
error: zzz/gitweb/gitweb.cgi: does not exist and --remove not passed
fatal: Unable to process file zzz/gitweb/gitweb.cgi
cg-add: warning: not all items could have been added
Removing file gitweb/gitweb.css
Adding file zzz/gitweb/gitweb.css
error: zzz/gitweb/gitweb.css: does not exist and --remove not passed
fatal: Unable to process file zzz/gitweb/gitweb.css
cg-add: warning: not all items could have been added
Removing file "gitweb/test/Märchen"
Adding file "zzz/gitweb/test/Märchen"
error: "zzz/gitweb/test/Märchen": does not exist and --remove not passed
fatal: Unable to process file "zzz/gitweb/test/Märchen"
cg-add: warning: not all items could have been added
Removing file gitweb/test/file with spaces
Adding file zzz/gitweb/test/file with spaces
error: zzz/gitweb/test/file with spaces: does not exist and --remove not passed
fatal: Unable to process file zzz/gitweb/test/file with spaces
cg-add: warning: not all items could have been added
Removing file gitweb/test/file+plus+sign
Adding file zzz/gitweb/test/file+plus+sign
error: zzz/gitweb/test/file+plus+sign: does not exist and --remove not passed
fatal: Unable to process file zzz/gitweb/test/file+plus+sign
cg-add: warning: not all items could have been added
[jonsmirl@jonsmirl foo1]$
--
Jon Smirl
jonsmirl@gmail.com
^ permalink raw reply
* Re: Moving a directory into another fails
From: Nicolas Vilz @ 2006-07-26 23:25 UTC (permalink / raw)
To: Jon Smirl; +Cc: git
In-Reply-To: <9e4733910607261603m6772602cr333d8c58f555edaa@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
On Wed, Jul 26, 2006 at 07:03:30PM -0400, Jon Smirl wrote:
> This is a simpler sequence
>
> cg clone git foo
> cg clone git foo1
> cd foo
> mkdir zzz
> git mv gitweb zzz
> cg diff >patch
> cg ../foo1
> cg patch <../foo/patch
>
> Fails with these errors. We have determined that git apply patch is ok
> and this is a bug in cg patch.
Well, perhaps i should react faster and I shouldn't pause my fetchmail
for 2 or 3 hours... this is bad for this list :) You are kind of fast :)
Nicolas
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox