* Re: gitweb testing with non-apache web server
From: Jakub Narebski @ 2006-08-03 15:48 UTC (permalink / raw)
To: git
In-Reply-To: <20060803153403.GA30729@buici.com>
Marc Singer wrote:
> That isn't enough. I did something like that when I was exploring the
> script. While the change *does* eliminate the 403 error, it doesn't
> make the rest of the script work properly. All of the links return to
> the same page that lists the projects.
Strange... PATH_INFO is used _only_ if 'p' parameter is not set. And all
links use 'p=$project', not PATH_INFO...
Are you sure you did changes mentioned in earlier post?
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
^ permalink raw reply
* [PATCH] fixed variable declaration in gitk
From: Michael @ 2006-08-03 15:42 UTC (permalink / raw)
To: git
Signed-off-by: Michael <barra_cuda@katamail.com>
---
gitk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gitk b/gitk
index ba4644f..5acaadf 100755
--- a/gitk
+++ b/gitk
@@ -4901,7 +4901,7 @@ proc domktag {} {
proc redrawtags {id} {
global canv linehtag commitrow idpos selectedline curview
- global mainfont
+ global mainfont canvxmax
if {![info exists commitrow($curview,$id)]} return
drawcmitrow $commitrow($curview,$id)
--
1.4.1
^ permalink raw reply related
* [PATCH] fix git-revert command-line options
From: Michael @ 2006-08-03 15:42 UTC (permalink / raw)
To: git
Signed-off-by: Michael <barra_cuda@katamail.com>
---
git-revert.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-revert.sh b/git-revert.sh
index 2bf35d1..195c3ba 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -22,14 +22,14 @@ no_commit= replay=
while case "$#" in 0) break ;; esac
do
case "$1" in
- -n|--n|--no|--no-|--no-c|--no-co|--no-com|--no-comm|\
+ -n|--no-c|--no-co|--no-com|--no-comm|\
--no-commi|--no-commit)
no_commit=t
;;
-e|--e|--ed|--edi|--edit)
edit=-e
;;
- --n|--no|--no-|--no-e|--no-ed|--no-edi|--no-edit)
+ --n|--no-e|--no-ed|--no-edi|--no-edit)
edit=
;;
-r|--r|--re|--rep|--repl|--repla|--replay)
--
1.4.1
^ permalink raw reply related
* Re: gitweb testing with non-apache web server
From: Marc Singer @ 2006-08-03 15:34 UTC (permalink / raw)
To: Jakub Narebski; +Cc: git
In-Reply-To: <easbev$act$1@sea.gmane.org>
On Thu, Aug 03, 2006 at 10:18:07AM +0200, Jakub Narebski wrote:
> <opublikowany i wys?any>
>
> Marc Singer wrote:
>
>
> > I did some debugging on the latest repo version. The lines
> >
> > our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
> > if (defined $project) {
> > ...
> >
> > are being executed even though the url is
> >
> > http://server/git
> >
> > I think that the problem is that Cherokee translates the request URL
> > into
> >
> > http://server/git/
> >
> > which means that the $ENV{'PATH_INFO'} is the string "/" insted of
> > being undefined.
>
> Try changing
>
> my $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
> if (defined $project) {
> $project =~ s|^/||; $project =~ s|/$||;
>
> to
>
> my $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
> $project =~ s|^/||; $project =~ s|/$||;
> if (defined $project && $project) {
>
> (and send patch if it works, please).
That isn't enough. I did something like that when I was exploring the
script. While the change *does* eliminate the 403 error, it doesn't
make the rest of the script work properly. All of the links return to
the same page that lists the projects.
>
> --
> Jakub Narebski
> Warsaw, Poland
> ShadeHawk on #git
>
>
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH] Make git-local-fetch a builtin
From: Matthias Kestenholz @ 2006-08-03 15:24 UTC (permalink / raw)
To: junkio; +Cc: git, Matthias Kestenholz
In-Reply-To: <11546186792870-git-send-email-matthias@spinlock.ch>
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
---
Please note! I added fetch.o to the list of LIB_OBJS. I don't know if
it should be done like that. builtin-local-fetch.o depends on fetch.o
and LIB_OBJS seemed to be the best place to add fetch.o.
Makefile | 9 +++++----
local-fetch.c => builtin-local-fetch.c | 3 ++-
builtin.h | 1 +
git.c | 1 +
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 785e188..c1285f5 100644
--- a/Makefile
+++ b/Makefile
@@ -194,7 +194,7 @@ # ... and all the rest that could be mov
PROGRAMS = \
git-checkout-index$X \
git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \
- git-hash-object$X git-index-pack$X git-local-fetch$X \
+ git-hash-object$X git-index-pack$X \
git-merge-base$X \
git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
git-peek-remote$X git-receive-pack$X \
@@ -218,7 +218,7 @@ BUILT_INS = git-log$X git-whatchanged$X
git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \
git-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X \
git-repo-config$X git-name-rev$X git-pack-objects$X \
- git-unpack-objects$X git-symbolic-ref$X
+ git-unpack-objects$X git-symbolic-ref$X git-local-fetch$X
# what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -262,7 +262,8 @@ LIB_OBJS = \
server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
- alloc.o merge-file.o path-list.o unpack-trees.o $(DIFF_OBJS)
+ alloc.o merge-file.o path-list.o unpack-trees.o fetch.o \
+ $(DIFF_OBJS)
BUILTIN_OBJS = \
builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
@@ -277,7 +278,7 @@ BUILTIN_OBJS = \
builtin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \
builtin-mv.o builtin-prune-packed.o builtin-repo-config.o \
builtin-name-rev.o builtin-pack-objects.o builtin-unpack-objects.o \
- builtin-symbolic-ref.o
+ builtin-symbolic-ref.o builtin-local-fetch.o
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
EXTLIBS = -lz
diff --git a/local-fetch.c b/builtin-local-fetch.c
similarity index 99%
rename from local-fetch.c
rename to builtin-local-fetch.c
index b216bdd..2a082d8 100644
--- a/local-fetch.c
+++ b/builtin-local-fetch.c
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2005 Junio C Hamano
*/
+#include "builtin.h"
#include "cache.h"
#include "commit.h"
#include "fetch.h"
@@ -203,7 +204,7 @@ static const char local_pull_usage[] =
* If -s is specified, then a symlink is attempted.
* If -n is _not_ specified, then a regular file-to-file copy is done.
*/
-int main(int argc, const char **argv)
+int cmd_local_fetch(int argc, const char **argv, const char *prefix)
{
int commits;
const char **write_ref = NULL;
diff --git a/builtin.h b/builtin.h
index b767245..3da353f 100644
--- a/builtin.h
+++ b/builtin.h
@@ -53,6 +53,7 @@ extern int cmd_name_rev(int argc, const
extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
extern int cmd_unpack_objects(int argc, const char **argv, const char *prefix);
extern int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
+extern int cmd_local_fetch(int argc, const char **argv, const char *prefix);
extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
diff --git a/git.c b/git.c
index e40e859..a4ce155 100644
--- a/git.c
+++ b/git.c
@@ -269,6 +269,7 @@ static void handle_internal_command(int
{ "pack-objects", cmd_pack_objects, NEEDS_PREFIX },
{ "unpack-objects", cmd_unpack_objects, NEEDS_PREFIX },
{ "symbolic-ref", cmd_symbolic_ref, NEEDS_PREFIX },
+ { "local-fetch", cmd_local_fetch, NEEDS_PREFIX },
};
int i;
--
1.4.2.rc2.g2e994
^ permalink raw reply related
* [PATCH] Make git-symbolic-ref a builtin
From: Matthias Kestenholz @ 2006-08-03 15:24 UTC (permalink / raw)
To: junkio; +Cc: git, Matthias Kestenholz
In-Reply-To: <11546186792277-git-send-email-matthias@spinlock.ch>
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
---
Makefile | 6 +++---
symbolic-ref.c => builtin-symbolic-ref.c | 4 ++--
builtin.h | 1 +
git.c | 1 +
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 4d0243b..785e188 100644
--- a/Makefile
+++ b/Makefile
@@ -203,7 +203,6 @@ PROGRAMS = \
git-ssh-upload$X git-unpack-file$X \
git-update-server-info$X \
git-upload-pack$X git-verify-pack$X \
- git-symbolic-ref$X \
git-pack-redundant$X git-var$X \
git-describe$X git-merge-tree$X git-blame$X git-imap-send$X \
git-merge-recur$X
@@ -219,7 +218,7 @@ BUILT_INS = git-log$X git-whatchanged$X
git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \
git-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X \
git-repo-config$X git-name-rev$X git-pack-objects$X \
- git-unpack-objects$X
+ git-unpack-objects$X git-symbolic-ref$X
# what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -277,7 +276,8 @@ BUILTIN_OBJS = \
builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
builtin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \
builtin-mv.o builtin-prune-packed.o builtin-repo-config.o \
- builtin-name-rev.o builtin-pack-objects.o builtin-unpack-objects.o
+ builtin-name-rev.o builtin-pack-objects.o builtin-unpack-objects.o \
+ builtin-symbolic-ref.o
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
EXTLIBS = -lz
diff --git a/symbolic-ref.c b/builtin-symbolic-ref.c
similarity index 89%
rename from symbolic-ref.c
rename to builtin-symbolic-ref.c
index 193c87c..b4ec6f2 100644
--- a/symbolic-ref.c
+++ b/builtin-symbolic-ref.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
static const char git_symbolic_ref_usage[] =
@@ -17,9 +18,8 @@ static void check_symref(const char *HEA
die("No such ref: %s", HEAD);
}
-int main(int argc, const char **argv)
+int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
{
- setup_git_directory();
git_config(git_default_config);
switch (argc) {
case 2:
diff --git a/builtin.h b/builtin.h
index af73c3c..b767245 100644
--- a/builtin.h
+++ b/builtin.h
@@ -52,6 +52,7 @@ extern int cmd_repo_config(int argc, con
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
extern int cmd_unpack_objects(int argc, const char **argv, const char *prefix);
+extern int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
diff --git a/git.c b/git.c
index 7c3a7f8..e40e859 100644
--- a/git.c
+++ b/git.c
@@ -268,6 +268,7 @@ static void handle_internal_command(int
{ "name-rev", cmd_name_rev, NEEDS_PREFIX },
{ "pack-objects", cmd_pack_objects, NEEDS_PREFIX },
{ "unpack-objects", cmd_unpack_objects, NEEDS_PREFIX },
+ { "symbolic-ref", cmd_symbolic_ref, NEEDS_PREFIX },
};
int i;
--
1.4.2.rc2.g2e994
^ permalink raw reply related
* [PATCH] Make git-unpack-objects a builtin
From: Matthias Kestenholz @ 2006-08-03 15:24 UTC (permalink / raw)
To: junkio; +Cc: git, Matthias Kestenholz
In-Reply-To: <1154618679860-git-send-email-matthias@spinlock.ch>
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
---
Makefile | 7 ++++---
unpack-objects.c => builtin-unpack-objects.c | 4 ++--
builtin.h | 1 +
git.c | 1 +
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 4827bff..4d0243b 100644
--- a/Makefile
+++ b/Makefile
@@ -201,7 +201,7 @@ PROGRAMS = \
git-send-pack$X git-shell$X \
git-show-index$X git-ssh-fetch$X \
git-ssh-upload$X git-unpack-file$X \
- git-unpack-objects$X git-update-server-info$X \
+ git-update-server-info$X \
git-upload-pack$X git-verify-pack$X \
git-symbolic-ref$X \
git-pack-redundant$X git-var$X \
@@ -218,7 +218,8 @@ BUILT_INS = git-log$X git-whatchanged$X
git-apply$X git-show-branch$X git-diff-files$X git-update-index$X \
git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \
git-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X \
- git-repo-config$X git-name-rev$X git-pack-objects$X
+ git-repo-config$X git-name-rev$X git-pack-objects$X \
+ git-unpack-objects$X
# what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -276,7 +277,7 @@ BUILTIN_OBJS = \
builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
builtin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \
builtin-mv.o builtin-prune-packed.o builtin-repo-config.o \
- builtin-name-rev.o builtin-pack-objects.o
+ builtin-name-rev.o builtin-pack-objects.o builtin-unpack-objects.o
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
EXTLIBS = -lz
diff --git a/unpack-objects.c b/builtin-unpack-objects.c
similarity index 99%
rename from unpack-objects.c
rename to builtin-unpack-objects.c
index b23fe58..ccf2643 100644
--- a/unpack-objects.c
+++ b/builtin-unpack-objects.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "object.h"
#include "delta.h"
@@ -260,12 +261,11 @@ static void unpack_all(void)
die("unresolved deltas left after unpacking");
}
-int main(int argc, char **argv)
+int cmd_unpack_objects(int argc, const char **argv, const char *prefix)
{
int i;
unsigned char sha1[20];
- setup_git_directory();
git_config(git_default_config);
quiet = !isatty(2);
diff --git a/builtin.h b/builtin.h
index bc57a04..af73c3c 100644
--- a/builtin.h
+++ b/builtin.h
@@ -51,6 +51,7 @@ extern int cmd_mv(int argc, const char *
extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
+extern int cmd_unpack_objects(int argc, const char **argv, const char *prefix);
extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
diff --git a/git.c b/git.c
index 5d58946..7c3a7f8 100644
--- a/git.c
+++ b/git.c
@@ -267,6 +267,7 @@ static void handle_internal_command(int
{ "repo-config", cmd_repo_config },
{ "name-rev", cmd_name_rev, NEEDS_PREFIX },
{ "pack-objects", cmd_pack_objects, NEEDS_PREFIX },
+ { "unpack-objects", cmd_unpack_objects, NEEDS_PREFIX },
};
int i;
--
1.4.2.rc2.g2e994
^ permalink raw reply related
* [PATCH] Make git-pack-objects a builtin
From: Matthias Kestenholz @ 2006-08-03 15:24 UTC (permalink / raw)
To: junkio; +Cc: git, Matthias Kestenholz
In-Reply-To: <11546186794129-git-send-email-matthias@spinlock.ch>
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
---
Makefile | 6 +++---
pack-objects.c => builtin-pack-objects.c | 4 ++--
builtin.h | 1 +
git.c | 1 +
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 67b6846..4827bff 100644
--- a/Makefile
+++ b/Makefile
@@ -196,7 +196,7 @@ PROGRAMS = \
git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \
git-hash-object$X git-index-pack$X git-local-fetch$X \
git-merge-base$X \
- git-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \
+ git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
git-peek-remote$X git-receive-pack$X \
git-send-pack$X git-shell$X \
git-show-index$X git-ssh-fetch$X \
@@ -218,7 +218,7 @@ BUILT_INS = git-log$X git-whatchanged$X
git-apply$X git-show-branch$X git-diff-files$X git-update-index$X \
git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \
git-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X \
- git-repo-config$X git-name-rev$X
+ git-repo-config$X git-name-rev$X git-pack-objects$X
# what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -276,7 +276,7 @@ BUILTIN_OBJS = \
builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
builtin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \
builtin-mv.o builtin-prune-packed.o builtin-repo-config.o \
- builtin-name-rev.o
+ builtin-name-rev.o builtin-pack-objects.o
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
EXTLIBS = -lz
diff --git a/pack-objects.c b/builtin-pack-objects.c
similarity index 100%
rename from pack-objects.c
rename to builtin-pack-objects.c
index e52e977..2f99212 100644
--- a/pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "object.h"
#include "blob.h"
@@ -1242,7 +1243,7 @@ static int git_pack_config(const char *k
return git_default_config(k, v);
}
-int main(int argc, char **argv)
+int cmd_pack_objects(int argc, const char **argv, const char *prefix)
{
SHA_CTX ctx;
char line[40 + 1 + PATH_MAX + 2];
@@ -1251,7 +1252,6 @@ int main(int argc, char **argv)
int num_preferred_base = 0;
int i;
- setup_git_directory();
git_config(git_pack_config);
progress = isatty(2);
diff --git a/builtin.h b/builtin.h
index d1d9dc1..bc57a04 100644
--- a/builtin.h
+++ b/builtin.h
@@ -50,6 +50,7 @@ extern int cmd_fmt_merge_msg(int argc, c
extern int cmd_mv(int argc, const char **argv, const char *prefix);
extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
+extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
diff --git a/git.c b/git.c
index 501a781..5d58946 100644
--- a/git.c
+++ b/git.c
@@ -266,6 +266,7 @@ static void handle_internal_command(int
{ "prune-packed", cmd_prune_packed, NEEDS_PREFIX },
{ "repo-config", cmd_repo_config },
{ "name-rev", cmd_name_rev, NEEDS_PREFIX },
+ { "pack-objects", cmd_pack_objects, NEEDS_PREFIX },
};
int i;
--
1.4.2.rc2.g2e994
^ permalink raw reply related
* [PATCH] Make git-name-rev a builtin
From: Matthias Kestenholz @ 2006-08-03 15:24 UTC (permalink / raw)
To: junkio; +Cc: git, Matthias Kestenholz
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
---
Makefile | 7 ++++---
name-rev.c => builtin-name-rev.c | 4 ++--
builtin.h | 1 +
git.c | 1 +
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 1c1427e..67b6846 100644
--- a/Makefile
+++ b/Makefile
@@ -204,7 +204,7 @@ PROGRAMS = \
git-unpack-objects$X git-update-server-info$X \
git-upload-pack$X git-verify-pack$X \
git-symbolic-ref$X \
- git-name-rev$X git-pack-redundant$X git-var$X \
+ git-pack-redundant$X git-var$X \
git-describe$X git-merge-tree$X git-blame$X git-imap-send$X \
git-merge-recur$X
@@ -218,7 +218,7 @@ BUILT_INS = git-log$X git-whatchanged$X
git-apply$X git-show-branch$X git-diff-files$X git-update-index$X \
git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \
git-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X \
- git-repo-config$X
+ git-repo-config$X git-name-rev$X
# what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -275,7 +275,8 @@ BUILTIN_OBJS = \
builtin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o \
builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
builtin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \
- builtin-mv.o builtin-prune-packed.o builtin-repo-config.o
+ builtin-mv.o builtin-prune-packed.o builtin-repo-config.o \
+ builtin-name-rev.o
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
EXTLIBS = -lz
diff --git a/name-rev.c b/builtin-name-rev.c
similarity index 98%
rename from name-rev.c
rename to builtin-name-rev.c
index f92f14e..571bba4 100644
--- a/name-rev.c
+++ b/builtin-name-rev.c
@@ -1,4 +1,5 @@
#include <stdlib.h>
+#include "builtin.h"
#include "cache.h"
#include "commit.h"
#include "tag.h"
@@ -126,12 +127,11 @@ static const char* get_rev_name(struct o
return buffer;
}
-int main(int argc, char **argv)
+int cmd_name_rev(int argc, const char **argv, const char *prefix)
{
struct object_array revs = { 0, 0, NULL };
int as_is = 0, all = 0, transform_stdin = 0;
- setup_git_directory();
git_config(git_default_config);
if (argc < 2)
diff --git a/builtin.h b/builtin.h
index 26ebcaf..d1d9dc1 100644
--- a/builtin.h
+++ b/builtin.h
@@ -49,6 +49,7 @@ extern int cmd_update_ref(int argc, cons
extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
extern int cmd_mv(int argc, const char **argv, const char *prefix);
extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
+extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
diff --git a/git.c b/git.c
index 6e72a89..501a781 100644
--- a/git.c
+++ b/git.c
@@ -265,6 +265,7 @@ static void handle_internal_command(int
{ "mv", cmd_mv, NEEDS_PREFIX },
{ "prune-packed", cmd_prune_packed, NEEDS_PREFIX },
{ "repo-config", cmd_repo_config },
+ { "name-rev", cmd_name_rev, NEEDS_PREFIX },
};
int i;
--
1.4.2.rc2.g2e994
^ permalink raw reply related
* Re: Creating diffs
From: Rocco Rutte @ 2006-08-03 14:58 UTC (permalink / raw)
To: git
In-Reply-To: <eat29j$lil$1@sea.gmane.org>
Hi,
* Jakub Narebski [06-08-03 16:47:49 +0200] wrote:
>The patches are:
> http://www.gelato.unsw.edu.au/archives/git/0607/24325.html
> http://www.gelato.unsw.edu.au/archives/git/0607/24326.html
Hmm, ok, thanks for the pointer. What made me wonder in the first place
is that the format differs from the diff-two-branches case because I
assumed the algorithm basically is what I want to do (except it just
does not exclude files) (i.e. diff-two-trees := get changed files and
for each file, dump diff).
And what about the reverted diff contents? I don't know git too well so
it take me quite long to provide a patch...
bye, Rocco
--
:wq!
^ permalink raw reply
* Re: Creating diffs
From: Jakub Narebski @ 2006-08-03 14:47 UTC (permalink / raw)
To: git
In-Reply-To: <easqpi$o51$1@sea.gmane.org>
Jakub Narebski wrote:
> Rocco Rutte wrote:
>
>> However, when I do:
>>
>> $ git diff source:file dest:file
>>
>> I get:
>>
>> --- a/source:file
>> +++ b/source:file
>>
>> But I'd like to drop the branchname. Can I do that without filtering
>> everything through sed(1)?
>
> If I remember correctly there were two patches which solved it
> differently:
>
> one gave
>
> --- a/source:file
> +++ b/dest:file
>
> second (and I guess it is better solution)
>
> --- a/file
> +++ b/file
>
> Unfortunately they seem unapplied...
The patches are:
http://www.gelato.unsw.edu.au/archives/git/0607/24325.html
http://www.gelato.unsw.edu.au/archives/git/0607/24326.html
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
^ permalink raw reply
* Get the freshest Make your girlfriend or wife speechless with increased hardness, richer orgsms and more power in bed
From: Terry @ 2006-08-03 13:19 UTC (permalink / raw)
To: git
Good day to you Sir!
Impress your girl with prolonged hardness, plentiful explosions and increased durationHave more success with women and impress them with your power and stamina in bed
Rock hard manhood, multiple explosions and several times more semen volume
Find what you need here: http://www.seelygd.com
Terry Dolan
There's a black sheep in every flock.Spare the rod and spoil the child Yesterday is ashes; tomorrow wood Only today does the fire burn brightly
Might is right Don't cross your bridges before you come to them.
^ permalink raw reply
* Re: Creating diffs
From: Jakub Narebski @ 2006-08-03 12:39 UTC (permalink / raw)
To: git
In-Reply-To: <20060803122937.GI5016@robert.daprodeges.fqdn.th-h.de>
Rocco Rutte wrote:
> However, when I do:
>
> $ git diff source:file dest:file
>
> I get:
>
> --- a/source:file
> +++ b/source:file
>
> But I'd like to drop the branchname. Can I do that without filtering
> everything through sed(1)?
If I remember correctly there were two patches which solved it differently:
one gave
--- a/source:file
+++ b/dest:file
second (and I guess it is better solution)
--- a/file
+++ b/file
Unfortunately they seem unapplied...
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
^ permalink raw reply
* Re: What's in git.git
From: Alex Riesen @ 2006-08-03 12:35 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <81b0412b0608030532v4241322dted5f42baa196af88@mail.gmail.com>
On 8/3/06, Alex Riesen <raa.lkml@gmail.com> wrote:
> > Now, I admit I know very little about ActiveState and know
> > nothing about Windows build environment, but I would not be
> > surprised if in ActiveState land there were a MakeMaker
> > equivalent that spits out Makefile equivalent that is suitable
> > for MS development environment, and the users are expected to
> > work in that environment, perhaps using MS C compiler toolchain,
>
> AFAICS, it is not suitable for anything: generated Makefile is not
> parsable by nmake(what MS thinks is a make) and is more like a
> broken gmake Makefile. Also -fno-strict-aliasing points at gcc.
I think I better post what I have got from MakeMaker. Just keep
in mind: it's CRLF delimited.
# This Makefile is for the Git extension to perl.
#
# It was generated automatically by MakeMaker version
# 6.17 (Revision: 1.133) from the contents of
# Makefile.PL. Don't edit this file, edit Makefile.PL instead.
#
# ANY CHANGES MADE HERE WILL BE LOST!
#
# MakeMaker ARGV: (q[PREFIX=/d/scripts/git], q[DEFINE=
-DNO_D_TYPE_IN_DIRENT -DNO_D_INO_IN_DIRENT -DNO_SYMLINK_HEAD -DNO_IPV6
-DSHA1_HEADER='<openssl/sha.h>' -DNO_STRCASESTR -DNO_STRLCPY -DNO_MMAP
-DGIT_VERSION='"1.4.2.rc2.gb80eb"'], q[LIBS= -lz -liconv -lcrypto])
#
# MakeMaker Parameters:
# INC => q[-I. -I..]
# MYEXTLIB => q[../libgit.a]
# NAME => q[Git]
# PM => { private-Error.pm=>q[$(INST_LIBDIR)/Error.pm],
Git.pm=>q[$(INST_LIBDIR)/Git.pm] }
# VERSION_FROM => q[Git.pm]
# --- MakeMaker post_initialize section:
# --- MakeMaker const_config section:
# These definitions are from config.sh (via c:/perl/lib/Config.pm)
# They may have been overridden via Makefile.PL or on the command line
AR = ar
CC = gcc
CCCDLFLAGS =
CCDLFLAGS =
DLEXT = dll
DLSRC = dl_win32.xs
LD = gcc
LDDLFLAGS = -mdll
LDFLAGS = -nologo -nodefaultlib -debug -opt:ref,icf
-libpath:"C:\Perl\lib\CORE" -machine:x86
LIBC = msvcrt.lib
LIB_EXT = .lib
OBJ_EXT = .o
OSNAME = MSWin32
OSVERS = 5.0
RANLIB = rem
SITELIBEXP = C:\Perl\site\lib
SITEARCHEXP = C:\Perl\site\lib
SO = dll
EXE_EXT = .exe
FULL_AR =
VENDORARCHEXP = $(VENDORPREFIX)\lib\5.8.7\MSWin32-x86-multi-thread
VENDORLIBEXP = $(VENDORPREFIX)\lib
# --- MakeMaker constants section:
AR_STATIC_ARGS = cr
DIRFILESEP = ^\
NAME = Git
NAME_SYM = Git
VERSION = 0.01
VERSION_MACRO = VERSION
VERSION_SYM = 0_01
DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\"
XS_VERSION = 0.01
XS_VERSION_MACRO = XS_VERSION
XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\"
INST_ARCHLIB = blib\arch
INST_SCRIPT = blib\script
INST_BIN = blib\bin
INST_LIB = blib\lib
INST_MAN1DIR = blib\man1
INST_MAN3DIR = blib\man3
INST_HTMLDIR = blib\html
MAN1EXT = 1
MAN3EXT = 3
INSTALLDIRS = site
DESTDIR =
PREFIX = /d/scripts/git
PERLPREFIX = $(PREFIX)
SITEPREFIX = $(PREFIX)
VENDORPREFIX = $(PREFIX)
INSTALLPRIVLIB = $(PERLPREFIX)\lib
DESTINSTALLPRIVLIB = $(DESTDIR)$(INSTALLPRIVLIB)
INSTALLSITELIB = $(SITEPREFIX)\lib
DESTINSTALLSITELIB = $(DESTDIR)$(INSTALLSITELIB)
INSTALLVENDORLIB = $(VENDORPREFIX)\lib
DESTINSTALLVENDORLIB = $(DESTDIR)$(INSTALLVENDORLIB)
INSTALLARCHLIB = $(PERLPREFIX)\lib
DESTINSTALLARCHLIB = $(DESTDIR)$(INSTALLARCHLIB)
INSTALLSITEARCH = $(SITEPREFIX)/lib
DESTINSTALLSITEARCH = $(DESTDIR)$(INSTALLSITEARCH)
INSTALLVENDORARCH = $(VENDORPREFIX)\lib\5.8.7\MSWin32-x86-multi-thread
DESTINSTALLVENDORARCH = $(DESTDIR)$(INSTALLVENDORARCH)
INSTALLBIN = $(PERLPREFIX)\bin
DESTINSTALLBIN = $(DESTDIR)$(INSTALLBIN)
INSTALLSITEBIN = $(SITEPREFIX)\bin
DESTINSTALLSITEBIN = $(DESTDIR)$(INSTALLSITEBIN)
INSTALLVENDORBIN = $(VENDORPREFIX)\bin
DESTINSTALLVENDORBIN = $(DESTDIR)$(INSTALLVENDORBIN)
INSTALLSCRIPT = $(PERLPREFIX)\bin
DESTINSTALLSCRIPT = $(DESTDIR)$(INSTALLSCRIPT)
INSTALLMAN1DIR = $(PERLPREFIX)\man\man1
DESTINSTALLMAN1DIR = $(DESTDIR)$(INSTALLMAN1DIR)
INSTALLSITEMAN1DIR = $(SITEPREFIX)\man\man1
DESTINSTALLSITEMAN1DIR = $(DESTDIR)$(INSTALLSITEMAN1DIR)
INSTALLVENDORMAN1DIR = $(VENDORPREFIX)\man\man1
DESTINSTALLVENDORMAN1DIR = $(DESTDIR)$(INSTALLVENDORMAN1DIR)
INSTALLMAN3DIR = $(PERLPREFIX)\man\man3
DESTINSTALLMAN3DIR = $(DESTDIR)$(INSTALLMAN3DIR)
INSTALLSITEMAN3DIR = $(SITEPREFIX)\man\man3
DESTINSTALLSITEMAN3DIR = $(DESTDIR)$(INSTALLSITEMAN3DIR)
INSTALLVENDORMAN3DIR = $(VENDORPREFIX)\man\man3
DESTINSTALLVENDORMAN3DIR = $(DESTDIR)$(INSTALLVENDORMAN3DIR)
INSTALLHTMLDIR = $(PERLPREFIX)\html
DESTINSTALLHTMLDIR = $(DESTDIR)$(INSTALLHTMLDIR)
INSTALLSITEHTMLDIR = $(SITEPREFIX)\html
DESTINSTALLSITEHTMLDIR = $(DESTDIR)$(INSTALLSITEHTMLDIR)
INSTALLVENDORHTMLDIR = $(VENDORPREFIX)C:\Perl\html
DESTINSTALLVENDORHTMLDIR = $(DESTDIR)$(INSTALLVENDORHTMLDIR)
PERL_LIB = C:\Perl\lib
PERL_ARCHLIB = C:\Perl\lib
LIBPERL_A = libperl.lib
MYEXTLIB = ../libgit.a
FIRST_MAKEFILE = Makefile
MAKEFILE_OLD = $(FIRST_MAKEFILE).old
MAKE_APERL_FILE = $(FIRST_MAKEFILE).aperl
PERLMAINCC = $(CC)
PERL_INC = C:\Perl\lib\CORE
PERL = C:\perl\bin\perl.exe
FULLPERL = C:\perl\bin\perl.exe
ABSPERL = $(PERL)
PERLRUN = $(PERL)
FULLPERLRUN = $(FULLPERL)
ABSPERLRUN = $(ABSPERL)
PERLRUNINST = $(PERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"
FULLPERLRUNINST = $(FULLPERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"
ABSPERLRUNINST = $(ABSPERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"
PERL_CORE = 0
PERM_RW = 644
PERM_RWX = 755
MAKEMAKER = c:/perl/lib/ExtUtils/MakeMaker.pm
MM_VERSION = 6.17
MM_REVISION = 1.133
# FULLEXT = Pathname for extension directory (eg Foo/Bar/Oracle).
# BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT. (eg Oracle)
# PARENT_NAME = NAME without BASEEXT and no trailing :: (eg Foo::Bar)
# DLBASE = Basename part of dynamic library. May be just equal BASEEXT.
FULLEXT = Git
BASEEXT = Git
PARENT_NAME =
DLBASE = $(BASEEXT)
VERSION_FROM = Git.pm
INC = -I. -I..
DEFINE = -DNO_D_TYPE_IN_DIRENT -DNO_D_INO_IN_DIRENT -DNO_SYMLINK_HEAD
-DNO_IPV6 -DSHA1_HEADER='<openssl/sha.h>' -DNO_STRCASESTR -DNO_STRLCPY
-DNO_MMAP -DGIT_VERSION='"1.4.2.rc2.gb80eb"'
OBJECT = $(BASEEXT)$(OBJ_EXT)
LDFROM = $(OBJECT)
LINKTYPE = dynamic
# Handy lists of source code files:
XS_FILES = Git.xs
C_FILES = Git.c
O_FILES = Git.o
H_FILES =
MAN1PODS =
MAN3PODS = Git.pm \
private-Error.pm
# Where is the Config information that we are using/depend on
CONFIGDEP = $(PERL_ARCHLIB)$(DIRFILESEP)Config.pm
$(PERL_INC)$(DIRFILESEP)config.h
# Where to build things
INST_LIBDIR = $(INST_LIB)
INST_ARCHLIBDIR = $(INST_ARCHLIB)
INST_AUTODIR = $(INST_LIB)\auto\$(FULLEXT)
INST_ARCHAUTODIR = $(INST_ARCHLIB)\auto\$(FULLEXT)
INST_STATIC = $(INST_ARCHAUTODIR)\$(BASEEXT)$(LIB_EXT)
INST_DYNAMIC = $(INST_ARCHAUTODIR)\$(DLBASE).$(DLEXT)
INST_BOOT = $(INST_ARCHAUTODIR)\$(BASEEXT).bs
# Extra linker info
EXPORT_LIST = $(BASEEXT).def
PERL_ARCHIVE = $(PERL_INC)\perl58.lib
PERL_ARCHIVE_AFTER =
TO_INST_PM = Git.pm \
private-Error.pm
PM_TO_BLIB = private-Error.pm \
$(INST_LIBDIR)/Error.pm \
Git.pm \
$(INST_LIBDIR)/Git.pm
# --- MakeMaker platform_constants section:
MM_Win32_VERSION = 1.09
# --- MakeMaker tool_autosplit section:
# Usage: $(AUTOSPLITFILE) FileToSplit AutoDirToSplitInto
AUTOSPLITFILE = $(PERLRUN) -e "use AutoSplit; autosplit($$ARGV[0],
$$ARGV[1], 0, 1, 1)"
# --- MakeMaker tool_xsubpp section:
XSUBPPDIR = C:\perl\lib\ExtUtils
XSUBPP = $(XSUBPPDIR)/xsubpp
XSPROTOARG =
XSUBPPDEPS = C:\Perl\lib\ExtUtils\typemap $(XSUBPP)
XSUBPPARGS = -typemap C:\Perl\lib\ExtUtils\typemap
XSUBPP_EXTRA_ARGS =
# --- MakeMaker tools_other section:
CHMOD = $(PERLRUN) -MExtUtils::Command -e chmod
CP = $(PERLRUN) -MExtUtils::Command -e cp
MV = $(PERLRUN) -MExtUtils::Command -e mv
NOOP = rem
NOECHO = @
RM_F = $(PERLRUN) -MExtUtils::Command -e rm_f
RM_RF = $(PERLRUN) -MExtUtils::Command -e rm_rf
TEST_F = $(PERLRUN) -MExtUtils::Command -e test_f
TOUCH = $(PERLRUN) -MExtUtils::Command -e touch
UMASK_NULL = umask 0
DEV_NULL = > NUL
MKPATH = $(PERLRUN) "-MExtUtils::Command" -e mkpath
EQUALIZE_TIMESTAMP = $(PERLRUN) "-MExtUtils::Command" -e eqtime
ECHO = $(PERLRUN) -l -e "print qq{@ARGV}"
ECHO_N = $(PERLRUN) -e "print qq{@ARGV}"
UNINST = 0
VERBINST = 0
MOD_INSTALL = $(PERLRUN) -MExtUtils::Install -e "install({@ARGV},
'$(VERBINST)', 0, '$(UNINST)');"
DOC_INSTALL = $(PERLRUN) "-MExtUtils::Command::MM" -e perllocal_install
UNINSTALL = $(PERLRUN) "-MExtUtils::Command::MM" -e uninstall
WARN_IF_OLD_PACKLIST = $(PERLRUN) "-MExtUtils::Command::MM" -e
warn_if_old_packlist
# --- MakeMaker makemakerdflt section:
makemakerdflt: all
$(NOECHO) $(NOOP)
# --- MakeMaker dist section:
TAR = tar
TARFLAGS = cvf
ZIP = zip
ZIPFLAGS = -r
COMPRESS = gzip --best
SUFFIX = .gz
SHAR = shar
PREOP = $(NOECHO) $(NOOP)
POSTOP = $(NOECHO) $(NOOP)
TO_UNIX = $(NOECHO) $(NOOP)
CI = ci -u
RCS_LABEL = rcs -Nv$(VERSION_SYM): -q
DIST_CP = best
DIST_DEFAULT = tardist
DISTNAME = Git
DISTVNAME = Git-0.01
# --- MakeMaker macro section:
# --- MakeMaker depend section:
# --- MakeMaker cflags section:
CCFLAGS = -DNDEBUG -DWIN32 -D_CONSOLE -DNO_STRICT -DHAVE_DES_FCRYPT
-DNO_HASH_SEED -DUSE_SITECUSTOMIZE -DPERL_IMPLICIT_CONTEXT
-DPERL_IMPLICIT_SYS -DUSE_PERLIO -DPERL_MSVCRT_READFIX -DHASATTRIBUTE
-fno-strict-aliasing
OPTIMIZE = -O2
PERLTYPE =
MPOLLUTE =
# --- MakeMaker const_loadlibs section:
# Git might depend on some other libraries:
# See ExtUtils::Liblist for details
#
LDLOADLIBS = -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32
-ladvapi32 -lshell32 -lole32 -loleaut32 -lnetapi32 -luuid -lws2_32
-lmpr -lwinmm -lversion -lodbc32 -lodbccp32 -lmsvcrt
LD_RUN_PATH =
# --- MakeMaker const_cccmd section:
CCCMD = $(CC) -c $(PASTHRU_INC) $(INC) \
$(CCFLAGS) $(OPTIMIZE) \
$(PERLTYPE) $(MPOLLUTE) $(DEFINE_VERSION) \
$(XS_DEFINE_VERSION)
# --- MakeMaker post_constants section:
# --- MakeMaker pasthru section:
PASTHRU = -nologo
# --- MakeMaker special_targets section:
.SUFFIXES: .xs .c .C .cpp .i .s .cxx .cc $(OBJ_EXT)
.PHONY: all config static dynamic test linkext manifest
# --- MakeMaker c_o section:
.c.i:
gcc -E -c $(PASTHRU_INC) $(INC) \
$(CCFLAGS) $(OPTIMIZE) \
$(PERLTYPE) $(MPOLLUTE) $(DEFINE_VERSION) \
$(XS_DEFINE_VERSION) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE)
$(DEFINE) $*.c > $*.i
.c.s:
$(CCCMD) -S $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.c
.c$(OBJ_EXT):
$(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.c
.cpp$(OBJ_EXT):
$(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.cpp
.cxx$(OBJ_EXT):
$(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.cxx
.cc$(OBJ_EXT):
$(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.cc
# --- MakeMaker xs_c section:
.xs.c:
$(PERLRUN) $(XSUBPP) $(XSPROTOARG) $(XSUBPPARGS) $(XSUBPP_EXTRA_ARGS)
$*.xs > $*.xsc && $(MV) $*.xsc $*.c
# --- MakeMaker xs_o section:
# --- MakeMaker top_targets section:
all :: pure_all htmlifypods
$(NOECHO) $(NOOP)
pure_all :: config pm_to_blib subdirs linkext
$(NOECHO) $(NOOP)
subdirs :: $(MYEXTLIB)
$(NOECHO) $(NOOP)
config :: $(FIRST_MAKEFILE) $(INST_LIBDIR)$(DIRFILESEP).exists
$(NOECHO) $(NOOP)
config :: $(INST_ARCHAUTODIR)$(DIRFILESEP).exists
$(NOECHO) $(NOOP)
config :: $(INST_AUTODIR)$(DIRFILESEP).exists
$(NOECHO) $(NOOP)
$(INST_AUTODIR)\.exists :: C:\Perl\lib\CORE\perl.h
$(NOECHO) $(MKPATH) $(INST_AUTODIR)
$(NOECHO) $(EQUALIZE_TIMESTAMP) C:\Perl\lib\CORE\perl.h $(INST_AUTODIR)\.exists
-$(NOECHO) $(CHMOD) $(PERM_RWX) $(INST_AUTODIR)
$(INST_LIBDIR)\.exists :: C:\Perl\lib\CORE\perl.h
$(NOECHO) $(MKPATH) $(INST_LIBDIR)
$(NOECHO) $(EQUALIZE_TIMESTAMP) C:\Perl\lib\CORE\perl.h $(INST_LIBDIR)\.exists
-$(NOECHO) $(CHMOD) $(PERM_RWX) $(INST_LIBDIR)
$(INST_ARCHAUTODIR)\.exists :: C:\Perl\lib\CORE\perl.h
$(NOECHO) $(MKPATH) $(INST_ARCHAUTODIR)
$(NOECHO) $(EQUALIZE_TIMESTAMP) C:\Perl\lib\CORE\perl.h
$(INST_ARCHAUTODIR)\.exists
-$(NOECHO) $(CHMOD) $(PERM_RWX) $(INST_ARCHAUTODIR)
config :: $(INST_MAN3DIR)$(DIRFILESEP).exists
$(NOECHO) $(NOOP)
$(INST_MAN3DIR)\.exists :: C:\Perl\lib\CORE\perl.h
$(NOECHO) $(MKPATH) $(INST_MAN3DIR)
$(NOECHO) $(EQUALIZE_TIMESTAMP) C:\Perl\lib\CORE\perl.h $(INST_MAN3DIR)\.exists
-$(NOECHO) $(CHMOD) $(PERM_RWX) $(INST_MAN3DIR)
help:
perldoc ExtUtils::MakeMaker
# --- MakeMaker linkext section:
linkext :: $(LINKTYPE)
$(NOECHO) $(NOOP)
# --- MakeMaker dlsyms section:
Git.def: Makefile.PL
$(PERLRUN) -MExtUtils::Mksymlists \
-e "Mksymlists('NAME'=>\"Git\", 'DLBASE' => '$(BASEEXT)',
'DL_FUNCS' => { }, 'FUNCLIST' => [], 'IMPORTS' => { }, 'DL_VARS' =>
[]);"
# --- MakeMaker dynamic section:
dynamic :: $(FIRST_MAKEFILE) $(INST_DYNAMIC) $(INST_BOOT)
$(NOECHO) $(NOOP)
# --- MakeMaker dynamic_bs section:
BOOTSTRAP = $(BASEEXT).bs
# As Mkbootstrap might not write a file (if none is required)
# we use touch to prevent make continually trying to remake it.
# The DynaLoader only reads a non-empty file.
$(BOOTSTRAP): $(FIRST_MAKEFILE) $(BOOTDEP)
$(INST_ARCHAUTODIR)$(DIRFILESEP).exists
$(NOECHO) $(ECHO) "Running Mkbootstrap for $(NAME) ($(BSLOADLIBS))"
$(NOECHO) $(PERLRUN) \
"-MExtUtils::Mkbootstrap" \
-e "Mkbootstrap('$(BASEEXT)','$(BSLOADLIBS)');"
$(NOECHO) $(TOUCH) $(BOOTSTRAP)
$(CHMOD) $(PERM_RW) $@
$(INST_BOOT): $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DIRFILESEP).exists
$(NOECHO) $(RM_RF) $(INST_BOOT)
-$(CP) $(BOOTSTRAP) $(INST_BOOT)
$(CHMOD) $(PERM_RW) $@
# --- MakeMaker dynamic_lib section:
# This section creates the dynamically loadable $(INST_DYNAMIC)
# from $(OBJECT) and possibly $(MYEXTLIB).
OTHERLDFLAGS = -Wl,--image-base,0x23050000
INST_DYNAMIC_DEP =
$(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP)
$(INST_ARCHAUTODIR)$(DIRFILESEP).exists $(EXPORT_LIST) $(PERL_ARCHIVE)
$(INST_DYNAMIC_DEP)
dlltool --def $(EXPORT_LIST) --output-exp dll.exp
$(LD) -o $@ -Wl,--base-file -Wl,dll.base $(LDDLFLAGS) $(LDFROM)
$(OTHERLDFLAGS) $(MYEXTLIB) $(PERL_ARCHIVE) $(LDLOADLIBS) dll.exp
dlltool --def $(EXPORT_LIST) --base-file dll.base --output-exp dll.exp
$(LD) -o $@ $(LDDLFLAGS) $(LDFROM) $(OTHERLDFLAGS) $(MYEXTLIB)
$(PERL_ARCHIVE) $(LDLOADLIBS) dll.exp
$(CHMOD) $(PERM_RWX) $@
# --- MakeMaker static section:
## $(INST_PM) has been moved to the all: target.
## It remains here for awhile to allow for old usage: "make static"
static :: $(FIRST_MAKEFILE) $(INST_STATIC)
$(NOECHO) $(NOOP)
# --- MakeMaker static_lib section:
$(INST_STATIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DIRFILESEP).exists
$(RM_RF) $@
$(CP) $(MYEXTLIB) $@
$(AR) -ru $@ $(OBJECT)
$(CHMOD) $(PERM_RWX) $@
$(NOECHO) $(ECHO) "$(EXTRALIBS)" > $(INST_ARCHAUTODIR)\extralibs.ld
# --- MakeMaker manifypods section:
POD2MAN_EXE = $(PERLRUN) "-MExtUtils::Command::MM" -e pod2man "--"
POD2MAN = $(POD2MAN_EXE)
manifypods : pure_all \
private-Error.pm \
Git.pm \
private-Error.pm \
Git.pm
$(NOECHO) $(POD2MAN) --section=3 --perm_rw=$(PERM_RW)\
private-Error.pm $(INST_MAN3DIR)\private-Error.$(MAN3EXT) \
Git.pm $(INST_MAN3DIR)\Git.$(MAN3EXT)
# --- MakeMaker htmlifypods section:
POD2HTML_EXE = $(PERLRUN) "-MActivePerl::DocTools" -e
"Pod2HTML(installdirs => "$(INSTALLDIRS)")"
POD2HTML = $(POD2HTML_EXE)
htmlifypods : \
private-Error.pm \
Git.pm
$(NOECHO) $(POD2HTML)
# --- MakeMaker processPL section:
# --- MakeMaker installbin section:
# --- MakeMaker subdirs section:
# none
# --- MakeMaker clean_subdirs section:
clean_subdirs :
$(NOECHO) $(NOOP)
# --- MakeMaker clean section:
# Delete temporary files but do not touch installed files. We don't delete
# the Makefile here so a later make realclean still has a makefile to use.
clean :: clean_subdirs
-$(RM_RF) Git.c ./blib $(MAKE_APERL_FILE)
$(INST_ARCHAUTODIR)/extralibs.all $(INST_ARCHAUTODIR)/extralibs.ld
perlmain.c tmon.out mon.out so_locations pm_to_blib *$(OBJ_EXT)
*$(LIB_EXT) perl.exe perl perl$(EXE_EXT) $(BOOTSTRAP) $(BASEEXT).bso
$(BASEEXT).def lib$(BASEEXT).def $(BASEEXT).exp $(BASEEXT).x core
core.*perl.*.? *perl.core core.[0-9] core.[0-9][0-9]
core.[0-9][0-9][0-9] core.[0-9][0-9][0-9][0-9]
core.[0-9][0-9][0-9][0-9][0-9]
-$(MV) $(FIRST_MAKEFILE) $(MAKEFILE_OLD) $(DEV_NULL)
clean ::
-$(RM_F) dll.base dll.exp
# --- MakeMaker realclean_subdirs section:
realclean_subdirs :
$(NOECHO) $(NOOP)
# --- MakeMaker realclean section:
# Delete temporary files (via clean) and also delete installed files
realclean purge :: clean realclean_subdirs
$(RM_RF) $(INST_AUTODIR) $(INST_ARCHAUTODIR)
$(RM_RF) $(DISTVNAME)
$(RM_F) $(INST_DYNAMIC) $(INST_BOOT)
$(RM_F) $(INST_STATIC)
$(RM_F) $(INST_LIBDIR)/Git.pm $(INST_LIBDIR)/Error.pm
$(MAKEFILE_OLD) $(FIRST_MAKEFILE)
# --- MakeMaker metafile section:
metafile :
$(NOECHO) $(ECHO) "#
http://module-build.sourceforge.net/META-spec.html" > META.yml
$(NOECHO) $(ECHO) "#XXXXXXX This is a prototype!!! It will change in
the future!!! XXXXX#" >> META.yml
$(NOECHO) $(ECHO) "name: Git" >> META.yml
$(NOECHO) $(ECHO) "version: 0.01" >> META.yml
$(NOECHO) $(ECHO) "version_from: Git.pm" >> META.yml
$(NOECHO) $(ECHO) "installdirs: site" >> META.yml
$(NOECHO) $(ECHO) "requires:" >> META.yml
$(NOECHO) $(ECHO) "" >> META.yml
$(NOECHO) $(ECHO) "distribution_type: module" >> META.yml
$(NOECHO) $(ECHO) "generated_by: ExtUtils::MakeMaker version 6.17" >> META.yml
# --- MakeMaker metafile_addtomanifest section:
metafile_addtomanifest:
$(NOECHO) $(PERLRUN) -MExtUtils::Manifest=maniadd -e "eval {
maniadd({q{META.yml} => q{Module meta-data (added by MakeMaker)}}) } \
or print \"Could not add META.yml to MANIFEST: $${'@'}\n\""
# --- MakeMaker dist_basics section:
distclean :: realclean distcheck
$(NOECHO) $(NOOP)
distcheck :
$(PERLRUN) "-MExtUtils::Manifest=fullcheck" -e fullcheck
skipcheck :
$(PERLRUN) "-MExtUtils::Manifest=skipcheck" -e skipcheck
manifest :
$(PERLRUN) "-MExtUtils::Manifest=mkmanifest" -e mkmanifest
veryclean : realclean
$(RM_F) *~ *.orig */*~ */*.orig
# --- MakeMaker dist_core section:
dist : $(DIST_DEFAULT) $(FIRST_MAKEFILE)
$(NOECHO) $(PERLRUN) -l -e "print 'Warning: Makefile possibly out of
date with $(VERSION_FROM)'\
if -e '$(VERSION_FROM)' and -M '$(VERSION_FROM)' < -M '$(FIRST_MAKEFILE)';"
tardist : $(DISTVNAME).tar$(SUFFIX)
$(NOECHO) $(NOOP)
uutardist : $(DISTVNAME).tar$(SUFFIX)
uuencode $(DISTVNAME).tar$(SUFFIX) $(DISTVNAME).tar$(SUFFIX) >
$(DISTVNAME).tar$(SUFFIX)_uu
$(DISTVNAME).tar$(SUFFIX) : distdir
$(PREOP)
$(TO_UNIX)
$(TAR) $(TARFLAGS) $(DISTVNAME).tar $(DISTVNAME)
$(RM_RF) $(DISTVNAME)
$(COMPRESS) $(DISTVNAME).tar
$(POSTOP)
zipdist : $(DISTVNAME).zip
$(NOECHO) $(NOOP)
$(DISTVNAME).zip : distdir
$(PREOP)
$(ZIP) $(ZIPFLAGS) $(DISTVNAME).zip $(DISTVNAME)
$(RM_RF) $(DISTVNAME)
$(POSTOP)
shdist : distdir
$(PREOP)
$(SHAR) $(DISTVNAME) > $(DISTVNAME).shar
$(RM_RF) $(DISTVNAME)
$(POSTOP)
# --- MakeMaker distdir section:
distdir : metafile metafile_addtomanifest
$(RM_RF) $(DISTVNAME)
$(PERLRUN) "-MExtUtils::Manifest=manicopy,maniread" \
-e "manicopy(maniread(),'$(DISTVNAME)', '$(DIST_CP)');"
# --- MakeMaker dist_test section:
disttest : distdir
cd $(DISTVNAME) && $(ABSPERLRUN) Makefile.PL
cd $(DISTVNAME) && $(MAKE) $(PASTHRU)
cd $(DISTVNAME) && $(MAKE) test $(PASTHRU)
# --- MakeMaker dist_ci section:
ci :
$(PERLRUN) "-MExtUtils::Manifest=maniread" \
-e "@all = keys %{ maniread() };" \
-e "print(qq{Executing $(CI) @all\n}); system(qq{$(CI) @all});" \
-e "print(qq{Executing $(RCS_LABEL) ...\n}); system(qq{$(RCS_LABEL) @all});"
# --- MakeMaker install section:
install :: all pure_install doc_install doc_update
install_perl :: all pure_perl_install doc_perl_install
install_site :: all pure_site_install doc_site_install
install_vendor :: all pure_vendor_install doc_vendor_install
pure_install :: pure_$(INSTALLDIRS)_install
doc_install :: doc_$(INSTALLDIRS)_install
doc_update ::
$(NOECHO) $(PERLRUN) "-MActivePerl::DocTools" -e ActivePerl::DocTools::WriteTOC
pure__install : pure_site_install
$(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
doc__install : doc_site_install
$(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
pure_perl_install ::
$(NOECHO) $(MOD_INSTALL) \
read $(PERL_ARCHLIB)\auto\$(FULLEXT)\.packlist \
write $(DESTINSTALLARCHLIB)\auto\$(FULLEXT)\.packlist \
$(INST_LIB) $(DESTINSTALLPRIVLIB) \
$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
$(INST_BIN) $(DESTINSTALLBIN) \
$(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
$(INST_MAN1DIR) $(DESTINSTALLMAN1DIR) \
$(INST_MAN3DIR) $(DESTINSTALLMAN3DIR) \
$(INST_HTMLDIR) $(DESTINSTALLHTMLDIR)
$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
$(SITEARCHEXP)\auto\$(FULLEXT)
pure_site_install ::
$(NOECHO) $(MOD_INSTALL) \
read $(SITEARCHEXP)\auto\$(FULLEXT)\.packlist \
write $(DESTINSTALLSITEARCH)\auto\$(FULLEXT)\.packlist \
$(INST_LIB) $(DESTINSTALLSITELIB) \
$(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \
$(INST_BIN) $(DESTINSTALLSITEBIN) \
$(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
$(INST_MAN1DIR) $(DESTINSTALLSITEMAN1DIR) \
$(INST_MAN3DIR) $(DESTINSTALLSITEMAN3DIR) \
$(INST_HTMLDIR) $(DESTINSTALLSITEHTMLDIR)
$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
$(PERL_ARCHLIB)\auto\$(FULLEXT)
pure_vendor_install ::
$(NOECHO) $(MOD_INSTALL) \
read $(VENDORARCHEXP)\auto\$(FULLEXT)\.packlist \
write $(DESTINSTALLVENDORARCH)\auto\$(FULLEXT)\.packlist \
$(INST_LIB) $(DESTINSTALLVENDORLIB) \
$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
$(INST_BIN) $(DESTINSTALLVENDORBIN) \
$(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
$(INST_MAN1DIR) $(DESTINSTALLVENDORMAN1DIR) \
$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR) \
$(INST_HTMLDIR) $(DESTINSTALLVENDORHTMLDIR)
doc_perl_install ::
$(NOECHO) $(ECHO) Appending installation info to
$(DESTINSTALLARCHLIB)/perllocal.pod
-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
-$(NOECHO) $(DOC_INSTALL) \
"Module" "$(NAME)" \
"installed into" "$(INSTALLPRIVLIB)" \
LINKTYPE "$(LINKTYPE)" \
VERSION "$(VERSION)" \
EXE_FILES "$(EXE_FILES)" \
>> $(DESTINSTALLARCHLIB)\perllocal.pod
doc_site_install ::
$(NOECHO) $(ECHO) Appending installation info to
$(DESTINSTALLARCHLIB)/perllocal.pod
-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
-$(NOECHO) $(DOC_INSTALL) \
"Module" "$(NAME)" \
"installed into" "$(INSTALLSITELIB)" \
LINKTYPE "$(LINKTYPE)" \
VERSION "$(VERSION)" \
EXE_FILES "$(EXE_FILES)" \
>> $(DESTINSTALLARCHLIB)\perllocal.pod
doc_vendor_install ::
$(NOECHO) $(ECHO) Appending installation info to
$(DESTINSTALLARCHLIB)/perllocal.pod
-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
-$(NOECHO) $(DOC_INSTALL) \
"Module" "$(NAME)" \
"installed into" "$(INSTALLVENDORLIB)" \
LINKTYPE "$(LINKTYPE)" \
VERSION "$(VERSION)" \
EXE_FILES "$(EXE_FILES)" \
>> $(DESTINSTALLARCHLIB)\perllocal.pod
uninstall :: uninstall_from_$(INSTALLDIRS)dirs doc_update
uninstall_from_perldirs ::
$(NOECHO) $(UNINSTALL) $(PERL_ARCHLIB)\auto\$(FULLEXT)\.packlist
uninstall_from_sitedirs ::
$(NOECHO) $(UNINSTALL) $(SITEARCHEXP)\auto\$(FULLEXT)\.packlist
uninstall_from_vendordirs ::
$(NOECHO) $(UNINSTALL) $(VENDORARCHEXP)\auto\$(FULLEXT)\.packlist
# --- MakeMaker force section:
# Phony target to force checking subdirectories.
FORCE:
$(NOECHO) $(NOOP)
# --- MakeMaker perldepend section:
PERL_HDRS = \
$(PERL_INC)/EXTERN.h \
$(PERL_INC)/INTERN.h \
$(PERL_INC)/XSUB.h \
$(PERL_INC)/av.h \
$(PERL_INC)/cc_runtime.h \
$(PERL_INC)/config.h \
$(PERL_INC)/cop.h \
$(PERL_INC)/cv.h \
$(PERL_INC)/dosish.h \
$(PERL_INC)/embed.h \
$(PERL_INC)/embedvar.h \
$(PERL_INC)/fakethr.h \
$(PERL_INC)/form.h \
$(PERL_INC)/gv.h \
$(PERL_INC)/handy.h \
$(PERL_INC)/hv.h \
$(PERL_INC)/intrpvar.h \
$(PERL_INC)/iperlsys.h \
$(PERL_INC)/keywords.h \
$(PERL_INC)/mg.h \
$(PERL_INC)/nostdio.h \
$(PERL_INC)/op.h \
$(PERL_INC)/opcode.h \
$(PERL_INC)/patchlevel.h \
$(PERL_INC)/perl.h \
$(PERL_INC)/perlio.h \
$(PERL_INC)/perlsdio.h \
$(PERL_INC)/perlsfio.h \
$(PERL_INC)/perlvars.h \
$(PERL_INC)/perly.h \
$(PERL_INC)/pp.h \
$(PERL_INC)/pp_proto.h \
$(PERL_INC)/proto.h \
$(PERL_INC)/regcomp.h \
$(PERL_INC)/regexp.h \
$(PERL_INC)/regnodes.h \
$(PERL_INC)/scope.h \
$(PERL_INC)/sv.h \
$(PERL_INC)/thrdvar.h \
$(PERL_INC)/thread.h \
$(PERL_INC)/unixish.h \
$(PERL_INC)/util.h
$(OBJECT) : $(PERL_HDRS)
Git.c : $(XSUBPPDEPS)
# --- MakeMaker makefile section:
$(OBJECT) : $(FIRST_MAKEFILE)
# We take a very conservative approach here, but it's worth it.
# We move Makefile to Makefile.old here to avoid gnu make looping.
$(FIRST_MAKEFILE) : Makefile.PL $(CONFIGDEP)
$(NOECHO) $(ECHO) "Makefile out-of-date with respect to $?"
$(NOECHO) $(ECHO) "Cleaning current config before rebuilding Makefile..."
$(NOECHO) $(RM_F) $(MAKEFILE_OLD)
$(NOECHO) $(MV) $(FIRST_MAKEFILE) $(MAKEFILE_OLD)
-$(MAKE) -f $(MAKEFILE_OLD) clean $(DEV_NULL) || $(NOOP)
$(PERLRUN) Makefile.PL "PREFIX=/d/scripts/git" "DEFINE=
-DNO_D_TYPE_IN_DIRENT -DNO_D_INO_IN_DIRENT -DNO_SYMLINK_HEAD -DNO_IPV6
-DSHA1_HEADER='<openssl/sha.h>' -DNO_STRCASESTR -DNO_STRLCPY -DNO_MMAP
-DGIT_VERSION='"1.4.2.rc2.gb80eb"'" "LIBS= -lz -liconv -lcrypto"
$(NOECHO) $(ECHO) "==> Your Makefile has been rebuilt. <=="
$(NOECHO) $(ECHO) "==> Please rerun the make command. <=="
false
# --- MakeMaker staticmake section:
# --- MakeMaker makeaperl section ---
MAP_TARGET = perl
FULLPERL = C:\perl\bin\perl.exe
$(MAP_TARGET) :: static $(MAKE_APERL_FILE)
$(MAKE) -f $(MAKE_APERL_FILE) $@
$(MAKE_APERL_FILE) : $(FIRST_MAKEFILE)
$(NOECHO) $(ECHO) Writing \"$(MAKE_APERL_FILE)\" for this $(MAP_TARGET)
$(NOECHO) $(PERLRUNINST) \
Makefile.PL DIR= \
MAKEFILE=$(MAKE_APERL_FILE) LINKTYPE=static \
MAKEAPERL=1 NORECURS=1 CCCDLFLAGS= \
PREFIX=/d/scripts/git \
DEFINE=' -DNO_D_TYPE_IN_DIRENT -DNO_D_INO_IN_DIRENT
-DNO_SYMLINK_HEAD -DNO_IPV6 -DSHA1_HEADER='<openssl/sha.h>'
-DNO_STRCASESTR -DNO_STRLCPY -DNO_MMAP
-DGIT_VERSION='"1.4.2.rc2.gb80eb"'' \
LIBS=' -lz -liconv -lcrypto'
# --- MakeMaker test section:
TEST_VERBOSE=0
TEST_TYPE=test_$(LINKTYPE)
TEST_FILE = test.pl
TEST_FILES =
TESTDB_SW = -d
testdb :: testdb_$(LINKTYPE)
test :: $(TEST_TYPE)
$(NOECHO) $(ECHO) 'No tests defined for $(NAME) extension.'
test_dynamic :: pure_all
testdb_dynamic :: pure_all
$(FULLPERLRUN) $(TESTDB_SW) "-I$(INST_LIB)" "-I$(INST_ARCHLIB)" $(TEST_FILE)
test_ : test_dynamic
test_static :: pure_all $(MAP_TARGET)
testdb_static :: pure_all $(MAP_TARGET)
./$(MAP_TARGET) $(TESTDB_SW) "-I$(INST_LIB)" "-I$(INST_ARCHLIB)" $(TEST_FILE)
# --- MakeMaker ppd section:
# Creates a PPD (Perl Package Description) for a binary distribution.
ppd:
$(NOECHO) $(ECHO) "<SOFTPKG NAME=\"$(DISTNAME)\"
VERSION=\"0,01,0,0\">" > $(DISTNAME).ppd
$(NOECHO) $(ECHO) " <TITLE>$(DISTNAME)</TITLE>" >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) " <ABSTRACT></ABSTRACT>" >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) " <AUTHOR></AUTHOR>" >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) " <IMPLEMENTATION>" >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) " <OS NAME=\"$(OSNAME)\" />" >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) " <ARCHITECTURE
NAME=\"MSWin32-x86-multi-thread-5.8\" />" >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) " <CODEBASE HREF=\"\" />" >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) " </IMPLEMENTATION>" >> $(DISTNAME).ppd
$(NOECHO) $(ECHO) "</SOFTPKG>" >> $(DISTNAME).ppd
# --- MakeMaker pm_to_blib section:
pm_to_blib: $(TO_INST_PM)
$(NOECHO) $(PERLRUN) -MExtUtils::Install -e "pm_to_blib({@ARGV},
'$(INST_LIB)\auto', '$(PM_FILTER)')"\
private-Error.pm $(INST_LIBDIR)/Error.pm \
Git.pm $(INST_LIBDIR)/Git.pm
$(NOECHO) $(TOUCH) $@
# --- MakeMaker selfdocument section:
# --- MakeMaker postamble section:
instlibdir:
@echo '$(INSTALLSITEARCH)'
check:
perl -MDevel::PPPort -le 'Devel::PPPort::WriteFile(".ppport.h")' && \
perl .ppport.h --compat-version=5.6.0 Git.xs && \
rm .ppport.h
# End.
^ permalink raw reply
* Re: What's in git.git
From: Alex Riesen @ 2006-08-03 12:32 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vmzamqivk.fsf@assigned-by-dhcp.cox.net>
On 8/3/06, Junio C Hamano <junkio@cox.net> wrote:
> >> What's the standard workflow/procedure ActiveState users would
> >> use to build and install .xs extensions? Maybe they have their
> >> own $(MAKE) equivalent that groks such a Makefile with
> >> backslashed pathnames and CRLF endings?
> >
> > I don't know. It's a bit more than backslashes and CRLF. The pathnames
> > must be _completely_ converted from windows to cygwin. Cygwin even
> > provides an utility for that (cygpath). Besides, there still is that stupid
> > case-sensitivity problem.
>
> What I meant to say was that the real mistake might be for us to
> try using the Cygwin toolchain (GNU make, gcc and GNU C library)
> while working with ActiveState.
Luckily, only ActiveState Perl users are hit. Which, I suppose,
is not all that much (it's really crappy environment to work in,
an only real stupid corporate users can keep doing that),
and they're used to pain.
> Now, I admit I know very little about ActiveState and know
> nothing about Windows build environment, but I would not be
> surprised if in ActiveState land there were a MakeMaker
> equivalent that spits out Makefile equivalent that is suitable
> for MS development environment, and the users are expected to
> work in that environment, perhaps using MS C compiler toolchain,
AFAICS, it is not suitable for anything: generated Makefile is not
parsable by nmake(what MS thinks is a make) and is more like a
broken gmake Makefile. Also -fno-strict-aliasing points at gcc.
> to produce object files if they want to link with ActiveState
> stuff. If that were the case, maybe what is needed is to port
> the build infrastructure to MS development environment, and
> making Makefile generated from perl/Makefile.PL usable might not
> be of much use.
I'd suggest to add NO_PERL_XS option to the top-level Makefile.
Really core tools do not need Git.pm.
^ permalink raw reply
* Creating diffs
From: Rocco Rutte @ 2006-08-03 12:29 UTC (permalink / raw)
To: git
Hi,
when creating a diff between two branches, one particular file needs a
manually created/modified diff (the file contains just 1 line). As I
cannot exclude files from the diff and create the missing one manually,
I tried using the opposite approach: include all wanted.
However, when I do:
$ git diff source:file dest:file
I get:
--- a/source:file
+++ b/source:file
But I'd like to drop the branchname. Can I do that without filtering
everything through sed(1)?
Also, I think the diffs are reversed:
$ git diff master:builtin-rm.c appname:builtin-rm.c
diff --git a/master:builtin-rm.c b/master:builtin-rm.c
index 735f3db..92d205a 100644
--- a/master:builtin-rm.c
+++ b/master:builtin-rm.c
@@ -50,7 +50,6 @@ int cmd_rm(int argc, const char **argv,
const char **pathspec;
char *seen;
- git_set_appname("git-rm");
git_config(git_default_config);
newfd = hold_lock_file_for_update(&lock_file, get_index_file());
since the appname branch contains the change while master doesn't.
Git version is 1.4.2.rc2 but both "bugs" happen with unpatched 1.3, too.
bye, Rocco
--
:wq!
^ permalink raw reply
* Re: gitweb testing with non-apache web server
From: Sam Vilain @ 2006-08-03 11:42 UTC (permalink / raw)
To: Marc Singer; +Cc: git
In-Reply-To: <20060803075403.GA5238@buici.com>
Marc Singer wrote:
> I would like to use gitweb with the Cherokee web server because the
> host that I have on hand has very limited RAM, 32MiB. Neither the
> version of gitweb available on Debian (v264) nor the latest in the git
> repo works.
Marc,
I use lighttpd on utsl.gen.nz, which is only a wee box, too. I hacked
FastCGI support into gitweb.cgi, my changes are available at
git://utsl.gen.nz/gitweb (gitweb url at
http://utsl.gen.nz/gitweb/?p=gitweb).
I just set up the /git path to redirect to /git/ in the web server.
Sam.
>
> I did some debugging on the latest repo version. The lines
>
> our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
> if (defined $project) {
> ...
>
> are being executed even though the url is
>
> http://server/git
>
> I think that the problem is that Cherokee translates the request URL
> into
>
> http://server/git/
>
> which means that the $ENV{'PATH_INFO'} is the string "/" insted of
> being undefined.
>
> The error I'm seeing is that the request path is forbidden, but I
> suspect that this is some sort of misunderstanding between the web
> server and the script.
>
> So, I wonder if someone who has a working gitweb would be willing to
> test with Cherokee or some other resource conservative web server.
>
> Cheers.
>
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: What's in git.git
From: carbonated beverage @ 2006-08-03 9:31 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <20060803085002.GA14400@prophet.net-ronin.org>
Okay, dug around a bit more, and I admit, I'm not very familiar with Tk
(just started reading about it when poking at the gitk weirdness).
After applying your patch, rm'ing ~/.gitk, *and* doing:
--- gitk 2006-08-03 02:27:20.000000000 -0700
+++ /home/barbeque/bin/gitk 2006-08-03 02:24:52.000000000 -0700
@@ -429,7 +429,7 @@
panedwindow .ctop -orient vertical
if {[info exists geometry(width)]} {
.ctop conf -width $geometry(width) -height $geometry(height)
- set texth [expr {$geometry(height) - $geometry(canvh) - 56}]
+ set texth [expr {$geometry(height) - $geometry(canvh) - 136}]
set geometry(ctexth) [expr {($texth - 8) /
[font metrics $textfont -linespace]}]
}
Then subsequent launches of gitk appear to be correct. However, if the stale
~/.gitk is still around, the bug stays around.
Since my eyes are getting fuzzy, can someone that knows TCL/Tk eyeball that
and see if it's the actual cause, or just papering over a bug?
Thanks!
-- DN
Daniel
^ permalink raw reply
* Re: What's in git.git
From: Junio C Hamano @ 2006-08-03 9:16 UTC (permalink / raw)
To: Alex Riesen; +Cc: git
In-Reply-To: <81b0412b0608030109g6f49113ep5cf577475117469b@mail.gmail.com>
"Alex Riesen" <raa.lkml@gmail.com> writes:
>> What's the standard workflow/procedure ActiveState users would
>> use to build and install .xs extensions? Maybe they have their
>> own $(MAKE) equivalent that groks such a Makefile with
>> backslashed pathnames and CRLF endings?
>
> I don't know. It's a bit more than backslashes and CRLF. The pathnames
> must be _completely_ converted from windows to cygwin. Cygwin even
> provides an utility for that (cygpath). Besides, there still is that stupid
> case-sensitivity problem.
What I meant to say was that the real mistake might be for us to
try using the Cygwin toolchain (GNU make, gcc and GNU C library)
while working with ActiveState.
Now, I admit I know very little about ActiveState and know
nothing about Windows build environment, but I would not be
surprised if in ActiveState land there were a MakeMaker
equivalent that spits out Makefile equivalent that is suitable
for MS development environment, and the users are expected to
work in that environment, perhaps using MS C compiler toolchain,
to produce object files if they want to link with ActiveState
stuff. If that were the case, maybe what is needed is to port
the build infrastructure to MS development environment, and
making Makefile generated from perl/Makefile.PL usable might not
be of much use.
^ permalink raw reply
* Re: What's in git.git
From: Jakub Narebski @ 2006-08-03 9:03 UTC (permalink / raw)
To: git
In-Reply-To: <7vvepaqkki.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
> The following _might_ have a better chance of success...
Doesn't clobber ~/.gitk, but doesn't correct error either (i.e. I still
cannot see bottommost part of gitk window in subsequent invocations).
* Aurox Linux 11.1 (Zeus), based on Fedora Core 4
* Linux 2.6.14-11.1.aur.2
* tcl-8.4.9-3
* xorg-x11-6.8.2-37.FC4.49.2
* windowmaker-0.91.0-1.1.fc3.rf
* git v1.4.2-rc2-geb10b37 + your patch
# grep geometry ~/.gitk
set geometry(width) 890
set geometry(height) 868
set geometry(canv1) 405
set geometry(canv2) 270
set geometry(canv3) 174
set geometry(canvh) 354
set geometry(ctextw) 80
set geometry(ctexth) 34
set geometry(cflistw) 35
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
^ permalink raw reply
* Re: What's in git.git
From: carbonated beverage @ 2006-08-03 8:50 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vvepaqkki.fsf@assigned-by-dhcp.cox.net>
On Thu, Aug 03, 2006 at 01:39:57AM -0700, Junio C Hamano wrote:
> Did your ~/.gitk change after exiting your gitk session? I
> somehow doubt it.
>
> The following _might_ have a better chance of success...
Whups -- you're right. It wasn't creating ~/.gitk at all, so it was in
as you said -- just like rm'ing it every time.
I tried your patch, and I still get the same result, though it creates a
~/.gitk. "set geometry(ctexth)" appears in the ~/.gitk file properly now,
though.
I'll keep digging, and sorry for the noise.
-- DN
Daniel
^ permalink raw reply
* Re: What's in git.git
From: Junio C Hamano @ 2006-08-03 8:39 UTC (permalink / raw)
To: carbonated beverage; +Cc: git
In-Reply-To: <20060803073636.GA12755@prophet.net-ronin.org>
carbonated beverage <ramune@net-ronin.org> writes:
> Wheee...
>
> Found it.
>
> diff --git a/gitk b/gitk
> index ba4644f..5ae28ef 100755
> --- a/gitk
> +++ b/gitk
> @@ -770,6 +770,9 @@ proc savestuff {w} {
> set wid [expr {([winfo width $ctext] - 8) \
> / [font measure $textfont "0"]}]
> puts $f "set geometry(ctextw) $wid"
> + set geometry(ctexth) [expr {($texth - 8) /
> + / [font metrics $textfont -linespace]}]
> + puts $f "set geometry(ctexth) $wid"
Are you sure about this?
* $texth is not global, and set geometry(ctexth)
expression has a syntax error (the slash at the end of
the line should be backslash for continuation) -- I do
not see how this could have worked.
* you are setting geometry(ctexth) but trying to write
out $wid (which is geometry(ctextw) for the next
round).
* but because of the first problem, I suspect the entire
catch {} clause would have silently failed, perhaps
leaving the old ~/.gitk around, or more likely not
creating ~/.gitk at all, which essentially is
"removing ~/.gitk every time you run it" ;-).
Did your ~/.gitk change after exiting your gitk session? I
somehow doubt it.
The following _might_ have a better chance of success...
---
diff --git a/gitk b/gitk
index ba4644f..b06e022 100755
--- a/gitk
+++ b/gitk
@@ -761,17 +761,25 @@ proc savestuff {w} {
puts $f [list set cmitmode $cmitmode]
puts $f [list set wrapcomment $wrapcomment]
puts $f [list set showneartags $showneartags]
+
+ set g_height [winfo height .ctop]
+ set g_canvh [expr {[winfo height $canv]-2}]
+
puts $f "set geometry(width) [winfo width .ctop]"
- puts $f "set geometry(height) [winfo height .ctop]"
+ puts $f "set geometry(height) $g_height"
puts $f "set geometry(canv1) [expr {[winfo width $canv]-2}]"
puts $f "set geometry(canv2) [expr {[winfo width $canv2]-2}]"
puts $f "set geometry(canv3) [expr {[winfo width $canv3]-2}]"
- puts $f "set geometry(canvh) [expr {[winfo height $canv]-2}]"
+ puts $f "set geometry(canvh) $g_canvh"
set wid [expr {([winfo width $ctext] - 8) \
/ [font measure $textfont "0"]}]
puts $f "set geometry(ctextw) $wid"
set wid [expr {([winfo width $cflist] - 11) \
/ [font measure [$cflist cget -font] "0"]}]
+ set texth [expr {$g_height - $g_canvh - 56}]
+ set g_ctexth [expr {($texth - 8) \
+ / [font metrics $textfont -linespace]}]
+ puts $f "set geometry(ctexth) $g_ctexth"
puts $f "set geometry(cflistw) $wid"
puts -nonewline $f "set permviews {"
for {set v 0} {$v < $nextviewnum} {incr v} {
^ permalink raw reply related
* Re: setting up git-cvsserver
From: Uwe Zeisberger @ 2006-08-03 8:36 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
In-Reply-To: <Pine.LNX.4.63.0608011822080.17230@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin wrote:
> Hi,
>
> On Tue, 1 Aug 2006, Uwe Zeisberger wrote:
>
> > I cannot checkout a git repo via cvs, I think the only problem is, that
> > I don't know how to specify the CVSROOT:
> >
> > fs-n1:~# grep git- /etc/inetd.conf
> > 2402 stream tcp nowait root /usr/local/sbin/git-cvsserver pserver
>
> From Documentation/git-cvsserver.txt:
>
> -- snip --
> Note: In some cases, you need to pass the 'pserver' argument twice for
> git-cvsserver to see it. So the line would look like
>
> ------
> cvspserver stream tcp nowait nobody git-cvsserver pserver pserver
> -- snap --
>
> So, maybe this solves your problem?
Yes, thanks. Sorry. The mail was written in a hurry because I wanted
to reach a bus.
BTW, after reading inetd.conf(5), I think the git-cvsserver should occur
twice, not pserver. The first (actually the 6th) item specifies the
path to the binary to call and the next it the program name the program
sees (i.e. argv[0] (in C) resp. $0 (in Perl)).
You could circumvent that by testing $0 == "pserver" in git-cvsserver.
> OTOH it might be cleverer to use SSH transport to begin with.
For me not. I have to convice some managers in my company that it is
sensible to only switch the linux department to git. They want to
assert that every engineer can access anybodys code. Because not every
"other" developper has an account on our cvs server anonymous pserver is
what *I* want.
Best regards
Uwe
--
Uwe Zeisberger
http://www.google.com/search?q=sin%28pi%2F2%29
^ permalink raw reply
* Re: gitweb testing with non-apache web server
From: Jakub Narebski @ 2006-08-03 8:18 UTC (permalink / raw)
To: git
In-Reply-To: <20060803075403.GA5238@buici.com>
<opublikowany i wysłany>
Marc Singer wrote:
> I did some debugging on the latest repo version. The lines
>
> our $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
> if (defined $project) {
> ...
>
> are being executed even though the url is
>
> http://server/git
>
> I think that the problem is that Cherokee translates the request URL
> into
>
> http://server/git/
>
> which means that the $ENV{'PATH_INFO'} is the string "/" insted of
> being undefined.
Try changing
my $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
if (defined $project) {
$project =~ s|^/||; $project =~ s|/$||;
to
my $project = ($cgi->param('p') || $ENV{'PATH_INFO'});
$project =~ s|^/||; $project =~ s|/$||;
if (defined $project && $project) {
(and send patch if it works, please).
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
^ permalink raw reply
* Re: What's in git.git
From: Alex Riesen @ 2006-08-03 8:09 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vd5bis9ha.fsf@assigned-by-dhcp.cox.net>
On 8/3/06, Junio C Hamano <junkio@cox.net> wrote:
> >> - Git.pm by Pasky with help from Pavel Roskin and others.
> >>
> >> I'd like to merge this immediately after 1.4.2, unless there
> >> still are concerns about its portability (in which case
> >> please help fixing them up before this hits the "master"
> >> branch).
> >
> > Completely broken on ActiveState Perl and cygwin. Generated Makefile
> > contains pathnames with backslashes and the whole file has
> > CRLF line endings.
>
> Anything constructive other than "doctor it hurts when I use
> activestate", so you can help improve things to be more
> ActiveState friendly?
Nothing. If I had something, I'd post it.
> What's the standard workflow/procedure ActiveState users would
> use to build and install .xs extensions? Maybe they have their
> own $(MAKE) equivalent that groks such a Makefile with
> backslashed pathnames and CRLF endings?
I don't know. It's a bit more than backslashes and CRLF. The pathnames
must be _completely_ converted from windows to cygwin. Cygwin even
provides an utility for that (cygpath). Besides, there still is that stupid
case-sensitivity problem.
^ 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