* [PATCH 1/2] Move SCM interoperability tools into interop/
From: Ryan Anderson @ 2006-07-10 4:54 UTC (permalink / raw)
To: git; +Cc: Ryan Anderson
In-Reply-To: <1152507249880-git-send-email-ryan@michonline.com>
Signed-off-by: Ryan Anderson <ryan@michonline.com>
---
Makefile | 12 +++--
interop/Makefile | 45 ++++++++++++++++++++
git-archimport.perl => interop/git-archimport.perl | 0
.../git-cvsexportcommit.perl | 0
git-cvsimport.perl => interop/git-cvsimport.perl | 0
git-cvsserver.perl => interop/git-cvsserver.perl | 0
git-p4import.py => interop/git-p4import.py | 0
git-quiltimport.sh => interop/git-quiltimport.sh | 0
git-send-email.perl => interop/git-send-email.perl | 0
git-svnimport.perl => interop/git-svnimport.perl | 0
10 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 13f7c89..d6e2b0f 100644
--- a/Makefile
+++ b/Makefile
@@ -127,14 +127,13 @@ SCRIPT_SH = \
git-applymbox.sh git-applypatch.sh git-am.sh \
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
git-merge-resolve.sh git-merge-ours.sh \
- git-lost-found.sh git-quiltimport.sh
+ git-lost-found.sh
SCRIPT_PERL = \
- git-archimport.perl git-cvsimport.perl git-relink.perl \
+ git-relink.perl \
git-shortlog.perl git-rerere.perl \
- git-annotate.perl git-cvsserver.perl \
- git-svnimport.perl git-mv.perl git-cvsexportcommit.perl \
- git-send-email.perl
+ git-annotate.perl \
+ git-mv.perl
SCRIPT_PYTHON = \
git-merge-recursive.py
@@ -176,6 +175,9 @@ 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
+
+include interop/Makefile
+
# what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
diff --git a/interop/Makefile b/interop/Makefile
new file mode 100644
index 0000000..b1a11d1
--- /dev/null
+++ b/interop/Makefile
@@ -0,0 +1,45 @@
+
+INTEROP_PERL_BASE = \
+ git-archimport.perl \
+ git-cvsimport.perl \
+ git-cvsexportcommit.perl \
+ git-cvsserver.perl \
+ git-svnimport.perl \
+ git-send-email.perl
+
+INTEROP_PYTHON_BASE = \
+ git-p4import.py
+
+INTEROP_SH_BASE = \
+ git-quiltimport.sh
+
+SCRIPTS+=$(patsubst %.perl,%,$(INTEROP_PERL_BASE))
+SCRIPTS+=$(patsubst %.py,%,$(INTEROP_PYTHON_BASE))
+SCRIPTS+=$(patsubst %.sh,%,$(INTEROP_SH_BASE))
+
+$(patsubst %.sh,%,$(INTEROP_SH_BASE)) : % : interop/%.sh
+ rm -f $@ $@+
+ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
+ -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
+ -e 's/@@NO_PYTHON@@/$(NO_PYTHON)/g' \
+ $^ >$@+
+ chmod +x $@+
+ mv $@+ $@
+
+$(patsubst %.perl,%,$(INTEROP_PERL_BASE)) : % : interop/%.perl
+ rm -f $@ $@+
+ sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
+ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
+ $^ >$@+
+ chmod +x $@+
+ mv $@+ $@
+
+$(patsubst %.py,%,$(INTEROP_PYTHON_BASE)) : % : interop/%.py GIT-CFLAGS
+ rm -f $@ $@+
+ sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
+ -e 's|@@GIT_PYTHON_PATH@@|$(GIT_PYTHON_DIR_SQ)|g' \
+ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
+ $^ >$@+
+ chmod +x $@+
+ mv $@+ $@
diff --git a/git-archimport.perl b/interop/git-archimport.perl
similarity index 100%
rename from git-archimport.perl
rename to interop/git-archimport.perl
diff --git a/git-cvsexportcommit.perl b/interop/git-cvsexportcommit.perl
similarity index 100%
rename from git-cvsexportcommit.perl
rename to interop/git-cvsexportcommit.perl
diff --git a/git-cvsimport.perl b/interop/git-cvsimport.perl
similarity index 100%
rename from git-cvsimport.perl
rename to interop/git-cvsimport.perl
diff --git a/git-cvsserver.perl b/interop/git-cvsserver.perl
similarity index 100%
rename from git-cvsserver.perl
rename to interop/git-cvsserver.perl
diff --git a/git-p4import.py b/interop/git-p4import.py
similarity index 100%
rename from git-p4import.py
rename to interop/git-p4import.py
diff --git a/git-quiltimport.sh b/interop/git-quiltimport.sh
similarity index 100%
rename from git-quiltimport.sh
rename to interop/git-quiltimport.sh
diff --git a/git-send-email.perl b/interop/git-send-email.perl
similarity index 100%
rename from git-send-email.perl
rename to interop/git-send-email.perl
diff --git a/git-svnimport.perl b/interop/git-svnimport.perl
similarity index 100%
rename from git-svnimport.perl
rename to interop/git-svnimport.perl
--
1.4.1.gc473b-dirty
^ permalink raw reply related
* [PATCH 2/2] Move all builtin .c files into builtin/
From: Ryan Anderson @ 2006-07-10 4:54 UTC (permalink / raw)
To: git; +Cc: Ryan Anderson
In-Reply-To: <11525072492717-git-send-email-ryan@michonline.com>
Signed-off-by: Ryan Anderson <ryan@michonline.com>
---
Makefile | 15 ++-------------
builtin/Makefile | 13 +++++++++++++
builtin-add.c => builtin/builtin-add.c | 0
builtin-apply.c => builtin/builtin-apply.c | 0
builtin-cat-file.c => builtin/builtin-cat-file.c | 0
.../builtin-check-ref-format.c | 0
.../builtin-commit-tree.c | 0
builtin-count.c => builtin/builtin-count.c | 0
.../builtin-diff-files.c | 0
.../builtin-diff-index.c | 0
.../builtin-diff-stages.c | 0
builtin-diff-tree.c => builtin/builtin-diff-tree.c | 0
builtin-diff.c => builtin/builtin-diff.c | 0
.../builtin-fmt-merge-msg.c | 0
builtin-grep.c => builtin/builtin-grep.c | 0
builtin-help.c => builtin/builtin-help.c | 0
builtin-init-db.c => builtin/builtin-init-db.c | 0
builtin-log.c => builtin/builtin-log.c | 0
builtin-ls-files.c => builtin/builtin-ls-files.c | 0
builtin-ls-tree.c => builtin/builtin-ls-tree.c | 0
builtin-mailinfo.c => builtin/builtin-mailinfo.c | 0
builtin-mailsplit.c => builtin/builtin-mailsplit.c | 0
builtin-push.c => builtin/builtin-push.c | 0
builtin-read-tree.c => builtin/builtin-read-tree.c | 0
builtin-rev-list.c => builtin/builtin-rev-list.c | 0
builtin-rev-parse.c => builtin/builtin-rev-parse.c | 0
builtin-rm.c => builtin/builtin-rm.c | 0
.../builtin-show-branch.c | 0
.../builtin-stripspace.c | 0
builtin-tar-tree.c => builtin/builtin-tar-tree.c | 0
.../builtin-update-index.c | 0
.../builtin-update-ref.c | 0
.../builtin-upload-tar.c | 0
.../builtin-write-tree.c | 0
builtin.h => builtin/builtin.h | 0
git.c | 2 +-
36 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index d6e2b0f..92368b9 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,7 @@ uname_P := $(shell sh -c 'uname -p 2>/de
# CFLAGS and LDFLAGS are for the users to override from the command line.
-CFLAGS = -g -O2 -Wall
+CFLAGS = -g -O2 -Wall -I.
LDFLAGS =
ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
@@ -177,6 +177,7 @@ BUILT_INS = git-log$X git-whatchanged$X
include interop/Makefile
+include builtin/Makefile
# what 'all' will build and 'install' will install, in gitexecdir
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -222,18 +223,6 @@ LIB_OBJS = \
fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
alloc.o $(DIFF_OBJS)
-BUILTIN_OBJS = \
- builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
- builtin-grep.o builtin-add.o builtin-rev-list.o builtin-check-ref-format.o \
- builtin-rm.o builtin-init-db.o builtin-rev-parse.o \
- builtin-tar-tree.o builtin-upload-tar.o builtin-update-index.o \
- builtin-ls-files.o builtin-ls-tree.o builtin-write-tree.o \
- builtin-read-tree.o builtin-commit-tree.o builtin-mailinfo.o \
- builtin-apply.o builtin-show-branch.o builtin-diff-files.o \
- 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
-
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
LIBS = $(GITLIBS) -lz
diff --git a/builtin/Makefile b/builtin/Makefile
new file mode 100644
index 0000000..3588fce
--- /dev/null
+++ b/builtin/Makefile
@@ -0,0 +1,13 @@
+BUILTIN_OBJ_BASE = \
+ builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
+ builtin-grep.o builtin-add.o builtin-rev-list.o builtin-check-ref-format.o \
+ builtin-rm.o builtin-init-db.o builtin-rev-parse.o \
+ builtin-tar-tree.o builtin-upload-tar.o builtin-update-index.o \
+ builtin-ls-files.o builtin-ls-tree.o builtin-write-tree.o \
+ builtin-read-tree.o builtin-commit-tree.o builtin-mailinfo.o \
+ builtin-apply.o builtin-show-branch.o builtin-diff-files.o \
+ 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_OBJS = $(addprefix builtin/,$(BUILTIN_OBJ_BASE))
\ No newline at end of file
diff --git a/builtin-add.c b/builtin/builtin-add.c
similarity index 100%
rename from builtin-add.c
rename to builtin/builtin-add.c
diff --git a/builtin-apply.c b/builtin/builtin-apply.c
similarity index 100%
rename from builtin-apply.c
rename to builtin/builtin-apply.c
diff --git a/builtin-cat-file.c b/builtin/builtin-cat-file.c
similarity index 100%
rename from builtin-cat-file.c
rename to builtin/builtin-cat-file.c
diff --git a/builtin-check-ref-format.c b/builtin/builtin-check-ref-format.c
similarity index 100%
rename from builtin-check-ref-format.c
rename to builtin/builtin-check-ref-format.c
diff --git a/builtin-commit-tree.c b/builtin/builtin-commit-tree.c
similarity index 100%
rename from builtin-commit-tree.c
rename to builtin/builtin-commit-tree.c
diff --git a/builtin-count.c b/builtin/builtin-count.c
similarity index 100%
rename from builtin-count.c
rename to builtin/builtin-count.c
diff --git a/builtin-diff-files.c b/builtin/builtin-diff-files.c
similarity index 100%
rename from builtin-diff-files.c
rename to builtin/builtin-diff-files.c
diff --git a/builtin-diff-index.c b/builtin/builtin-diff-index.c
similarity index 100%
rename from builtin-diff-index.c
rename to builtin/builtin-diff-index.c
diff --git a/builtin-diff-stages.c b/builtin/builtin-diff-stages.c
similarity index 100%
rename from builtin-diff-stages.c
rename to builtin/builtin-diff-stages.c
diff --git a/builtin-diff-tree.c b/builtin/builtin-diff-tree.c
similarity index 100%
rename from builtin-diff-tree.c
rename to builtin/builtin-diff-tree.c
diff --git a/builtin-diff.c b/builtin/builtin-diff.c
similarity index 100%
rename from builtin-diff.c
rename to builtin/builtin-diff.c
diff --git a/builtin-fmt-merge-msg.c b/builtin/builtin-fmt-merge-msg.c
similarity index 100%
rename from builtin-fmt-merge-msg.c
rename to builtin/builtin-fmt-merge-msg.c
diff --git a/builtin-grep.c b/builtin/builtin-grep.c
similarity index 100%
rename from builtin-grep.c
rename to builtin/builtin-grep.c
diff --git a/builtin-help.c b/builtin/builtin-help.c
similarity index 100%
rename from builtin-help.c
rename to builtin/builtin-help.c
diff --git a/builtin-init-db.c b/builtin/builtin-init-db.c
similarity index 100%
rename from builtin-init-db.c
rename to builtin/builtin-init-db.c
diff --git a/builtin-log.c b/builtin/builtin-log.c
similarity index 100%
rename from builtin-log.c
rename to builtin/builtin-log.c
diff --git a/builtin-ls-files.c b/builtin/builtin-ls-files.c
similarity index 100%
rename from builtin-ls-files.c
rename to builtin/builtin-ls-files.c
diff --git a/builtin-ls-tree.c b/builtin/builtin-ls-tree.c
similarity index 100%
rename from builtin-ls-tree.c
rename to builtin/builtin-ls-tree.c
diff --git a/builtin-mailinfo.c b/builtin/builtin-mailinfo.c
similarity index 100%
rename from builtin-mailinfo.c
rename to builtin/builtin-mailinfo.c
diff --git a/builtin-mailsplit.c b/builtin/builtin-mailsplit.c
similarity index 100%
rename from builtin-mailsplit.c
rename to builtin/builtin-mailsplit.c
diff --git a/builtin-push.c b/builtin/builtin-push.c
similarity index 100%
rename from builtin-push.c
rename to builtin/builtin-push.c
diff --git a/builtin-read-tree.c b/builtin/builtin-read-tree.c
similarity index 100%
rename from builtin-read-tree.c
rename to builtin/builtin-read-tree.c
diff --git a/builtin-rev-list.c b/builtin/builtin-rev-list.c
similarity index 100%
rename from builtin-rev-list.c
rename to builtin/builtin-rev-list.c
diff --git a/builtin-rev-parse.c b/builtin/builtin-rev-parse.c
similarity index 100%
rename from builtin-rev-parse.c
rename to builtin/builtin-rev-parse.c
diff --git a/builtin-rm.c b/builtin/builtin-rm.c
similarity index 100%
rename from builtin-rm.c
rename to builtin/builtin-rm.c
diff --git a/builtin-show-branch.c b/builtin/builtin-show-branch.c
similarity index 100%
rename from builtin-show-branch.c
rename to builtin/builtin-show-branch.c
diff --git a/builtin-stripspace.c b/builtin/builtin-stripspace.c
similarity index 100%
rename from builtin-stripspace.c
rename to builtin/builtin-stripspace.c
diff --git a/builtin-tar-tree.c b/builtin/builtin-tar-tree.c
similarity index 100%
rename from builtin-tar-tree.c
rename to builtin/builtin-tar-tree.c
diff --git a/builtin-update-index.c b/builtin/builtin-update-index.c
similarity index 100%
rename from builtin-update-index.c
rename to builtin/builtin-update-index.c
diff --git a/builtin-update-ref.c b/builtin/builtin-update-ref.c
similarity index 100%
rename from builtin-update-ref.c
rename to builtin/builtin-update-ref.c
diff --git a/builtin-upload-tar.c b/builtin/builtin-upload-tar.c
similarity index 100%
rename from builtin-upload-tar.c
rename to builtin/builtin-upload-tar.c
diff --git a/builtin-write-tree.c b/builtin/builtin-write-tree.c
similarity index 100%
rename from builtin-write-tree.c
rename to builtin/builtin-write-tree.c
diff --git a/builtin.h b/builtin/builtin.h
similarity index 100%
rename from builtin.h
rename to builtin/builtin.h
diff --git a/git.c b/git.c
index 49062ca..81f6675 100644
--- a/git.c
+++ b/git.c
@@ -12,7 +12,7 @@ #include "git-compat-util.h"
#include "exec_cmd.h"
#include "cache.h"
-#include "builtin.h"
+#include "builtin/builtin.h"
static void prepend_to_path(const char *dir, int len)
{
--
1.4.1.gc473b-dirty
^ permalink raw reply related
* Re: [PATCH] Remove more gcc extension usage.
From: Shawn Pearce @ 2006-07-10 5:22 UTC (permalink / raw)
To: Jan-Benedict Glaw; +Cc: Junio C Hamano, git
In-Reply-To: <20060709073155.GP22573@lug-owl.de>
> On Sat, 2006-07-08 15:03:27 -0400, Shawn Pearce <spearce@spearce.org> wrote:
> > Monday I'll look to see if there's an option that can be given to
> > the Solaris compiler to make it accept these constructs. Maybe a
> > simple CFLAGS change in my config.mak would resolve what this patch
> > was trying to do.
So Monday turned out to be today. The compiler version:
$ cc -V
cc: Forte Developer 7 C 5.4 2002/03/09
usage: cc [ options] files. Use 'cc -flags' for details
and from `man cc`:
-xc99 enables C99 features:
The following is a list of the implemented features of
the ISO/IEC 9899:1999, Programming Language - C stan-
dard. See the C User's Guide for a detailed explanation
of the compiler's support for these featuers:
o Idempotent Qualifiers
o _Pragma
o Mixed Declarations and Code
o static and Other Type Qualifiers Allowed in Array
Declarators
o Flexible Array Members
o Declarations Using Implicit int
o Disallowed Implicit int and Implicit Function
Declarations
o Declaration in for-Loop Statement
o C99 Keywords
o __func__ Support
o Macros With A Variable Number of Arguments
o Variable Length Arrays
o inline Specifier For Static Functions
o Commenting Code with //
So neither of the constructs my patch removes are supported in this
(old) compiler, although a newer one might accept them with -xc99.
Yes, I tried building a pristine git-1.4.1 with -xc99. It barfed,
as one would expect given the description above.
Since we don't have a newer version of cc available (not sure why)
I'm stuck with needing to make the code changes in my patch just
to get GIT to compile.
--
Shawn.
^ permalink raw reply
* Re: [Patch] Using 'perl' in *.sh
From: Michal Rokos @ 2006-07-10 5:41 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7v4pxqfri7.fsf@assigned-by-dhcp.cox.net>
Hi,
On Sunday 09 July 2006 22:33, Junio C Hamano wrote:
> Invocation of perl _in_ scripts can be controlled by user's
> PATH, but #! cannot be. As Merlyn says 'env' is a nice hack,
> but we configure the scripts we install to have #! pointing at
> the right interpreter as a more cleaner (than using 'env', that
> is) workaround anyway, so #! pointing at PERL_PATH and scripts
> relying on user's $PATH would be the right thing to do.
I don't se the point. If you ask me, I'd say it should be either:
- controlled fully via env: which means 'perl' in scripts and /usr/bin/env in
*.perl; or
- set during install: which means 'full perl path' in scripts as well as in
*.perl
Any mixture of above makes no sence to me. I'm afraid that any consensus will
be hard to reach, but I don't see any other way round. (Well maybe some git
specific exec wrapper to come over some broken 'env' commands)
M.
--
Michal Rokos
NextSoft s.r.o.
Vyskočilova 1/1410
140 21 Praha 4
phone: +420 267 224 311
fax: +420 267 224 307
mobile: +420 736 646 591
e-mail: michal.rokos@nextsoft.cz
^ permalink raw reply
* [PATCH] Fix more typos, primarily in the code
From: Pavel Roskin @ 2006-07-10 5:50 UTC (permalink / raw)
To: git
From: Pavel Roskin <proski@gnu.org>
The only visible change is that git-blame doesn't understand
"--compability" anymore, but it does accept "--compatibility" instead,
which is already documented.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
Documentation/git-name-rev.txt | 2 +-
blame.c | 20 ++++++++++----------
builtin-apply.c | 4 ++--
builtin-diff.c | 2 +-
builtin-grep.c | 2 +-
builtin-help.c | 2 +-
builtin-push.c | 2 +-
builtin-rm.c | 2 +-
combine-diff.c | 2 +-
compat/subprocess.py | 6 +++---
contrib/colordiff/colordiff.perl | 2 +-
contrib/git-svn/git-svn.perl | 2 +-
diff-delta.c | 6 +++---
fetch-clone.c | 4 ++--
git-am.sh | 2 +-
git-applypatch.sh | 2 +-
git-archimport.perl | 8 ++++----
git-commit.sh | 2 +-
git-cvsexportcommit.perl | 4 ++--
git-instaweb.sh | 2 +-
git-merge-one-file.sh | 2 +-
git-merge-recursive.py | 2 +-
git-push.sh | 2 +-
git-quiltimport.sh | 2 +-
git-send-email.perl | 2 +-
name-rev.c | 2 +-
pack-objects.c | 4 ++--
ppc/sha1ppc.S | 2 +-
sha1_file.c | 2 +-
t/t5700-clone-reference.sh | 2 +-
t/t5710-info-alternate.sh | 2 +-
t/t6002-rev-list-bisect.sh | 2 +-
t/t6021-merge-criss-cross.sh | 2 +-
xdiff/xdiffi.c | 6 +++---
34 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt
index 39a1434..43f8c25 100644
--- a/Documentation/git-name-rev.txt
+++ b/Documentation/git-name-rev.txt
@@ -26,7 +26,7 @@ OPTIONS
List all commits reachable from all refs
--stdin::
- Read from stdin, append "(<rev_name>)" to all sha1's of name'able
+ Read from stdin, append "(<rev_name>)" to all sha1's of nameable
commits, and pass to stdout
EXAMPLE
diff --git a/blame.c b/blame.c
index c86e2fd..0a06026 100644
--- a/blame.c
+++ b/blame.c
@@ -21,11 +21,11 @@ #include "xdiff-interface.h"
#define DEBUG 0
static const char blame_usage[] = "[-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\n"
- " -c, --compability Use the same output mode as git-annotate (Default: off)\n"
- " -l, --long Show long commit SHA1 (Default: off)\n"
- " -t, --time Show raw timestamp (Default: off)\n"
- " -S, --revs-file Use revisions from revs-file instead of calling git-rev-list\n"
- " -h, --help This message";
+ " -c, --compatibility Use the same output mode as git-annotate (Default: off)\n"
+ " -l, --long Show long commit SHA1 (Default: off)\n"
+ " -t, --time Show raw timestamp (Default: off)\n"
+ " -S, --revs-file Use revisions from revs-file instead of calling git-rev-list\n"
+ " -h, --help This message";
static struct commit **blame_lines;
static int num_blame_lines;
@@ -747,7 +747,7 @@ int main(int argc, const char **argv)
const char *filename = NULL, *commit = NULL;
char filename_buf[256];
int sha1_len = 8;
- int compability = 0;
+ int compatibility = 0;
int show_raw_time = 0;
int options = 1;
struct commit* start_commit;
@@ -774,8 +774,8 @@ int main(int argc, const char **argv)
sha1_len = 40;
continue;
} else if(!strcmp(argv[i], "-c") ||
- !strcmp(argv[i], "--compability")) {
- compability = 1;
+ !strcmp(argv[i], "--compatibility")) {
+ compatibility = 1;
continue;
} else if(!strcmp(argv[i], "-t") ||
!strcmp(argv[i], "--time")) {
@@ -784,7 +784,7 @@ int main(int argc, const char **argv)
} else if(!strcmp(argv[i], "-S")) {
if (i + 1 < argc &&
!read_ancestry(argv[i + 1], &sha1_p)) {
- compability = 1;
+ compatibility = 1;
i++;
continue;
}
@@ -884,7 +884,7 @@ int main(int argc, const char **argv)
u = c->util;
get_commit_info(c, &ci);
fwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout);
- if(compability) {
+ if(compatibility) {
printf("\t(%10s\t%10s\t%d)", ci.author,
format_time(ci.author_time, ci.author_tz,
show_raw_time),
diff --git a/builtin-apply.c b/builtin-apply.c
index c3af489..1e5b846 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -765,7 +765,7 @@ static int find_header(char *line, unsig
continue;
/*
- * Make sure we don't find any unconnected patch fragmants.
+ * Make sure we don't find any unconnected patch fragments.
* That's a sign that we didn't find a header, and that a
* patch has become corrupted/broken up.
*/
@@ -990,7 +990,7 @@ static int parse_binary(char *buffer, un
* so one line can fit up to 13 groups that would decode
* to 52 bytes max. The length byte 'A'-'Z' corresponds
* to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
- * The end of binary is signalled with an empty line.
+ * The end of binary is signaled with an empty line.
*/
int llen, used;
struct fragment *fragment;
diff --git a/builtin-diff.c b/builtin-diff.c
index d520c7c..527952f 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -176,7 +176,7 @@ static int builtin_diff_tree(struct rev_
usage(builtin_diff_usage);
/* We saw two trees, ent[0] and ent[1].
- * if ent[1] is unintesting, they are swapped
+ * if ent[1] is uninteresting, they are swapped
*/
if (ent[1].item->flags & UNINTERESTING)
swap = 1;
diff --git a/builtin-grep.c b/builtin-grep.c
index 6973c66..0399393 100644
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -686,7 +686,7 @@ int cmd_grep(int argc, const char **argv
* pattern, but then what follows it must be zero or more
* valid refs up to the -- (if exists), and then existing
* paths. If there is an explicit pattern, then the first
- * unrecocnized non option is the beginning of the refs list
+ * unrecognized non option is the beginning of the refs list
* that continues up to the -- (if exists), and then paths.
*/
diff --git a/builtin-help.c b/builtin-help.c
index 7470faa..335fe5f 100644
--- a/builtin-help.c
+++ b/builtin-help.c
@@ -12,7 +12,7 @@ #include "common-cmds.h"
static const char git_usage[] =
"Usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [--help] COMMAND [ ARGS ]";
-/* most gui terms set COLUMNS (although some don't export it) */
+/* most GUI terminals set COLUMNS (although some don't export it) */
static int term_columns(void)
{
char *col_string = getenv("COLUMNS");
diff --git a/builtin-push.c b/builtin-push.c
index 66b9407..a8fac88 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -104,7 +104,7 @@ static int get_remotes_uri(const char *r
if (n < MAX_URI)
uri[n++] = strdup(s);
else
- error("more than %d URL's specified, ignoreing the rest", MAX_URI);
+ error("more than %d URL's specified, ignoring the rest", MAX_URI);
}
else if (is_refspec && !has_explicit_refspec)
add_refspec(strdup(s));
diff --git a/builtin-rm.c b/builtin-rm.c
index 875d825..5deb811 100644
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -129,7 +129,7 @@ int cmd_rm(int argc, const char **argv,
* workspace. If we fail to remove the first one, we
* abort the "git rm" (but once we've successfully removed
* any file at all, we'll go ahead and commit to it all:
- * by then we've already committed ourself and can't fail
+ * by then we've already committed ourselves and can't fail
* in the middle)
*/
if (force) {
diff --git a/combine-diff.c b/combine-diff.c
index caffb92..1bc1484 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -320,7 +320,7 @@ static int give_context(struct sline *sl
unsigned long i;
/* Two groups of interesting lines may have a short gap of
- * unintersting lines. Connect such groups to give them a
+ * uninteresting lines. Connect such groups to give them a
* bit of context.
*
* We first start from what the interesting() function says,
diff --git a/compat/subprocess.py b/compat/subprocess.py
index bbd26c7..6474eab 100644
--- a/compat/subprocess.py
+++ b/compat/subprocess.py
@@ -568,7 +568,7 @@ class Popen(object):
# Windows methods
#
def _get_handles(self, stdin, stdout, stderr):
- """Construct and return tupel with IO objects:
+ """Construct and return tuple with IO objects:
p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
"""
if stdin == None and stdout == None and stderr == None:
@@ -635,7 +635,7 @@ class Popen(object):
def _find_w9xpopen(self):
- """Find and return absolut path to w9xpopen.exe"""
+ """Find and return absolute path to w9xpopen.exe"""
w9xpopen = os.path.join(os.path.dirname(GetModuleFileName(0)),
"w9xpopen.exe")
if not os.path.exists(w9xpopen):
@@ -812,7 +812,7 @@ class Popen(object):
# POSIX methods
#
def _get_handles(self, stdin, stdout, stderr):
- """Construct and return tupel with IO objects:
+ """Construct and return tuple with IO objects:
p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
"""
p2cread, p2cwrite = None, None
diff --git a/contrib/colordiff/colordiff.perl b/contrib/colordiff/colordiff.perl
index 5789cfb..9566a76 100755
--- a/contrib/colordiff/colordiff.perl
+++ b/contrib/colordiff/colordiff.perl
@@ -110,7 +110,7 @@ foreach $config_file (@config_files) {
}
}
-# colordiff specfic options here. Need to pre-declare if using variables
+# colordiff specific options here. Need to pre-declare if using variables
GetOptions(
"no-banner" => sub { $show_banner = 0 },
"plain-text=s" => \&set_color,
diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index 8bc4188..754806a 100755
--- a/contrib/git-svn/git-svn.perl
+++ b/contrib/git-svn/git-svn.perl
@@ -2429,7 +2429,7 @@ sub extract_metadata {
\s([a-f\d\-]+)$/x);
if (!$rev || !$uuid || !$url) {
# some of the original repositories I made had
- # indentifiers like this:
+ # identifiers like this:
($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
}
return ($url, $rev, $uuid);
diff --git a/diff-delta.c b/diff-delta.c
index 8b9172a..7da9205 100644
--- a/diff-delta.c
+++ b/diff-delta.c
@@ -148,7 +148,7 @@ struct delta_index * create_delta_index(
return NULL;
/* Determine index hash size. Note that indexing skips the
- first byte to allow for optimizing the rabin polynomial
+ first byte to allow for optimizing the Rabin's polynomial
initialization in create_delta(). */
entries = (bufsize - 1) / RABIN_WINDOW;
hsize = entries / 4;
@@ -205,7 +205,7 @@ struct delta_index * create_delta_index(
/*
* Determine a limit on the number of entries in the same hash
- * bucket. This guard us against patological data sets causing
+ * bucket. This guards us against pathological data sets causing
* really bad hash distribution with most entries in the same hash
* bucket that would bring us to O(m*n) computing costs (m and n
* corresponding to reference and target buffer sizes).
@@ -240,7 +240,7 @@ void free_delta_index(struct delta_index
/*
* The maximum size for any opcode sequence, including the initial header
- * plus rabin window plus biggest copy.
+ * plus Rabin window plus biggest copy.
*/
#define MAX_OP_SIZE (5 + 5 + 1 + RABIN_WINDOW + 7)
diff --git a/fetch-clone.c b/fetch-clone.c
index c16b0c4..81d1371 100644
--- a/fetch-clone.c
+++ b/fetch-clone.c
@@ -198,8 +198,8 @@ #define NR_AVERAGE (4)
/*
* A "binary msec" is a power-of-two-msec, aka 1/1024th of a second.
- * Keeing the time in that format means that "bytes / msecs" means
- * is the same as kB/s (modulo rounding).
+ * Keeping the time in that format means that "bytes / msecs" means
+ * the same as kB/s (modulo rounding).
*
* 1000512 is a magic number (usecs in a second, rounded up by half
* of 1024, to make "rounding" come out right ;)
diff --git a/git-am.sh b/git-am.sh
index 679045a..db9a20a 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -77,7 +77,7 @@ fall_back_3way () {
# This is not so wrong. Depending on which base we picked,
# orig_tree may be wildly different from ours, but his_tree
# has the same set of wildly different changes in parts the
- # patch did not touch, so resolve ends up cancelling them,
+ # patch did not touch, so resolve ends up canceling them,
# saying that we reverted all those changes.
git-merge-resolve $orig_tree -- HEAD $his_tree || {
diff --git a/git-applypatch.sh b/git-applypatch.sh
index e4b0947..8df2aee 100755
--- a/git-applypatch.sh
+++ b/git-applypatch.sh
@@ -182,7 +182,7 @@ git-apply --index "$PATCHFILE" || {
# This is not so wrong. Depending on which base we picked,
# orig_tree may be wildly different from ours, but his_tree
# has the same set of wildly different changes in parts the
- # patch did not touch, so resolve ends up cancelling them,
+ # patch did not touch, so resolve ends up canceling them,
# saying that we reverted all those changes.
if git-merge-resolve $orig_tree -- HEAD $his_tree
diff --git a/git-archimport.perl b/git-archimport.perl
index 740bc1f..ada60ec 100755
--- a/git-archimport.perl
+++ b/git-archimport.perl
@@ -14,7 +14,7 @@ #
Imports a project from one or more Arch repositories. It will follow branches
and repositories within the namespaces defined by the <archive/branch>
-parameters suppplied. If it cannot find the remote branch a merge comes from
+parameters supplied. If it cannot find the remote branch a merge comes from
it will just import it as a regular commit. If it can find it, it will mark it
as a merge whenever possible.
@@ -88,7 +88,7 @@ usage if $opt_h;
# $arch_branches:
# values associated with keys:
# =1 - Arch version / git 'branch' detected via abrowse on a limit
-# >1 - Arch version / git 'branch' of an auxilliary branch we've merged
+# >1 - Arch version / git 'branch' of an auxiliary branch we've merged
my %arch_branches = map { $_ => 1 } @ARGV;
$ENV{'TMPDIR'} = $opt_t if $opt_t; # $ENV{TMPDIR} will affect tempdir() calls:
@@ -667,7 +667,7 @@ sub apply_cset {
if (`find $tmp/changeset/patches -type f -name '*.patch'`) {
# this can be sped up considerably by doing
# (find | xargs cat) | patch
- # but that cna get mucked up by patches
+ # but that can get mucked up by patches
# with missing trailing newlines or the standard
# 'missing newline' flag in the patch - possibly
# produced with an old/buggy diff.
@@ -1026,7 +1026,7 @@ sub commitid2pset {
}
-# an alterative to `command` that allows input to be passed as an array
+# an alternative to `command` that allows input to be passed as an array
# to work around shell problems with weird characters in arguments
sub safe_pipe_capture {
my @output;
diff --git a/git-commit.sh b/git-commit.sh
index 08d786d..351d13c 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -599,7 +599,7 @@ then
GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.*\(<.*\)'` &&
test '' != "$GIT_AUTHOR_NAME" &&
test '' != "$GIT_AUTHOR_EMAIL" ||
- die "malformatted --author parameter"
+ die "malformed --author parameter"
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
elif test '' != "$use_commit"
then
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index 5dcb2f9..5d13a54 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -179,7 +179,7 @@ my @bfiles = grep(m/^Binary/, safe_pipe_
@bfiles = map { chomp } @bfiles;
foreach my $f (@bfiles) {
# check that the file in cvs matches the "old" file
- # extract the file to $tmpdir and comparre with cmp
+ # extract the file to $tmpdir and compare with cmp
my $tree = safe_pipe_capture('git-rev-parse', "$parent^{tree}");
chomp $tree;
my $blob = `git-ls-tree $tree "$f" | cut -f 1 | cut -d ' ' -f 3`;
@@ -273,7 +273,7 @@ sub cleanupcvs {
}
}
-# An alterative to `command` that allows input to be passed as an array
+# An alternative to `command` that allows input to be passed as an array
# to work around shell problems with weird characters in arguments
# if the exec returns non-zero we die
sub safe_pipe_capture {
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 69aef3c..63b18b9 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -25,7 +25,7 @@ conf=$GIT_DIR/gitweb/httpd.conf
# Defaults:
-# if installed, it doens't need further configuration (module_path)
+# if installed, it doesn't need further configuration (module_path)
test -z "$httpd" && httpd='lighttpd -f'
# probably the most popular browser among gitweb users
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 5619409..fba4b0c 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -8,7 +8,7 @@ # $1 - original file SHA1 (or empty)
# $2 - file in branch1 SHA1 (or empty)
# $3 - file in branch2 SHA1 (or empty)
# $4 - pathname in repository
-# $5 - orignal file mode (or empty)
+# $5 - original file mode (or empty)
# $6 - file in branch1 mode (or empty)
# $7 - file in branch2 mode (or empty)
#
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index ce8a31f..4039435 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -47,7 +47,7 @@ # ---------------------------------
def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0, ancestor=None):
'''Merge the commits h1 and h2, return the resulting virtual
- commit object and a flag indicating the cleaness of the merge.'''
+ commit object and a flag indicating the cleanness of the merge.'''
assert(isinstance(h1, Commit) and isinstance(h2, Commit))
global outputIndent
diff --git a/git-push.sh b/git-push.sh
index f10cadb..21775fc 100755
--- a/git-push.sh
+++ b/git-push.sh
@@ -63,7 +63,7 @@ esac
shift ;# away the initial 'x'
# $# is now 0 if there was no explicit refspec on the command line
-# and there was no defalt refspec to push from remotes/ file.
+# 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
diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 86b51ab..364baff 100755
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -49,7 +49,7 @@ if [ -n "$quilt_author" ] ; then
quilt_author_email=$(expr "z$quilt_author" : '.*<\([^>]*\)') &&
test '' != "$quilt_author_name" &&
test '' != "$quilt_author_email" ||
- die "malformatted --author parameter"
+ die "malformed --author parameter"
fi
# Quilt patch directory
diff --git a/git-send-email.perl b/git-send-email.perl
index c9c1975..d7f5dce 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -361,7 +361,7 @@ Options:
--smtp-server If set, specifies the outgoing SMTP server to use.
Defaults to localhost.
- --suppress-from Supress sending emails to yourself if your address
+ --suppress-from Suppress sending emails to yourself if your address
appears in a From: line.
--quiet Make git-send-email less verbose. One line per email should be
diff --git a/name-rev.c b/name-rev.c
index 6a23f2d..083d067 100644
--- a/name-rev.c
+++ b/name-rev.c
@@ -5,7 +5,7 @@ #include "tag.h"
#include "refs.h"
static const char name_rev_usage[] =
- "git-name-rev [--tags] ( --all | --stdin | commitish [commitish...] )\n";
+ "git-name-rev [--tags] ( --all | --stdin | committish [committish...] )\n";
typedef struct rev_name {
const char *tip_name;
diff --git a/pack-objects.c b/pack-objects.c
index b486ea5..04a48b9 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -28,7 +28,7 @@ struct object_entry {
struct object_entry *delta; /* delta base object */
struct packed_git *in_pack; /* already in pack */
unsigned int in_pack_offset;
- struct object_entry *delta_child; /* delitified objects who bases me */
+ struct object_entry *delta_child; /* deltified objects who bases me */
struct object_entry *delta_sibling; /* other deltified objects who
* uses the same base as me
*/
@@ -39,7 +39,7 @@ struct object_entry {
};
/*
- * Objects we are going to pack are colected in objects array (dynamically
+ * Objects we are going to pack are collected in objects array (dynamically
* expanded). nr_objects & nr_alloc controls this array. They are stored
* in the order we see -- typically rev-list --objects order that gives us
* nice "minimum seek" order.
diff --git a/ppc/sha1ppc.S b/ppc/sha1ppc.S
index f591d98..140cb53 100644
--- a/ppc/sha1ppc.S
+++ b/ppc/sha1ppc.S
@@ -62,7 +62,7 @@ #define W(t) ((t)%16+11)
* computation of W[t+4].
*
* The first 16 rounds use W values loaded directly from memory, while the
- * remianing 64 use values computed from those first 16. We preload
+ * remaining 64 use values computed from those first 16. We preload
* 4 values before starting, so there are three kinds of rounds:
* - The first 12 (all f0) also load the W values from memory.
* - The next 64 compute W(i+4) in parallel. 8*f0, 20*f1, 20*f2, 16*f1.
diff --git a/sha1_file.c b/sha1_file.c
index bc35808..f7bb3a1 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1660,7 +1660,7 @@ int has_sha1_file(const unsigned char *s
/*
* reads from fd as long as possible into a supplied buffer of size bytes.
- * If neccessary the buffer's size is increased using realloc()
+ * If necessary the buffer's size is increased using realloc()
*
* returns 0 if anything went fine and -1 otherwise
*
diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh
index 916ee15..dd9caad 100755
--- a/t/t5700-clone-reference.sh
+++ b/t/t5700-clone-reference.sh
@@ -31,7 +31,7 @@ test_expect_success 'cloning with refere
cd "$base_dir"
-test_expect_success 'existance of info/alternates' \
+test_expect_success 'existence of info/alternates' \
'test `wc -l <C/.git/objects/info/alternates` = 2'
cd "$base_dir"
diff --git a/t/t5710-info-alternate.sh b/t/t5710-info-alternate.sh
index 097d037..2e1b48a 100755
--- a/t/t5710-info-alternate.sh
+++ b/t/t5710-info-alternate.sh
@@ -81,7 +81,7 @@ test_valid_repo"
cd "$base_dir"
-test_expect_failure 'that info/alternates is neccessary' \
+test_expect_failure 'that info/alternates is necessary' \
'cd C &&
rm .git/objects/info/alternates &&
test_valid_repo'
diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh
index 693de9b..650cd68 100755
--- a/t/t6002-rev-list-bisect.sh
+++ b/t/t6002-rev-list-bisect.sh
@@ -154,7 +154,7 @@ test_sequence()
test_bisection_diff 0 $_bisect_option u5 ^U
#
-# the following illustrate's Linus' binary bug blatt idea.
+# the following illustrates Linus' binary bug blatt idea.
#
# assume the bug is actually at l3, but you don't know that - all you know is that l3 is broken
# and it wasn't broken before
diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
index 2623813..8f7366d 100755
--- a/t/t6021-merge-criss-cross.sh
+++ b/t/t6021-merge-criss-cross.sh
@@ -4,7 +4,7 @@ # Copyright (c) 2005 Fredrik Kuivinen
#
# See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a
-# nice decription of what this is about.
+# nice description of what this is about.
test_description='Test criss-cross merge'
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index ed7ad20..d76e76a 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -84,7 +84,7 @@ static long xdl_split(unsigned long cons
* We need to extent the diagonal "domain" by one. If the next
* values exits the box boundaries we need to change it in the
* opposite direction because (max - min) must be a power of two.
- * Also we initialize the extenal K value to -1 so that we can
+ * Also we initialize the external K value to -1 so that we can
* avoid extra conditions check inside the core loop.
*/
if (fmin > dmin)
@@ -119,7 +119,7 @@ static long xdl_split(unsigned long cons
* We need to extent the diagonal "domain" by one. If the next
* values exits the box boundaries we need to change it in the
* opposite direction because (max - min) must be a power of two.
- * Also we initialize the extenal K value to -1 so that we can
+ * Also we initialize the external K value to -1 so that we can
* avoid extra conditions check inside the core loop.
*/
if (bmin > dmin)
@@ -405,7 +405,7 @@ static int xdl_change_compact(xdfile_t *
/*
* This is the same of what GNU diff does. Move back and forward
* change groups for a consistent and pretty diff output. This also
- * helps in finding joineable change groups and reduce the diff size.
+ * helps in finding joinable change groups and reduce the diff size.
*/
for (ix = ixo = 0;;) {
/*
^ permalink raw reply related
* Re: [PATCH] Remove more gcc extension usage.
From: Jan-Benedict Glaw @ 2006-07-10 6:14 UTC (permalink / raw)
To: Shawn Pearce; +Cc: Junio C Hamano, git
In-Reply-To: <20060710052255.GA15173@spearce.org>
[-- Attachment #1: Type: text/plain, Size: 1364 bytes --]
On Mon, 2006-07-10 01:22:55 -0400, Shawn Pearce <spearce@spearce.org> wrote:
> > On Sat, 2006-07-08 15:03:27 -0400, Shawn Pearce <spearce@spearce.org> wrote:
> > > Monday I'll look to see if there's an option that can be given to
> > > the Solaris compiler to make it accept these constructs. Maybe a
> > > simple CFLAGS change in my config.mak would resolve what this patch
> > > was trying to do.
>
> So neither of the constructs my patch removes are supported in this
> (old) compiler, although a newer one might accept them with -xc99.
> Yes, I tried building a pristine git-1.4.1 with -xc99. It barfed,
> as one would expect given the description above.
>
> Since we don't have a newer version of cc available (not sure why)
> I'm stuck with needing to make the code changes in my patch just
> to get GIT to compile.
What about installing a compiler that implements more of C99, like
installing a gcc instance? I guess you're on a Sun system, there
should be precompiled binaries available.
MfG, JBG
--
Jan-Benedict Glaw jbglaw@lug-owl.de . +49-172-7608481 _ O _
"Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg _ _ O
für einen Freien Staat voll Freier Bürger" | im Internet! | im Irak! O O O
ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA));
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [PATCH] Remove more gcc extension usage.
From: Pavel Roskin @ 2006-07-10 6:22 UTC (permalink / raw)
To: Shawn Pearce; +Cc: Jan-Benedict Glaw, Junio C Hamano, git
In-Reply-To: <20060710052255.GA15173@spearce.org>
Hi, Shawn!
On Mon, 2006-07-10 at 01:22 -0400, Shawn Pearce wrote:
> $ cc -V
> cc: Forte Developer 7 C 5.4 2002/03/09
> usage: cc [ options] files. Use 'cc -flags' for details
>
> and from `man cc`:
>
> -xc99 enables C99 features:
[skip]
> o Flexible Array Members
This must be enabled already because it's used in git (see FLEX_ARRAY).
> So neither of the constructs my patch removes are supported in this
> (old) compiler, although a newer one might accept them with -xc99.
> Yes, I tried building a pristine git-1.4.1 with -xc99. It barfed,
> as one would expect given the description above.
This means that the Sun compiler has almost all c99 features used by git
with just a little exception (initializers). I think it's fair that we
fix this incompatibility. It's very very minor compared to what "gcc
-std=c89 -pedantic" would have required.
--
Regards,
Pavel Roskin
^ permalink raw reply
* Re: [PATCH] Remove more gcc extension usage.
From: Jan-Benedict Glaw @ 2006-07-10 6:25 UTC (permalink / raw)
To: Pavel Roskin; +Cc: Shawn Pearce, Junio C Hamano, git
In-Reply-To: <1152512523.3504.28.camel@dv>
[-- Attachment #1: Type: text/plain, Size: 728 bytes --]
On Mon, 2006-07-10 02:22:03 -0400, Pavel Roskin <proski@gnu.org> wrote:
> This means that the Sun compiler has almost all c99 features used by git
> with just a little exception (initializers). I think it's fair that we
> fix this incompatibility. It's very very minor compared to what "gcc
> -std=c89 -pedantic" would have required.
^^^^^^^^
You're kidding, aren't you?
MfG, JBG
--
Jan-Benedict Glaw jbglaw@lug-owl.de . +49-172-7608481 _ O _
"Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg _ _ O
für einen Freien Staat voll Freier Bürger" | im Internet! | im Irak! O O O
ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA));
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [PATCH 2/2] Move all builtin .c files into builtin/
From: Pavel Roskin @ 2006-07-10 6:41 UTC (permalink / raw)
To: Ryan Anderson; +Cc: git
In-Reply-To: <11525072491512-git-send-email-ryan@michonline.com>
Hello, Ryan!
On Mon, 2006-07-10 at 00:54 -0400, Ryan Anderson wrote:
> Signed-off-by: Ryan Anderson <ryan@michonline.com>
I agree that the top level directory is overcrowded, but wouldn't it be
better to move libgit.a sources to "lib" and then classify the remaining
files in some way (e.g. "git" or "src" for builtin commands, "commands"
for the rest)? While at that, the "buildin-" prefix could be stripped.
The main "git" executable is nothing but several builtin commands rolled
together. It's not like a shell, which has functionality beyond the
builtin commands. So "builtin" is git.
Or you can say that the git executable is a command line frontend to the
git library (it's moving in this direction anyway). Then you can have
"client" and "server" directories. That's more important for
understanding the source than "builtin", "standalone" or any
classification based on technical details.
--
Regards,
Pavel Roskin
^ permalink raw reply
* Re: [PATCH] Remove more gcc extension usage.
From: Pavel Roskin @ 2006-07-10 6:52 UTC (permalink / raw)
To: Jan-Benedict Glaw; +Cc: Shawn Pearce, Junio C Hamano, git
In-Reply-To: <20060710062513.GZ22573@lug-owl.de>
On Mon, 2006-07-10 at 08:25 +0200, Jan-Benedict Glaw wrote:
> On Mon, 2006-07-10 02:22:03 -0400, Pavel Roskin <proski@gnu.org> wrote:
> > This means that the Sun compiler has almost all c99 features used by git
> > with just a little exception (initializers). I think it's fair that we
> > fix this incompatibility. It's very very minor compared to what "gcc
> > -std=c89 -pedantic" would have required.
> ^^^^^^^^
>
> You're kidding, aren't you?
In fact I can build git with this command:
make CFLAGS="-std=c89 -pedantic -Dinline=__inline -D_GNU_SOURCE"
if I fix all C++ comments. It warns a lot about "flexible array
members" and other violations, but the resulting executable passes the
test. That's Fedora Core 5 with gcc 4.1.1.
What I meant it that if we go all the way to strict c89 (even with a
modern libc) and fix all the warnings, it will be much more than what is
needed to support Sun's C compiler with its partial c99 support.
We can satisfy the Sun's compiler and yet retain flexible arrays and
other c99 goodies.
Maybe I'm missing your point (or you joke).
--
Regards,
Pavel Roskin
^ permalink raw reply
* [PATCH] Avoid C++ comments, use C comments instead
From: Pavel Roskin @ 2006-07-10 6:57 UTC (permalink / raw)
To: git
From: Pavel Roskin <proski@gnu.org>
This doesn't make the code uglier or harder to read, yet it makes the
code more portable. This also simplifies checking for other potential
incompatibilities. "gcc -std=c89 -pedantic" can flag many incompatible
constructs as warnings, but C++ comments will cause it to emit an error.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
blame.c | 6 +++---
builtin-apply.c | 21 +++++++++++----------
builtin-push.c | 2 +-
convert-objects.c | 10 +++++-----
dir.c | 2 +-
http-fetch.c | 6 +++---
mktag.c | 5 +++--
read-cache.c | 2 +-
sha1_file.c | 4 ++--
ssh-fetch.c | 4 ++--
10 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/blame.c b/blame.c
index 0a06026..b04b8f5 100644
--- a/blame.c
+++ b/blame.c
@@ -44,8 +44,8 @@ struct util_info {
};
struct chunk {
- int off1, len1; // ---
- int off2, len2; // +++
+ int off1, len1; /* --- */
+ int off2, len2; /* +++ */
};
struct patch {
@@ -255,7 +255,7 @@ static void print_map(struct commit *cmi
}
#endif
-// p is a patch from commit to other.
+/* p is a patch from commit to other. */
static void fill_line_map(struct commit *commit, struct commit *other,
struct patch *p)
{
diff --git a/builtin-apply.c b/builtin-apply.c
index 1e5b846..c903146 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -14,14 +14,15 @@ #include "blob.h"
#include "delta.h"
#include "builtin.h"
-// --check turns on checking that the working tree matches the
-// files that are being modified, but doesn't apply the patch
-// --stat does just a diffstat, and doesn't actually apply
-// --numstat does numeric diffstat, and doesn't actually apply
-// --index-info shows the old and new index info for paths if available.
-// --index updates the cache as well.
-// --cached updates only the cache without ever touching the working tree.
-//
+/*
+ * --check turns on checking that the working tree matches the
+ * files that are being modified, but doesn't apply the patch
+ * --stat does just a diffstat, and doesn't actually apply
+ * --numstat does numeric diffstat, and doesn't actually apply
+ * --index-info shows the old and new index info for paths if available.
+ * --index updates the cache as well.
+ * --cached updates only the cache without ever touching the working tree.
+ */
static const char *prefix;
static int prefix_length = -1;
static int newfd = -1;
@@ -284,8 +285,8 @@ static void parse_traditional_patch(cons
{
char *name;
- first += 4; // skip "--- "
- second += 4; // skip "+++ "
+ first += 4; /* skip "--- " */
+ second += 4; /* skip "+++ " */
if (is_dev_null(first)) {
patch->is_new = 1;
patch->is_delete = 0;
diff --git a/builtin-push.c b/builtin-push.c
index a8fac88..31cbfd7 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -273,7 +273,7 @@ static int do_push(const char *repo)
int cmd_push(int argc, const char **argv, char **envp)
{
int i;
- const char *repo = "origin"; // default repository
+ const char *repo = "origin"; /* default repository */
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
diff --git a/convert-objects.c b/convert-objects.c
index 0fabd89..478571f 100644
--- a/convert-objects.c
+++ b/convert-objects.c
@@ -241,13 +241,13 @@ static void convert_date(void *buffer, u
char *new = xmalloc(size + 100);
unsigned long newlen = 0;
- // "tree <sha1>\n"
+ /* "tree <sha1>\n" */
memcpy(new + newlen, buffer, 46);
newlen += 46;
buffer = (char *) buffer + 46;
size -= 46;
- // "parent <sha1>\n"
+ /* "parent <sha1>\n" */
while (!memcmp(buffer, "parent ", 7)) {
memcpy(new + newlen, buffer, 48);
newlen += 48;
@@ -255,12 +255,12 @@ static void convert_date(void *buffer, u
size -= 48;
}
- // "author xyz <xyz> date"
+ /* "author xyz <xyz> date" */
newlen += convert_date_line(new + newlen, &buffer, &size);
- // "committer xyz <xyz> date"
+ /* "committer xyz <xyz> date" */
newlen += convert_date_line(new + newlen, &buffer, &size);
- // Rest
+ /* Rest */
memcpy(new + newlen, buffer, size);
newlen += size;
diff --git a/dir.c b/dir.c
index d778ecd..092d077 100644
--- a/dir.c
+++ b/dir.c
@@ -336,7 +336,7 @@ static int read_directory_recursive(stru
if (dir->show_other_directories &&
(subdir || !dir->hide_empty_directories) &&
!dir_exists(fullname, baselen + len)) {
- // Rewind the read subdirectory
+ /* Rewind the read subdirectory */
while (dir->nr > rewind_base)
free(dir->entries[--dir->nr]);
break;
diff --git a/http-fetch.c b/http-fetch.c
index 44eba5f..12493fb 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -490,7 +490,7 @@ static int setup_index(struct alt_base *
{
struct packed_git *new_pack;
if (has_pack_file(sha1))
- return 0; // don't list this as something we can get
+ return 0; /* don't list this as something we can get */
if (fetch_index(repo, sha1))
return -1;
@@ -570,7 +570,7 @@ static void process_alternates_response(
base[serverlen - 1] != '/');
i += 3;
}
- // If the server got removed, give up.
+ /* If the server got removed, give up. */
okay = strchr(base, ':') - base + 3 <
serverlen;
} else if (alt_req->http_specific) {
@@ -581,7 +581,7 @@ static void process_alternates_response(
okay = 1;
}
}
- // skip 'objects' at end
+ /* skip 'objects' at end */
if (okay) {
target = xmalloc(serverlen + posn - i - 6);
strlcpy(target, base, serverlen);
diff --git a/mktag.c b/mktag.c
index f0fe528..27f4c4f 100644
--- a/mktag.c
+++ b/mktag.c
@@ -17,7 +17,7 @@ #include "tag.h"
* in that size, you're doing something wrong.
*/
-// Some random size
+/* Some random size */
#define MAXSIZE (8192)
/*
@@ -123,7 +123,8 @@ int main(int argc, char **argv)
die("could not read from stdin");
}
- // Verify it for some basic sanity: it needs to start with "object <sha1>\ntype\ntagger "
+ /* Verify it for some basic sanity: it needs to start with
+ "object <sha1>\ntype\ntagger " */
if (verify_tag(buffer, size) < 0)
die("invalid tag signature file");
diff --git a/read-cache.c b/read-cache.c
index 3c32aae..a50d361 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -748,7 +748,7 @@ int read_cache(void)
die("index file open failed (%s)", strerror(errno));
}
- size = 0; // avoid gcc warning
+ size = 0; /* avoid gcc warning */
map = MAP_FAILED;
if (!fstat(fd, &st)) {
size = st.st_size;
diff --git a/sha1_file.c b/sha1_file.c
index f7bb3a1..459430a 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -453,7 +453,7 @@ int use_packed_git(struct packed_git *p)
{
if (!p->pack_size) {
struct stat st;
- // We created the struct before we had the pack
+ /* We created the struct before we had the pack */
stat(p->pack_name, &st);
if (!S_ISREG(st.st_mode))
die("packfile %s not a regular file", p->pack_name);
@@ -1504,7 +1504,7 @@ static void *repack_object(const unsigne
int hdrlen;
void *buf;
- // need to unpack and recompress it by itself
+ /* need to unpack and recompress it by itself */
unpacked = read_packed_sha1(sha1, type, &len);
hdrlen = sprintf(hdr, "%s %lu", type, len) + 1;
diff --git a/ssh-fetch.c b/ssh-fetch.c
index 1e59cd2..28f7fd9 100644
--- a/ssh-fetch.c
+++ b/ssh-fetch.c
@@ -68,7 +68,7 @@ int fetch(unsigned char *sha1)
struct object_list *temp;
if (memcmp(sha1, in_transit->item->sha1, 20)) {
- // we must have already fetched it to clean the queue
+ /* we must have already fetched it to clean the queue */
return has_sha1_file(sha1) ? 0 : -1;
}
prefetches--;
@@ -85,7 +85,7 @@ int fetch(unsigned char *sha1)
if (read(fd_in, &remote, 1) < 1)
return -1;
}
- //fprintf(stderr, "Got %d\n", remote);
+ /* fprintf(stderr, "Got %d\n", remote); */
if (remote < 0)
return remote;
ret = write_sha1_from_fd(sha1, fd_in, conn_buf, 4096, &conn_buf_posn);
^ permalink raw reply related
* Re: [PATCH] Remove more gcc extension usage.
From: Jan-Benedict Glaw @ 2006-07-10 7:35 UTC (permalink / raw)
To: Pavel Roskin; +Cc: Shawn Pearce, Junio C Hamano, git
In-Reply-To: <1152514328.3504.58.camel@dv>
[-- Attachment #1: Type: text/plain, Size: 1176 bytes --]
On Mon, 2006-07-10 02:52:08 -0400, Pavel Roskin <proski@gnu.org> wrote:
> On Mon, 2006-07-10 at 08:25 +0200, Jan-Benedict Glaw wrote:
> > On Mon, 2006-07-10 02:22:03 -0400, Pavel Roskin <proski@gnu.org> wrote:
> > > This means that the Sun compiler has almost all c99 features used by git
> > > with just a little exception (initializers). I think it's fair that we
> > > fix this incompatibility. It's very very minor compared to what "gcc
> > > -std=c89 -pedantic" would have required.
> > ^^^^^^^^
> > You're kidding, aren't you?
[...]
> We can satisfy the Sun's compiler and yet retain flexible arrays and
> other c99 goodies.
>
> Maybe I'm missing your point (or you joke).
Why should we jump through the hoops to support an obsolete standard
because proprietary compilers don't stand today's standards?
MfG, JBG
--
Jan-Benedict Glaw jbglaw@lug-owl.de . +49-172-7608481 _ O _
"Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg _ _ O
für einen Freien Staat voll Freier Bürger" | im Internet! | im Irak! O O O
ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA));
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [PATCH] Avoid C++ comments, use C comments instead
From: Junio C Hamano @ 2006-07-10 7:46 UTC (permalink / raw)
To: Pavel Roskin; +Cc: git
In-Reply-To: <20060710065751.22902.43316.stgit@dv.roinet.com>
Pavel Roskin <proski@gnu.org> writes:
> From: Pavel Roskin <proski@gnu.org>
>
> This doesn't make the code uglier or harder to read, yet it makes the
> code more portable. This also simplifies checking for other potential
> incompatibilities. "gcc -std=c89 -pedantic" can flag many incompatible
> constructs as warnings, but C++ comments will cause it to emit an error.
>
> Signed-off-by: Pavel Roskin <proski@gnu.org>
The title should probably read "avoid C99 comments", but coming
from the previous century, I tend to agree with this.
The struct/array initializer stuff by Shawn makes them harder to
read (for structs, it moves initialization to actual code) and
more error prone (for arrays, now the initializers need to be
carefully kept ordered), but we do not have too many of them in
the code, so I do not think it is a not much of a practical
problem. It is sad that some people stay behind and we need to
cater to them, though.
^ permalink raw reply
* Re: [PATCH] Remove more gcc extension usage.
From: Junio C Hamano @ 2006-07-10 7:47 UTC (permalink / raw)
To: Pavel Roskin; +Cc: git
In-Reply-To: <1152512523.3504.28.camel@dv>
Pavel Roskin <proski@gnu.org> writes:
> I think it's fair that we fix this incompatibility. It's very
> very minor compared to what "gcc -std=c89 -pedantic" would
> have required.
I think I agree with you. Let's have it in.
^ permalink raw reply
* Re: [PATCH] Remove more gcc extension usage.
From: Pavel Roskin @ 2006-07-10 8:07 UTC (permalink / raw)
To: Jan-Benedict Glaw; +Cc: Shawn Pearce, Junio C Hamano, git
In-Reply-To: <20060710073532.GA22573@lug-owl.de>
Quoting Jan-Benedict Glaw <jbglaw@lug-owl.de>:
> Why should we jump through the hoops to support an obsolete standard
> because proprietary compilers don't stand today's standards?
Because we want git to run on such systems, and asking to compile gcc first is
too much to ask for.
There are still missing or broken C99 features in the current gcc:
http://gcc.gnu.org/c99status.html
Why do we want to avoid C99 features broken in gcc? Because we want users to be
able to compile git with today's gcc, and installing a different compiler
(proprietary or even free) to compile git is too much to ask for.
Maybe if cvsup compiled with gcc, we would be using cvsup backend for git now.
Or maybe cvsup would develop to take the niche currently occupied by git. But
cvsup was written in Modula 3, perhaps a superior language compared to C. You
would have to compile a Modula 3 compiler and a Modula 3 library just to be
able to compile cvsup. The necessary software was free, but compiling it was
not trivial. Let's see, where is cvsup now? How popular is it?
After all, it's a trade-off between ease of coding and ease of installing. Make
coding too hard, and the developers will go elsewhere. Make installation too
hard, and the project starts losing users. And who wants to contribute to an
unpopular project?
Going all the way to strict c89 could be too much, but fixing initializers in a
few places is a minor issue. Users of the Sun's compiler can expect us to do
such changes, just like users of gcc would ask to fix a program that uses c99
features not yet available in gcc.
--
Regards,
Pavel Roskin
^ permalink raw reply
* Re: [PATCH] Remove more gcc extension usage.
From: Junio C Hamano @ 2006-07-10 8:10 UTC (permalink / raw)
To: Pavel Roskin; +Cc: git
In-Reply-To: <20060710040711.z1h4w0wsgk8sskg4@webmail.spamcop.net>
Pavel Roskin <proski@gnu.org> writes:
> Going all the way to strict c89 could be too much, but fixing
> initializers in a few places is a minor issue. Users of the
> Sun's compiler can expect us to do such changes,...
I am fully with you on this one.
^ permalink raw reply
* Re: [PATCH] Remove more gcc extension usage.
From: Jan-Benedict Glaw @ 2006-07-10 8:18 UTC (permalink / raw)
To: Pavel Roskin; +Cc: Shawn Pearce, Junio C Hamano, git
In-Reply-To: <20060710040711.z1h4w0wsgk8sskg4@webmail.spamcop.net>
[-- Attachment #1: Type: text/plain, Size: 1768 bytes --]
On Mon, 2006-07-10 04:07:11 -0400, Pavel Roskin <proski@gnu.org> wrote:
> Quoting Jan-Benedict Glaw <jbglaw@lug-owl.de>:
> > Why should we jump through the hoops to support an obsolete standard
> > because proprietary compilers don't stand today's standards?
>
> Because we want git to run on such systems, and asking to compile gcc first is
> too much to ask for.
As I said, there are precompiled binaries for basically all useable
systems out there.
> There are still missing or broken C99 features in the current gcc:
> http://gcc.gnu.org/c99status.html
Sure. As are in other compilers. But you forgot to mention that these
missing or broken features are mostly of no use to commonly used C
code. So that's a non-issue. (If it was a real issue, you can be sure
that I'd drop a ton of bug reports into GCC's Bugzilla...)
> Going all the way to strict c89 could be too much, but fixing initializers in a
> few places is a minor issue. Users of the Sun's compiler can expect us to do
> such changes, just like users of gcc would ask to fix a program that uses c99
> features not yet available in gcc.
I'm not sure about specifically the initializers thing. Personally, I
consider the new C99 initializers one of the very best things that
ever happened to the C language, because it fixes a _real_ problem.
You may have noticed that eg. for the kernel code, these are used
throughoutly...
MfG, JBG
--
Jan-Benedict Glaw jbglaw@lug-owl.de . +49-172-7608481 _ O _
"Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg _ _ O
für einen Freien Staat voll Freier Bürger" | im Internet! | im Irak! O O O
ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA));
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [RFC+PATCH 1/1] Move SCM interoperability tools into scm/
From: Timo Hirvonen @ 2006-07-10 9:45 UTC (permalink / raw)
To: Ryan Anderson; +Cc: pasky, martin.langhoff, git
In-Reply-To: <44B19D42.6030701@michonline.com>
Ryan Anderson <ryan@michonline.com> wrote:
> By "don't split the Makefile", do mean, "Don't use recursive make"?
>
> I'm fine with that (and if you look at my patch, I "include
> scm/Makefile" to do just that), but if you mean "keep only a top-level
> Makefile", well, I think that continues the problem of "there is too
> much stuff going on here", but I can be persuaded otherwise.
Recursive make is a horrible hack. Splitting Makefile to smaller chunks
which would be included in the top level Makefile is almost as bad. You
can't cd to subdirectory and run make there and you have to prefix all
files with "subdir/".
If you really want to make Makefile shorter just move all the platform
specific stuff to a configure script.
--
http://onion.dynserv.net/~timo/
^ permalink raw reply
* Re: [PATCH] Avoid C++ comments, use C comments instead
From: Olivier Galibert @ 2006-07-10 9:46 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Pavel Roskin, git
In-Reply-To: <7vzmfhdhrf.fsf@assigned-by-dhcp.cox.net>
On Mon, Jul 10, 2006 at 12:46:28AM -0700, Junio C Hamano wrote:
> It is sad that some people stay behind and we need to
> cater to them, though.
Do you, really?
OG.
^ permalink raw reply
* problems GIT_TRACE
From: Matthias Lederhofer @ 2006-07-10 11:05 UTC (permalink / raw)
To: git
I just discovered a problem with GIT_TRACE. Some scripts redirect
stderr to stdout and the trace messages go with it. For example from
git-repack:
> name=$(git-rev-list --objects --all $rev_list 2>&1 |
> git-pack-objects --non-empty $pack_objects .tmp-pack) ||
> exit 1
Then for example git-pack-objects complains:
> fatal: expected sha1, got garbage:
> trace: built-in: git 'rev-list' '--objects' '--all'
git-grep '2>&' shows a few other places that do this too, I'll take a
closer look at this later. Is there any reason to redirect stderr to
stdout? I think this will always fail with such a strange error
message when something is written to stderr.
^ permalink raw reply
* Re: [PATCH] Avoid C++ comments, use C comments instead
From: Johannes Schindelin @ 2006-07-10 11:06 UTC (permalink / raw)
To: Olivier Galibert; +Cc: Junio C Hamano, git
In-Reply-To: <20060710094653.GA52962@dspnet.fr.eu.org>
Hi,
On Mon, 10 Jul 2006, Olivier Galibert wrote:
> On Mon, Jul 10, 2006 at 12:46:28AM -0700, Junio C Hamano wrote:
> > It is sad that some people stay behind and we need to
> > cater to them, though.
>
> Do you, really?
Well, I guess as long as things do not break for _you_, we do not need to.
Ciao,
Dscho
^ permalink raw reply
* [PATCH] Fix linking for not-so-clever linkers.
From: Johannes Schindelin @ 2006-07-10 11:40 UTC (permalink / raw)
To: git, junkio
On one of my systems, the linker is not intelligent enough to link with
pager.o (in libgit.a) when only the variable pager_in_use is needed. The
consequence is that the linker complains about an undefined variable. So,
put the variable into environment.o, where it is linked always.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
environment.c | 1 +
| 2 --
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/environment.c b/environment.c
index 43823ff..97d42b1 100644
--- a/environment.c
+++ b/environment.c
@@ -21,6 +21,7 @@ char git_commit_encoding[MAX_ENCODING_LE
int shared_repository = PERM_UMASK;
const char *apply_default_whitespace = NULL;
int zlib_compression_level = Z_DEFAULT_COMPRESSION;
+int pager_in_use;
static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
*git_graft_file;
--git a/pager.c b/pager.c
index bb14e99..280f57f 100644
--- a/pager.c
+++ b/pager.c
@@ -5,8 +5,6 @@ #include "cache.h"
* something different on Windows, for example.
*/
-int pager_in_use;
-
static void run_pager(const char *pager)
{
execlp(pager, pager, NULL);
--
1.4.1.g6e33b-dirty
^ permalink raw reply related
* Re: [PATCH] Avoid C++ comments, use C comments instead
From: Olivier Galibert @ 2006-07-10 11:41 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Junio C Hamano, git
In-Reply-To: <Pine.LNX.4.63.0607101306030.29667@wbgn013.biozentrum.uni-wuerzburg.de>
On Mon, Jul 10, 2006 at 01:06:44PM +0200, Johannes Schindelin wrote:
> Hi,
>
> On Mon, 10 Jul 2006, Olivier Galibert wrote:
>
> > On Mon, Jul 10, 2006 at 12:46:28AM -0700, Junio C Hamano wrote:
> > > It is sad that some people stay behind and we need to
> > > cater to them, though.
> >
> > Do you, really?
>
> Well, I guess as long as things do not break for _you_, we do not need to.
Supporting old, not-standard-anymore compilers has a cost in
maintainability, by precluding the use of better constructs (//
comments, declarations near initialisation, struct initializers...).
Additionally, it gets harder and harder to have people test for them.
Given than you can find gcc on pretty much everything that has a
filesystem cache decent enough to handle git correctly, is this cost
worth it? _That_ was the question.
OG.
^ permalink raw reply
* Perl gurus: why do we need Scalar::Util?
From: Johannes Schindelin @ 2006-07-10 11:44 UTC (permalink / raw)
To: git
Hi,
please do not let my die dumb: what is this "blessed" thing all about? And
why do we need it in the private-Error.pm??
Thanks,
Dscho
^ permalink raw reply
* newbie'ish FAQ/question about merging different trees
From: Peter Gervai @ 2006-07-10 11:56 UTC (permalink / raw)
To: git
Hello,
I ask with specifics to make it easier to get, but the question
probably general.
In one sentence: I would like to use
linux/kernel/git/jejb/aic94xx-sas-2.6.git with the current released
kernel, which is 2.6.17.4 at the moment.
In more sentences:
There are two trees on kernel.org's git:
linux/kernel/git/jejb/aic94xx-sas-2.6.git (it seems to be at 2.6.16-rc5)
linux/kernel/git/torvalds/linux-2.6.git (it probably does have a tag
at v2.6.17.4)
Is there a way to merge these to produce 2.6.17.4 (latest released), patched?
Thanks,
Peter
ps: ...apart from asking the subtree's maintainer to update his tree...
^ 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