* Re: [PATCH 6/10] Fix header breakage with _XOPEN_SOURCE.
From: Junio C Hamano @ 2006-08-02 7:46 UTC (permalink / raw)
To: Ramsay Jones; +Cc: git
In-Reply-To: <00b601c6b5cf$7d54b940$c47eedc1@ramsay1.demon.co.uk>
"Ramsay Jones" <ramsay@ramsay1.demon.co.uk> writes:
> convert-objects.c sets _XOPEN_SOURCE and _XOPEN_SOURCE_EXTENDED before
> including <time.h>, in order to get the declaration of strptime().
> This leads to breakage in cache.h, due to S_ISLNK and S_IFLNK no longer
> being defined by <sys/stat.h>. These definitions are protected by the
> __USE_BSD symbol, which is not set when _XOPEN_SOURCE is set. Moving
> the #defines and #include <time.h> below all other #includes does not
> fix the problem, however, since now _USE_XOPEN, which protects the
> declaration of strptime(), is now not defined (don't ask!).
Wouldn't including "cache.h" and friends first and including
<time.h> last solve the problem, then?
This kind of change tends to fix one system while potentially
breaking another, and we would need to be careful. Will queue
for post 1.4.2 and have people scream if it breaks somebody, I
guess.
^ permalink raw reply
* Re: [PATCH] gitweb.cgi: Customization
From: Martin Langhoff @ 2006-08-02 7:59 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7v1wrzwpg5.fsf@assigned-by-dhcp.cox.net>
On 8/2/06, Junio C Hamano <junkio@cox.net> wrote:
> "Martin Langhoff" <martin.langhoff@gmail.com> writes:
>
> > I'm a bit lost as to gitweb config. Are we not relying on %ENV for
> > this stuff?
>
> It is Ok to use %ENV as an alternative way, but I'd rather not
> make it the _only_ way for basic configuration. Not everybody
> runs Apache.
Ho-hum. And are those other webservers limited in their ENV-setting-fu? ;-)
I always thought that any webserver implementing CGI had reasonable
means of ENV manipulation, as that's the main mechanism for the
webserver to "configure" the CGI program.
But I'm definitely old-style and out-of-fashion in this.
martin
^ permalink raw reply
* git-push and -f option
From: Aneesh Kumar @ 2006-08-02 8:33 UTC (permalink / raw)
To: Git Mailing List
The man page says -f is same as --force. But the script doesn't seems
to handle this.
-aneesh
^ permalink raw reply
* Re: [PATCH 8/10] Fix some minor warnings to allow -Werror.
From: Rocco Rutte @ 2006-08-02 8:53 UTC (permalink / raw)
To: git
In-Reply-To: <7vvepbvauo.fsf@assigned-by-dhcp.cox.net>
Hi,
* Junio C Hamano [06-08-02 00:46:23 -0700] wrote:
[...]
>This kills the compilation with:
>
>gcc -o builtin-mailinfo.o -c -O2 -Werror -ansi -pedantic -std=c99 -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wall -Wdeclaration-after-statement -g -DSHA1_HEADER='<openssl/sha.h>' -DNO_STRLCPY builtin-mailinfo.c
>cc1: warnings being treated as errors
>builtin-mailinfo.c: In function 'convert_to_utf8':
>builtin-mailinfo.c:561: warning: passing argument 2 of 'iconv' from incompatible pointer type
>
>where the line 561 reads:
>
> nrc = iconv(conv, &in, &insize, &out, &outsize);
It depends on the iconv() implementation as what the input pointer is
defined: some use just 'char*' while others use 'const char*' (GNU
libiconv IIRC).
bye, Rocco
--
:wq!
^ permalink raw reply
* Re: [PATCH] gitweb.cgi: Customization
From: Matthias Lederhofer @ 2006-08-02 8:54 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Martin Waitz, Luben Tuikov
In-Reply-To: <E1G8ArX-0006r2-6D@moooo.ath.cx>
Just another idea: add something like @@FOO@@ on a line of its own and
this is replaced by the content of a file if the user specifies one,
nothing if he does not. This way one could include the config
directly into gitweb.cgi or include a file that includes the
configuration file from another place.
^ permalink raw reply
* Re: [PATCH] gitweb.cgi: Customization
From: Martin Langhoff @ 2006-08-02 9:31 UTC (permalink / raw)
To: Junio C Hamano, git, Martin Waitz, Luben Tuikov
In-Reply-To: <E1G8CUz-0002KI-VW@moooo.ath.cx>
On 8/2/06, Matthias Lederhofer <matled@gmx.net> wrote:
> Just another idea: add something like @@FOO@@ on a line of its own and
We kind-of had that in a few Perl scripts before, and it's a mighty
pain to develop and debug from your git repo because it makes your
checked-in code invalid.
You might want to see this patch:
http://kernel.org/git/?p=git/git.git;a=commitdiff;h=e923effb43fa952f9cb72ffe4c3625fce7655bff;hp=ced9456a27197fc038fbc5b5ebad87e55f1920d2
cheers,
m
^ permalink raw reply
* kompare won't parse git diffs
From: Andy Parkins @ 2006-08-02 10:07 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]
Hello,
Kompare just shows blank for diffs redirected from git. This makes it
I've tracked down the cause and it seems to be on the file declaration lines.
Here is a sample diff that kompare will not show.
diff --git a/file b/file
index a8b2ec6..a1e65fd 100644
--- a/file
+++ b/file
@@ -1,2 +1,3 @@
initial contents goes in master branch
additional content added in repo1#master
+blah
As you can see, it's a simple addition of the line "blah". Kompare shows this
diff as blank. Now if I modify the file so that the "---" and "+++" lines
both have "<tab>(something)" added:
diff --git a/file b/file
index a8b2ec6..a1e65fd 100644
--- a/file (anything can go here)
+++ b/file (anything can go here)
@@ -1,2 +1,3 @@
initial contents goes in master branch
additional content added in repo1#master
+blah
http://bugs.kde.org/show_bug.cgi?id=131717
I've posted a bug for kompare, but thought that maybe it would be handy if git
outputted those bracketed comments anyway - I notice that "diff -u" from the
command line does (although it uses the timestamp of the file). Maybe the
object hash of the files being compared could go here?
Andy
--
Dr Andy Parkins, M Eng (hons), MIEE
andyparkins@gmail.com
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply related
* Get everything you need delivered to your door low-cost and fast. Take pleasure from
From: Hazel @ 2006-08-02 10:34 UTC (permalink / raw)
To: git
Woo-hooo!
Do you wish to increase your volume by up to 500%? But without any results…
Fill up your supplies with our secure ordering, cost saving and fast delivery. Rock hard manhood, multiple explosions and several times more semen volume
See our shop: http://www.wangheeni.com
Unique offers on most recognized and famous brands on Earth.
Hazel Godfrey
A stumble may prevent a fall. Every step of life is a risk God could not be everywhere and therefore he made mothers
A nod is as good as a wink to a blind man. Men do not despise a thief, if he steal to satisfy his soul when he is hungry. Faith will move mountains. Everyday is a fresh slate
The pen is mightier than the sword.
^ permalink raw reply
* Stop searching for the online casino of your dreams! It is just one click away, boasting fantastic games, trusted playing system and lots of bonuses for players.
From: Reynaldo @ 2006-08-02 12:53 UTC (permalink / raw)
To: git
How are you Sir,
Sign up for playing at our popular online casino now, and you will win huge tomorrow - or even today!
Betcity is the best in the industryb ecause we offer:
What people value about our casino is reliability and trusted payout system.
{CAS_1}
{CAS_1}
{CAS_1}
Give us a try! Remember, Free $300.00 is ON THE HUOSE!
Let friends envy you - win big and buy the luxury car you always wanted.
Start Winning Now!
http://freamert.com/d3/check/
Hear me now therefore, O ye children, and depart not from the words of my mouth. A man in love is a fool, and an old man in love is the greatest fool of all. No man is wise at all times Enough is as good as a feast
^ permalink raw reply
* Re: [PATCH] gitweb.cgi: Customization
From: Matthias Lederhofer @ 2006-08-02 12:55 UTC (permalink / raw)
To: Martin Langhoff; +Cc: git
In-Reply-To: <46a038f90608020231l37de81f0i5f14c7c264fc40bd@mail.gmail.com>
Martin Langhoff <martin.langhoff@gmail.com> wrote:
> On 8/2/06, Matthias Lederhofer <matled@gmx.net> wrote:
> >Just another idea: add something like @@FOO@@ on a line of its own and
>
> We kind-of had that in a few Perl scripts before, and it's a mighty
> pain to develop and debug from your git repo because it makes your
> checked-in code invalid.
>
> You might want to see this patch:
> http://kernel.org/git/?p=git/git.git;a=commitdiff;h=e923effb43fa952f9cb72ffe4c3625fce7655bff;hp=ced9456a27197fc038fbc5b5ebad87e55f1920d2
Perhaps # @@INSERT_YOUR_CODE_HERE@@?
^ permalink raw reply
* Re: [PATCH 9/10] Remove cmd_usage() routine and re-organize the help/usage code.
From: Martin Waitz @ 2006-08-02 13:21 UTC (permalink / raw)
To: Ramsay Jones; +Cc: git
In-Reply-To: <00c201c6b5cf$8089a580$c47eedc1@ramsay1.demon.co.uk>
[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]
hoi :)
On Wed, Aug 02, 2006 at 02:03:44AM +0100, Ramsay Jones wrote:
> builtin-help.c | 54
> +++++++++++++++++++++++-------------------------------
> builtin.h | 7 ++-----
> git.c | 7 +++++--
> 3 files changed, 30 insertions(+), 38 deletions(-)
this patch is at the tip of "master" now, but with one more change:
builtin-help.c | 54 ++++++++++++++++++++--------------------------
builtin.h | 7 ++----
git.c | 7 ++++--
t/t9100-git-svn-basic.sh | 7 +++---
4 files changed, 33 insertions(+), 42 deletions(-)
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index bf1d638..34a3ccd 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -170,7 +170,7 @@ then
test -L $SVN_TREE/exec-2.sh"
name='modify a symlink to become a file'
- git help > help || true
+ echo git help > help || true
rm exec-2.sh
cp help exec-2.sh
git update-index exec-2.sh
this looks strange.
--
Martin Waitz
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply related
* Re: What's in git.git
From: Alex Riesen @ 2006-08-02 14:02 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7v1ws0xb9y.fsf@assigned-by-dhcp.cox.net>
On 8/2/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.
^ permalink raw reply
* [PATCH] git-push: allow -f as an alias for --force
From: Jeff King @ 2006-08-02 15:28 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List, Aneesh Kumar
In-Reply-To: <cc723f590608020133o3c960cf0v1546c59319253dc0@mail.gmail.com>
This was already documented in the options section of the manpage. This
patch implements it, adds it to the usage message, and mentions it at the
top of the manpage.
Signed-off-by: Jeff King <peff@peff.net>
---
On Wed, Aug 02, 2006 at 02:03:12PM +0530, Aneesh Kumar wrote:
> The man page says -f is same as --force. But the script doesn't seems
> to handle this.
Documentation/git-push.txt | 2 +-
builtin-push.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 56afd64..d4ae99f 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -8,7 +8,7 @@ git-push - Update remote refs along with
SYNOPSIS
--------
-'git-push' [--all] [--tags] [--force] <repository> <refspec>...
+'git-push' [--all] [--tags] [-f | --force] <repository> <refspec>...
DESCRIPTION
-----------
diff --git a/builtin-push.c b/builtin-push.c
index a824171..c39dd1e 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -8,7 +8,7 @@ #include "builtin.h"
#define MAX_URI (16)
-static const char push_usage[] = "git push [--all] [--tags] [--force] <repository> [<refspec>...]";
+static const char push_usage[] = "git push [--all] [--tags] [-f | --force] <repository> [<refspec>...]";
static int all = 0, tags = 0, force = 0, thin = 1;
static const char *execute = NULL;
@@ -291,7 +291,7 @@ int cmd_push(int argc, const char **argv
tags = 1;
continue;
}
- if (!strcmp(arg, "--force")) {
+ if (!strcmp(arg, "--force") || !strcmp(arg, "-f")) {
force = 1;
continue;
}
--
1.4.2.rc2.g822a-dirty
^ permalink raw reply related
* [PATCH] git-push: remove obsolete git-push.sh
From: Jeff King @ 2006-08-02 15:37 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
This was converted to a C builtin over three months ago.
Signed-off-by: Jeff King <peff@peff.net>
---
git-push.sh | 87 -----------------------------------------------------------
1 files changed, 0 insertions(+), 87 deletions(-)
diff --git a/git-push.sh b/git-push.sh
deleted file mode 100755
index 21775fc..0000000
--- a/git-push.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-USAGE='[--all] [--tags] [--force] <repository> [<refspec>...]'
-. git-sh-setup
-
-# Parse out parameters and then stop at remote, so that we can
-# translate it using .git/branches information
-has_all=
-has_force=
-has_exec=
-has_thin=--thin
-remote=
-do_tags=
-
-while case "$#" in 0) break ;; esac
-do
- case "$1" in
- --all)
- has_all=--all ;;
- --tags)
- do_tags=yes ;;
- --force)
- has_force=--force ;;
- --exec=*)
- has_exec="$1" ;;
- --thin)
- ;; # noop
- --no-thin)
- has_thin= ;;
- -*)
- usage ;;
- *)
- set x "$@"
- shift
- break ;;
- esac
- shift
-done
-case "$#" in
-0)
- echo "Where would you want to push today?"
- usage ;;
-esac
-
-. git-parse-remote
-remote=$(get_remote_url "$@")
-
-case "$has_all" in
---all)
- set x ;;
-'')
- case "$do_tags,$#" in
- yes,1)
- set x $(cd "$GIT_DIR/refs" && find tags -type f -print) ;;
- yes,*)
- set x $(cd "$GIT_DIR/refs" && find tags -type f -print) \
- $(get_remote_refs_for_push "$@") ;;
- ,*)
- set x $(get_remote_refs_for_push "$@") ;;
- esac
-esac
-
-shift ;# away the initial 'x'
-
-# $# is now 0 if there was no explicit refspec on the command line
-# and there was no default refspec to push from remotes/ file.
-# we will let git-send-pack to do its "matching refs" thing.
-
-case "$remote" in
-git://*)
- die "Cannot use READ-ONLY transport to push to $remote" ;;
-rsync://*)
- die "Pushing with rsync transport is deprecated" ;;
-esac
-
-set x "$remote" "$@"; shift
-test "$has_all" && set x "$has_all" "$@" && shift
-test "$has_force" && set x "$has_force" "$@" && shift
-test "$has_exec" && set x "$has_exec" "$@" && shift
-test "$has_thin" && set x "$has_thin" "$@" && shift
-
-case "$remote" in
-http://* | https://*)
- exec git-http-push "$@";;
-*)
- exec git-send-pack "$@";;
-esac
--
1.4.2.rc2.g822a-dirty
^ permalink raw reply related
* Re: [PATCH] gitweb.cgi: Customization
From: Matthias Lederhofer @ 2006-08-02 15:53 UTC (permalink / raw)
To: Martin Langhoff; +Cc: git
In-Reply-To: <46a038f90608020059w2d4567ve2043f2c7467dea3@mail.gmail.com>
Martin Langhoff <martin.langhoff@gmail.com> wrote:
> On 8/2/06, Junio C Hamano <junkio@cox.net> wrote:
> >"Martin Langhoff" <martin.langhoff@gmail.com> writes:
> >
> >> I'm a bit lost as to gitweb config. Are we not relying on %ENV for
> >> this stuff?
> >
> >It is Ok to use %ENV as an alternative way, but I'd rather not
> >make it the _only_ way for basic configuration. Not everybody
> >runs Apache.
>
> Ho-hum. And are those other webservers limited in their ENV-setting-fu? ;-)
>
> I always thought that any webserver implementing CGI had reasonable
> means of ENV manipulation, as that's the main mechanism for the
> webserver to "configure" the CGI program.
>
> But I'm definitely old-style and out-of-fashion in this.
At least if you cannot change the webserver configuration it might be
more complicated to set environment variables.
^ permalink raw reply
* [PATCH] Make git-prune-packed a builtin
From: Matthias Kestenholz @ 2006-08-02 16:17 UTC (permalink / raw)
To: git; +Cc: junkio
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
---
Makefile | 6 +++---
prune-packed.c => builtin-prune-packed.c | 2 +-
builtin.h | 1 +
git.c | 1 +
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 2562a2c..e39c9da 100644
--- a/Makefile
+++ b/Makefile
@@ -196,7 +196,7 @@ PROGRAMS = \
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-peek-remote$X git-prune-packed$X git-receive-pack$X \
+ git-peek-remote$X git-receive-pack$X \
git-send-pack$X git-shell$X \
git-show-index$X git-ssh-fetch$X \
git-ssh-upload$X git-unpack-file$X \
@@ -216,7 +216,7 @@ BUILT_INS = git-log$X git-whatchanged$X
git-read-tree$X git-commit-tree$X git-write-tree$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-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X
# what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -273,7 +273,7 @@ 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-mv.o builtin-prune-packed.o
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
EXTLIBS = -lz
diff --git a/prune-packed.c b/builtin-prune-packed.c
similarity index 96%
rename from prune-packed.c
rename to builtin-prune-packed.c
index d24b097..8ca8c8c 100644
--- a/prune-packed.c
+++ b/builtin-prune-packed.c
@@ -54,7 +54,7 @@ static void prune_packed_objects(void)
}
}
-int main(int argc, char **argv)
+int cmd_prune_packed(int argc, char **argv, const char *prefix)
{
int i;
diff --git a/builtin.h b/builtin.h
index f10d3b7..7ddfe28 100644
--- a/builtin.h
+++ b/builtin.h
@@ -20,6 +20,7 @@ extern int cmd_format_patch(int argc, co
extern int cmd_count_objects(int argc, const char **argv, const char *prefix);
extern int cmd_prune(int argc, const char **argv, const char *prefix);
+extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
extern int cmd_push(int argc, const char **argv, const char *prefix);
extern int cmd_grep(int argc, const char **argv, const char *prefix);
diff --git a/git.c b/git.c
index 110e82e..5b50762 100644
--- a/git.c
+++ b/git.c
@@ -263,6 +263,7 @@ static void handle_internal_command(int
{ "fmt-merge-msg", cmd_fmt_merge_msg, NEEDS_PREFIX },
{ "prune", cmd_prune, NEEDS_PREFIX },
{ "mv", cmd_mv, NEEDS_PREFIX },
+ { "prune-packed", cmd_prune_packed, NEEDS_PREFIX },
};
int i;
--
1.4.2.rc2.g767b2
--
Matthias Kestenholz
www.spinlock.ch
^ permalink raw reply related
* Re: [PATCH] gitweb.cgi: Customization
From: Jon Loeliger @ 2006-08-02 16:23 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Luben Tuikov, Git List, Martin Waitz, Matthias Lederhofer
In-Reply-To: <7v8xm8xbaa.fsf@assigned-by-dhcp.cox.net>
On Tue, 2006-08-01 at 18:54, Junio C Hamano wrote:
> In any case, I think tweaking gitweb.cgi from Makefile like
> Martin Waitz did is as easy and clean for people who want to
> customize; it should just be the matter of defining the
> necessary params in config.mak.
I disagree. I run multiple virtual web servers on one
physical machine. Several of them run different gitweb
instances, each with different configurations.
With this "params in config.mk" approach, I have to
run it multiple times, once for each web server I run.
I _really_ would prefer an "include from ." feature
where I can place the specific gitweb_config.pm parts
in the same directory where gitweb.{pl,cgi} is installed.
We really need to separate out these config values
from the gitweb.{pl,cgi} script itself. We _need_ to
be able to update the gitweb script independently,
and easily.
> I do not think there is much difference between any of the
> customization proposed so far (yours, Martin's and the one from
> Matthias Lederhofer) from functionality and ease-of-use point of
> view. They all try to make customization can be done in one
> place, and the difference is mostly of taste, so I'd just pick
> one from Martin.
Let's just make sure it is a separate config file, please.
I posted a patch to this end back on March 22 or 23 or so
as well.
Thanks,
jdl
^ permalink raw reply
* [PATCH/corrected] Make git-prune-packed a builtin
From: Matthias Kestenholz @ 2006-08-02 16:32 UTC (permalink / raw)
To: git; +Cc: junkio
In-Reply-To: <20060802161729.GE20971@spinlock.ch>
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
---
Please discard the other patch. This one also removes the second call to
setup_git_directory()
Btw. the NEEDS_PREFIX name in git.c confuses me. It should probably
be something like AUTO_SETUP_DIRECTORY ? It would be clearer what it
means.
Makefile | 6 +++---
prune-packed.c => builtin-prune-packed.c | 4 +---
builtin.h | 1 +
git.c | 1 +
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 2562a2c..e39c9da 100644
--- a/Makefile
+++ b/Makefile
@@ -196,7 +196,7 @@ PROGRAMS = \
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-peek-remote$X git-prune-packed$X git-receive-pack$X \
+ git-peek-remote$X git-receive-pack$X \
git-send-pack$X git-shell$X \
git-show-index$X git-ssh-fetch$X \
git-ssh-upload$X git-unpack-file$X \
@@ -216,7 +216,7 @@ BUILT_INS = git-log$X git-whatchanged$X
git-read-tree$X git-commit-tree$X git-write-tree$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-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X
# what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -273,7 +273,7 @@ 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-mv.o builtin-prune-packed.o
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
EXTLIBS = -lz
diff --git a/prune-packed.c b/builtin-prune-packed.c
similarity index 96%
rename from prune-packed.c
rename to builtin-prune-packed.c
index d24b097..d0ff336 100644
--- a/prune-packed.c
+++ b/builtin-prune-packed.c
@@ -54,12 +54,10 @@ static void prune_packed_objects(void)
}
}
-int main(int argc, char **argv)
+int cmd_prune_packed(int argc, char **argv, const char *prefix)
{
int i;
- setup_git_directory();
-
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
diff --git a/builtin.h b/builtin.h
index f10d3b7..7ddfe28 100644
--- a/builtin.h
+++ b/builtin.h
@@ -20,6 +20,7 @@ extern int cmd_format_patch(int argc, co
extern int cmd_count_objects(int argc, const char **argv, const char *prefix);
extern int cmd_prune(int argc, const char **argv, const char *prefix);
+extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
extern int cmd_push(int argc, const char **argv, const char *prefix);
extern int cmd_grep(int argc, const char **argv, const char *prefix);
diff --git a/git.c b/git.c
index 110e82e..5b50762 100644
--- a/git.c
+++ b/git.c
@@ -263,6 +263,7 @@ static void handle_internal_command(int
{ "fmt-merge-msg", cmd_fmt_merge_msg, NEEDS_PREFIX },
{ "prune", cmd_prune, NEEDS_PREFIX },
{ "mv", cmd_mv, NEEDS_PREFIX },
+ { "prune-packed", cmd_prune_packed, NEEDS_PREFIX },
};
int i;
--
1.4.2.rc2.ge3c5-dirty
^ permalink raw reply related
* [PATCH] Documentation: convert uses of git-link macro to gitlink
From: Jeff King @ 2006-08-02 16:32 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
There isn't and never was such a macro; all uses are typos.
Signed-off-by: Jeff King <peff@peff.net>
---
Documentation/config.txt | 6 +++---
Documentation/git-cvsimport.txt | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e669003..d89916b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -223,14 +223,14 @@ showbranch.default::
See gitlink:git-show-branch[1].
tar.umask::
- By default, git-link:git-tar-tree[1] sets file and directories modes
+ By default, gitlink:git-tar-tree[1] sets file and directories modes
to 0666 or 0777. While this is both useful and acceptable for projects
such as the Linux Kernel, it might be excessive for other projects.
With this variable, it becomes possible to tell
- git-link:git-tar-tree[1] to apply a specific umask to the modes above.
+ gitlink:git-tar-tree[1] to apply a specific umask to the modes above.
The special value "user" indicates that the user's current umask will
be used. This should be enough for most projects, as it will lead to
- the same permissions as git-link:git-checkout[1] would use. The default
+ the same permissions as gitlink:git-checkout[1] would use. The default
value remains 0, which means world read-write.
user.email::
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index b0c6d7c..d21d66b 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -116,7 +116,7 @@ file each time git-cvsimport is run.
+
It is not recommended to use this feature if you intend to
export changes back to CVS again later with
-git-link[1]::git-cvsexportcommit.
+gitlink:git-cvsexportcommit[1].
OUTPUT
------
--
1.4.2.rc2.g59706-dirty
^ permalink raw reply related
* [PATCH] git-annotate: remove extraneous debugging line
From: Jeff King @ 2006-08-02 16:34 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Signed-off-by: Jeff King <peff@peff.net>
---
git-annotate.perl | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/git-annotate.perl b/git-annotate.perl
index 6db2f48..505b5cc 100755
--- a/git-annotate.perl
+++ b/git-annotate.perl
@@ -317,7 +317,6 @@ sub _git_diff_parse {
$gotheader = 1;
- printf("Copying from %d to %d\n", $ri, $remstart);
foreach my $parent (@$parents) {
for (my $i = $ri; $i < $remstart; $i++) {
$plines{$parent}[$pi{$parent}++] = $slines->[$i];
--
1.4.2.rc2.g59706-dirty
^ permalink raw reply related
* Re: [PATCH] gitweb.cgi: Customization
From: Jeff King @ 2006-08-02 16:53 UTC (permalink / raw)
To: Jon Loeliger
Cc: Junio C Hamano, Luben Tuikov, Git List, Martin Waitz,
Matthias Lederhofer
In-Reply-To: <1154535801.19994.15.camel@cashmere.sps.mot.com>
On Wed, Aug 02, 2006 at 11:23:22AM -0500, Jon Loeliger wrote:
> With this "params in config.mk" approach, I have to
> run it multiple times, once for each web server I run.
>
> I _really_ would prefer an "include from ." feature
> where I can place the specific gitweb_config.pm parts
> in the same directory where gitweb.{pl,cgi} is installed.
Why don't we have sensible compile-time defaults that can be overridden
by a run-time config file like every other sane program? For those who
are opposed to the run-time config, they can simply not have a config
file.
See the (completely untested) patch below. Obviously the config file
name has to be set at build time. However, since it is interpolated by
perl, you can do clever things like:
/etc/gitweb/$ENV{MY_VIRTUAL_HOST}.pl
-Peff
---
Makefile | 2 ++
gitweb/gitweb.perl | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 2562a2c..170d082 100644
--- a/Makefile
+++ b/Makefile
@@ -127,6 +127,7 @@ GIT_PYTHON_DIR = $(prefix)/share/git-cor
# DESTDIR=
# default configuration for gitweb
+GITWEB_CONFIG = gitweb_config.perl
GITWEB_SITENAME =
GITWEB_PROJECTROOT = /pub/git
GITWEB_LIST =
@@ -629,6 +630,7 @@ gitweb/gitweb.cgi: gitweb/gitweb.perl
sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
-e 's|@@GIT_VERSION@@|$(GIT_VERSION)|g' \
-e 's|@@GIT_BINDIR@@|$(bindir)|g' \
+ -e 's|@@GITWEB_CONFIG@@|$(GITWEB_CONFIG)|g' \
-e 's|@@GITWEB_SITENAME@@|$(GITWEB_SITENAME)|g' \
-e 's|@@GITWEB_PROJECTROOT@@|$(GITWEB_PROJECTROOT)|g' \
-e 's|@@GITWEB_LIST@@|$(GITWEB_LIST)|g' \
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 1db1414..cc33d97 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -66,6 +66,9 @@ # file to use for guessing MIME types be
# (relative to the current git repository)
our $mimetypes_file = undef;
+our $GITWEB_CONFIG = "@@GITWEB_CONFIG@@";
+require $GITWEB_CONFIG if -e $GITWEB_CONFIG;
+
# input validation and dispatch
our $action = $cgi->param('a');
if (defined $action) {
--
1.4.2.rc2.g59706-dirty
^ permalink raw reply related
* Re: [PATCH] gitweb.cgi: Customization
From: Matthias Lederhofer @ 2006-08-02 17:13 UTC (permalink / raw)
To: Jeff King; +Cc: git
In-Reply-To: <20060802165333.GA22726@coredump.intra.peff.net>
Jeff King <peff@peff.net> wrote:
> On Wed, Aug 02, 2006 at 11:23:22AM -0500, Jon Loeliger wrote:
> Why don't we have sensible compile-time defaults that can be overridden
> by a run-time config file like every other sane program? For those who
> are opposed to the run-time config, they can simply not have a config
> file.
>
> See the (completely untested) patch below. Obviously the config file
> name has to be set at build time. However, since it is interpolated by
> perl, you can do clever things like:
> /etc/gitweb/$ENV{MY_VIRTUAL_HOST}.pl
I like this (it is quite similar to my suggestions :)).
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -66,6 +66,9 @@ # file to use for guessing MIME types be
> # (relative to the current git repository)
> our $mimetypes_file = undef;
>
> +our $GITWEB_CONFIG = "@@GITWEB_CONFIG@@";
> +require $GITWEB_CONFIG if -e $GITWEB_CONFIG;
> +
> # input validation and dispatch
> our $action = $cgi->param('a');
> if (defined $action) {
The only other thing to change is to move the mkdir($git_temp) and
qx($GIT --version) below this line.
^ permalink raw reply
* Re: kompare won't parse git diffs
From: Linus Torvalds @ 2006-08-02 17:19 UTC (permalink / raw)
To: Andy Parkins; +Cc: git
In-Reply-To: <200608021107.43485.andyparkins@gmail.com>
On Wed, 2 Aug 2006, Andy Parkins wrote:
>
> Kompare just shows blank for diffs redirected from git. [ snip ]
>
> As you can see, it's a simple addition of the line "blah". Kompare shows this
> diff as blank. Now if I modify the file so that the "---" and "+++" lines
> both have "<tab>(something)" added:
I'd definitely call this a pure kompare bug.
Not only is the git patch format perfectly standard and accepted by other
tools, it's much better designed than the brain-damaged syntax that GNU
patch uses (which adds a tab and a timestamp after the filenames). In
particular, with git patches it is easy to get filenames that have spaces
and tabs in them right.
Now, if the kompare people can show that every single other patch
generator adds the stupid tab + date format, I guess we could do it too,
but
(a) there is no valid date in general to use, so it's a fundamentally
broken notion and
(b) I'm pretty sure that the kompare people only ever actually tested
with GNU patch or other very modern patches, because when I did the
patch apply logic (and designed the extended git format), I looked
around at things like "diffstat" that have been around a long time,
to see what they accept, and the whole thing is an unholy mess wrt
filenames.
The git format really is the best patch format I've seen by _far_, partly
because it's designed to be totally unambiguous even in the presense of
file renames (and new/deleted files, and file modes), but partly because
it's also designed to be both extensible and detectable (ie the marker
"diff --git " is there, so that you can _know_ and _depend_ on the git
format, unlike, for example, the GNU patches that don't have a good fixed
format).
I'm hoping that people will some day just wake up and notice that the git
extended patches are really worth doing even for other projects. I was
going to send in patches to GNU patch to try to make it at least
understand them, but I got lazy.
Linus
^ permalink raw reply
* Re: [PATCH] gitweb.cgi: Customization
From: Jakub Narebski @ 2006-08-02 17:34 UTC (permalink / raw)
To: git
In-Reply-To: <20060802165333.GA22726@coredump.intra.peff.net>
Jeff King wrote:
> On Wed, Aug 02, 2006 at 11:23:22AM -0500, Jon Loeliger wrote:
>
>> With this "params in config.mk" approach, I have to
>> run it multiple times, once for each web server I run.
>>
>> I _really_ would prefer an "include from ." feature
>> where I can place the specific gitweb_config.pm parts
>> in the same directory where gitweb.{pl,cgi} is installed.
>
> Why don't we have sensible compile-time defaults that can be overridden
> by a run-time config file like every other sane program? For those who
> are opposed to the run-time config, they can simply not have a config
> file.
>
> See the (completely untested) patch below. Obviously the config file
> name has to be set at build time. However, since it is interpolated by
> perl, you can do clever things like:
> /etc/gitweb/$ENV{MY_VIRTUAL_HOST}.pl
Besides, we can use _relative_ paths.
I like this proposal the best.
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
^ permalink raw reply
* Re: [PATCH] gitweb.cgi: Customization
From: Junio C Hamano @ 2006-08-02 17:43 UTC (permalink / raw)
To: Jeff King; +Cc: git
In-Reply-To: <20060802165333.GA22726@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
> Why don't we have sensible compile-time defaults that can be overridden
> by a run-time config file like every other sane program?
I like that approach.
^ 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