* 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] 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: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
* [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] 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
* 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
* [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
* [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
* [RFC+PATCH 0/2] Clean up root directory
From: Ryan Anderson @ 2006-07-10 4:54 UTC (permalink / raw)
To: git
A second send of my patch to clean up the root directory a bit.
This series moves the "SCM interoperability" tools into interop/ and
builtin-*.c into builtin/.
All tests pass, and all finished scripts and binaries are dropped into the root
after a "make all".
GIT: Please enter your email below.
GIT: Lines beginning in "GIT: " will be removed.
GIT: Consider including an overall diffstat or table of contents
GIT: for the patch you are writing.
^ permalink raw reply
* Re: [RFC+PATCH 1/1] Move SCM interoperability tools into scm/
From: Ryan Anderson @ 2006-07-10 3:24 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vsllae1ik.fsf@assigned-by-dhcp.cox.net>
[-- Attachment #1: Type: text/plain, Size: 985 bytes --]
Junio C Hamano wrote:
> Ryan Anderson <ryan@michonline.com> writes:
>
>
>> Comments on a way to make the Makefile less repetitive would be
>> appreciated, though.
>>
>
> One obvious way would be not to have scm/Makefile but have the
> dependencies in the main Makefile to say (the moral equivalent
> of):
>
> git-archimport.perl: scm/git-archimport.perl
>
I think that doing that means I still need to duplicate the actual
build rules, which is what I was hoping to avoid, as they encode all the
magic "path replacement" logic in multiple places.
On the other hand, I can fix *that*, if I break the ability to run in
the build directory, which is bad in its own way. (Fixing the tests
should be a matter of adapting the test library slightly, I think.)
For the time being, I'm going with ugly, but less disruptive, and I'm
willing/planning on revisiting it when things shake out a bit more.
--
Ryan Anderson
sometimes Pug Majere
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]
^ permalink raw reply
* [PATCH] git-svn: fix --file/-F option in commit-diff
From: Eric Wong @ 2006-07-10 3:20 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Eric Wong
Also, allow messages from tags to be used as
commit messages.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
contrib/git-svn/git-svn.perl | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index 8bc4188..7cbfb6e 100755
--- a/contrib/git-svn/git-svn.perl
+++ b/contrib/git-svn/git-svn.perl
@@ -760,7 +760,7 @@ sub commit_diff {
exit 1;
}
if (defined $_file) {
- $_message = file_to_s($_message);
+ $_message = file_to_s($_file);
} else {
$_message ||= get_commit_message($tb,
"$GIT_DIR/.svn-commit.tmp.$$")->{msg};
@@ -1518,12 +1518,12 @@ sub get_commit_message {
open my $msg, '>', $commit_msg or croak $!;
chomp(my $type = `git-cat-file -t $commit`);
- if ($type eq 'commit') {
+ if ($type eq 'commit' || $type eq 'tag') {
my $pid = open my $msg_fh, '-|';
defined $pid or croak $!;
if ($pid == 0) {
- exec(qw(git-cat-file commit), $commit) or croak $!;
+ exec('git-cat-file', $type, $commit) or croak $!;
}
my $in_msg = 0;
while (<$msg_fh>) {
--
1.4.1.gda58
^ permalink raw reply related
* [PATCH] gitweb.cgi: Teach "a=blob" action to know the blob/file mime type
From: Luben Tuikov @ 2006-07-10 3:18 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 518 bytes --]
Now action "blob" knows the file type: if the file type is
not "text/*" then action "blob" defaults to "blob_plain",
i.e. the file is downloaded raw for the browser to interpret.
If the file type is "text/*", then "blob" defaults to the
current "cat -n"-like output, from which you can click
"plain", to get the "blob_plain" output.
Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
---
gitweb/gitweb.cgi | 127 ++++++++++++++++++++++++++++-------------------------
1 files changed, 67 insertions(+), 60 deletions(-)
[-- Attachment #2: 2862520298-blob.patch --]
[-- Type: application/octet-stream, Size: 6704 bytes --]
diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi
index 3e2790c..1e61ae6 100755
--- a/gitweb/gitweb.cgi
+++ b/gitweb/gitweb.cgi
@@ -1455,61 +1455,6 @@ sub git_get_hash_by_path {
}
}
-sub git_blob {
- if (!defined $hash && defined $file_name) {
- my $base = $hash_base || git_read_head($project);
- $hash = git_get_hash_by_path($base, $file_name, "blob") || die_error(undef, "Error lookup file.");
- }
- my $have_blame = git_get_project_config_bool ('blame');
- open my $fd, "-|", "$gitbin/git-cat-file blob $hash" or die_error(undef, "Open failed.");
- git_header_html();
- if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
- print "<div class=\"page_nav\">\n" .
- $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
- " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "shortlog") .
- " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "log") .
- " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base")}, "commit") .
- " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash_base")}, "commitdiff") .
- " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash_base")}, "tree") . "<br/>\n";
- if (defined $file_name) {
- if ($have_blame) {
- print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;h=$hash;hb=$hash_base;f=$file_name")}, "blame") . " | ";
- }
- print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash;f=$file_name")}, "plain") .
- " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;hb=HEAD;f=$file_name")}, "head") . "<br/>\n";
- } else {
- print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash")}, "plain") . "<br/>\n";
- }
- print "</div>\n".
- "<div>" .
- $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
- "</div>\n";
- } else {
- print "<div class=\"page_nav\">\n" .
- "<br/><br/></div>\n" .
- "<div class=\"title\">$hash</div>\n";
- }
- if (defined $file_name) {
- print "<div class=\"page_path\"><b>" . esc_html($file_name) . "</b></div>\n";
- }
- print "<div class=\"page_body\">\n";
- my $nr;
- while (my $line = <$fd>) {
- chomp $line;
- $nr++;
- while ((my $pos = index($line, "\t")) != -1) {
- if (my $count = (8 - ($pos % 8))) {
- my $spaces = ' ' x $count;
- $line =~ s/\t/$spaces/;
- }
- }
- printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n", $nr, $nr, $nr, esc_html($line);
- }
- close $fd or print "Reading blob failed.\n";
- print "</div>";
- git_footer_html();
-}
-
sub mimetype_guess_file {
my $filename = shift;
my $mimemap = shift;
@@ -1548,14 +1493,14 @@ sub git_blob_plain_mimetype {
my $fd = shift;
my $filename = shift;
- # just in case
- return $default_blob_plain_mimetype unless $fd;
-
if ($filename) {
my $mime = mimetype_guess($filename);
$mime and return $mime;
}
+ # just in case
+ return $default_blob_plain_mimetype unless $fd;
+
if (-T $fd) {
return 'text/plain' .
($default_text_plain_charset ? '; charset='.$default_text_plain_charset : '');
@@ -1573,8 +1518,10 @@ sub git_blob_plain_mimetype {
}
sub git_blob_plain {
- open my $fd, "-|", "$gitbin/git-cat-file blob $hash" or return;
- my $type = git_blob_plain_mimetype($fd, $file_name);
+ my $type = shift;
+ open my $fd, "-|", "$gitbin/git-cat-file blob $hash" or die_error("Couldn't cat $file_name, $hash");
+
+ $type ||= git_blob_plain_mimetype($fd, $file_name);
# save as filename, even when no $file_name is given
my $save_as = "$hash";
@@ -1593,7 +1540,66 @@ sub git_blob_plain {
close $fd;
}
+sub git_blob {
+ if (!defined $hash && defined $file_name) {
+ my $base = $hash_base || git_read_head($project);
+ $hash = git_get_hash_by_path($base, $file_name, "blob") || die_error(undef, "Error lookup file.");
+ }
+ my $have_blame = git_get_project_config_bool ('blame');
+ open my $fd, "-|", "$gitbin/git-cat-file blob $hash" or die_error(undef, "Open failed.");
+ my $mimetype = git_blob_plain_mimetype($fd, $file_name);
+ if ($mimetype !~ m/^text\//) {
+ close $fd;
+ return git_blob_plain($mimetype);
+ }
+ git_header_html();
+ if (defined $hash_base && (my %co = git_read_commit($hash_base))) {
+ print "<div class=\"page_nav\">\n" .
+ $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
+ " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=shortlog")}, "shortlog") .
+ " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=log")}, "log") .
+ " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base")}, "commit") .
+ " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commitdiff;h=$hash_base")}, "commitdiff") .
+ " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$co{'tree'};hb=$hash_base")}, "tree") . "<br/>\n";
+ if (defined $file_name) {
+ if ($have_blame) {
+ print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blame;h=$hash;hb=$hash_base;f=$file_name")}, "blame") . " | ";
+ }
+ print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash;f=$file_name")}, "plain") .
+ " | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob;hb=HEAD;f=$file_name")}, "head") . "<br/>\n";
+ } else {
+ print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=blob_plain;h=$hash")}, "plain") . "<br/>\n";
+ }
+ print "</div>\n".
+ "<div>" .
+ $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) .
+ "</div>\n";
+ } else {
+ print "<div class=\"page_nav\">\n" .
+ "<br/><br/></div>\n" .
+ "<div class=\"title\">$hash</div>\n";
+ }
+ if (defined $file_name) {
+ print "<div class=\"page_path\"><b>" . esc_html($file_name) . "</b></div>\n";
+ }
+ print "<div class=\"page_body\">\n";
+ my $nr;
+ while (my $line = <$fd>) {
+ chomp $line;
+ $nr++;
+ while ((my $pos = index($line, "\t")) != -1) {
+ if (my $count = (8 - ($pos % 8))) {
+ my $spaces = ' ' x $count;
+ $line =~ s/\t/$spaces/;
+ }
+ }
+ printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n", $nr, $nr, $nr, esc_html($line);
+ }
+ close $fd or print "Reading blob failed.\n";
+ print "</div>";
+ git_footer_html();
+}
+
sub git_tree {
if (!defined $hash) {
$hash = git_read_head($project);
--
1.4.1.g35dbd
^ permalink raw reply related
* [PATCH] gitweb.cgi: Create $git_temp if it doesn't exist
From: Luben Tuikov @ 2006-07-10 3:07 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
Unless we'd done diffs, $git_temp doesn't exist and then
mime lookups fail. Explicitly create it, if it doesn't
exist already.
Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
---
gitweb/gitweb.cgi | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
[-- Attachment #2: 2829251161-patch.patch --]
[-- Type: application/octet-stream, Size: 461 bytes --]
diff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi
index 6798990..d37f4c6 100755
--- a/gitweb/gitweb.cgi
+++ b/gitweb/gitweb.cgi
@@ -41,6 +41,9 @@ if ($git_version =~ m/git version (.*)$/
# location for temporary files needed for diffs
our $git_temp = "/tmp/gitweb";
+if (! -d $git_temp) {
+ mkdir($git_temp, 0700) || die_error("Couldn't mkdir $git_temp");
+}
# target of the home link on top of all pages
our $home_link = $my_uri;
--
1.4.1.g35dbd
^ permalink raw reply related
* Re: [PATCH] Fix some doubled word typos
From: Junio C Hamano @ 2006-07-10 2:04 UTC (permalink / raw)
To: Alp Toker; +Cc: git
In-Reply-To: <44B1B093.9000201@atoker.com>
Alp Toker <alp@atoker.com> writes:
> I hadn't realised that git-svn work was happening on a topic
> branch. In light of that, it makes perfect sense to split out the
> commit as you did. It's good to hear that git isn't just truncating
> patches.
No, what would happen (if I were not careful) if I try to apply
it to "master" would be that "git am" would refuse to touch any
file. IOW, it tries to apply the patches atomically. Not
truncating or omitting patches is one of the most important
things git needs to do correctly so it had better work right
;-).
^ permalink raw reply
* Re: [PATCH] Fix some doubled word typos
From: Alp Toker @ 2006-07-10 1:42 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vodvye10h.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
> Actually, I am a bit more careful than that ;-).
>
> I have split your patch into two, and applied the part that
> applicable to "master" first. The tip of ew/svn topic branch (I
> do not publish topic branch tips) have two patches that are
> still not in even "pu", and one of these two patches is your
> Documentation/git-svn.txt patch. These two will appear in
> "next" hopefully soon -- I just haven't gotten around to them.
I hadn't realised that git-svn work was happening on a topic branch. In
light of that, it makes perfect sense to split out the commit as you
did. It's good to hear that git isn't just truncating patches.
Cheers.
^ permalink raw reply
* Re: [PATCH] Fix some doubled word typos
From: Junio C Hamano @ 2006-07-10 0:50 UTC (permalink / raw)
To: Alp Toker; +Cc: git
In-Reply-To: <44B1A01F.5090408@atoker.com>
Alp Toker <alp@atoker.com> writes:
> My patch was made against the 'next' branch, where the file had
> recently been moved to Documentation/git-svn.txt, but it was applied
> to the 'master' branch where the file still exists at
> contrib/git-svn/git-svn.txt as it has not yet been moved.
Actually, I am a bit more careful than that ;-).
I have split your patch into two, and applied the part that
applicable to "master" first. The tip of ew/svn topic branch (I
do not publish topic branch tips) have two patches that are
still not in even "pu", and one of these two patches is your
Documentation/git-svn.txt patch. These two will appear in
"next" hopefully soon -- I just haven't gotten around to them.
^ permalink raw reply
* Re: [RFC+PATCH 1/1] Move SCM interoperability tools into scm/
From: Junio C Hamano @ 2006-07-10 0:39 UTC (permalink / raw)
To: Ryan Anderson; +Cc: git
In-Reply-To: <20060709222308.GA4153@h4x0r5.com>
Ryan Anderson <ryan@michonline.com> writes:
> Comments on a way to make the Makefile less repetitive would be
> appreciated, though.
One obvious way would be not to have scm/Makefile but have the
dependencies in the main Makefile to say (the moral equivalent
of):
git-archimport.perl: scm/git-archimport.perl
^ permalink raw reply
* Re: [PATCH] Fix some doubled word typos
From: Alp Toker @ 2006-07-10 0:32 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <11524377844177-git-send-email-alp@atoker.com>
Alp Toker wrote:
> Signed-off-by: Alp Toker <alp@atoker.com>
> ---
> Documentation/git-svn.txt | 2 +-
> Documentation/urls.txt | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
My patch was made against the 'next' branch, where the file had recently
been moved to Documentation/git-svn.txt, but it was applied to the
'master' branch where the file still exists at
contrib/git-svn/git-svn.txt as it has not yet been moved.
As a result, it seems that only the modification to
Documentation/urls.txt in this patch made it into the repository, with
the fix to Documentation/git-svn.txt having been silently omitted.
By the time the commit was merged from 'master' to 'next', it had
permanently lost the modification to git-svn.txt, and even though the
commit message claims to "Fix some doubled word typos" it only fixes one.
Could this situation have been avoided if the patch had mentioned that
it was against the 'next' branch? Should/does git warn the user if a
patch modifies files that don't exist? Would rename tracking have helped
this patch to apply properly?
^ permalink raw reply
* Re: [RFC+PATCH 1/1] Move SCM interoperability tools into scm/
From: Ryan Anderson @ 2006-07-10 0:20 UTC (permalink / raw)
To: Timo Hirvonen; +Cc: pasky, martin.langhoff, git
In-Reply-To: <20060710013405.54fbe6bb.tihirvon@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 966 bytes --]
Timo Hirvonen wrote:
> Petr Baudis <pasky@suse.cz> wrote:
>
>
>> I've been meaning to do something like this for some time already; my
>> itch have been the builtins. The tree size _is_ getting out of hand and
>> a little more categorization of the sources would certainly help.
>> Although I'd take a different approach:
>>
>> libgit/
>> builtin/
>> standalone/
>> scripts/
>>
>
> Please don't. One directory is much easier to work with. At least
> don't split the Makefile. Also moving files makes "git log <file>"
> stop at the rename.
>
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.
--
Ryan Anderson
sometimes Pug Majere
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]
^ permalink raw reply
* Re: [BUGFIX][RESEND]git-cvsexportcommit can't handle merge commits correctly
From: Martin Langhoff (CatalystIT) @ 2006-07-09 23:12 UTC (permalink / raw)
To: Peter Baumann; +Cc: git, Junio C Hamano
In-Reply-To: <20060707105541.GA17004@xp.machine.xx>
Peter Baumann wrote:
> git-cvsexportcommit should check if the parent (supplied on the cmdline) to use
> for a merge commit is one of the real parents of the merge.
>
> But it errors out if the _first_ parent doesn't match and never checks
> the other parents.
>
Ack. Thanks for spotting this!
m
--
-----------------------------------------------------------------------
Martin @ Catalyst .Net .NZ Ltd, PO Box 11-053, Manners St, Wellington
WEB: http://catalyst.net.nz/ PHYS: Level 2, 150-154 Willis St
OFFICE: +64(4)916-7224 MOB: +64(21)364-017
Make things as simple as possible, but no simpler - Einstein
-----------------------------------------------------------------------
^ permalink raw reply
* Re: [RFC+PATCH 1/1] Move SCM interoperability tools into scm/
From: Timo Hirvonen @ 2006-07-09 22:34 UTC (permalink / raw)
To: pasky; +Cc: martin.langhoff, ryan, git
In-Reply-To: <20060709221326.GU29115@pasky.or.cz>
Petr Baudis <pasky@suse.cz> wrote:
> I've been meaning to do something like this for some time already; my
> itch have been the builtins. The tree size _is_ getting out of hand and
> a little more categorization of the sources would certainly help.
> Although I'd take a different approach:
>
> libgit/
> builtin/
> standalone/
> scripts/
Please don't. One directory is much easier to work with. At least
don't split the Makefile. Also moving files makes "git log <file>"
stop at the rename.
--
http://onion.dynserv.net/~timo/
^ permalink raw reply
* Re: What *have* I done?
From: Nix @ 2006-07-09 22:25 UTC (permalink / raw)
To: Petr Baudis; +Cc: git
In-Reply-To: <20060709212113.GS29115@pasky.or.cz>
On Sun, 9 Jul 2006, Petr Baudis yowled:
> Hi,
>
> Dear diary, on Sun, Jul 09, 2006 at 12:48:22AM CEST, I got a letter
> where Nix <nix@esperi.org.uk> said that...
>> loki 593 /usr/packages/linux/linux% cg-diff | diffstat
>
> Note that cg-diff -s might be useful.
Indeed :)
>> loki 594 /usr/packages/linux/linux% cg-reset
>> loki 595 /usr/packages/linux/linux% cg-diff
>> loki 596 /usr/packages/linux/linux%
>
> ...but when you switch away and switch back, the uncommitted changes
> appear again?
Yes.
> Just in case, don't the tree happen to simply stay the same as in the
> branch you switched from? (Try cg-diff -r yourpreviousbranch.)
Yes. Also, that branch (which was forked recently from the misbehaving
one) claims that all changes are merged from that branch, but this is
demonstrably untrue.
> And most importantly, does this also happen with just stock 0.17.3
> cg-switch? With stock master cg-switch? (If both is no, you probably
> forgot to cherrypick some associated cg-switch bugfix or something.)
This is 0.17.3 cg-switch plus the seek speedup 40f8a28806a1c5a7cb1f7d137f1bb271b71f890f.
(I doubt that's to blame, but I've been wrong before.)
I think the oddity is related to git-cherry-pick somehow, but I'm
not sure how: I took the original upstream pack again, rebuilt the
branches from scratch and now I can't make the problem happen anymore.
If it happens again I'll keep the tree around and collect more data.
(I'll have to dig some more disk space up...)
--
`She *is*, however, one of the few sf authors with a last name ending in O,
which adds some extra appeal to those of us who obsess about things like
having a book review of an author for each letter in the alphabet.' -- rra
^ permalink raw reply
* Re: [RFC+PATCH 1/1] Move SCM interoperability tools into scm/
From: Ryan Anderson @ 2006-07-09 22:23 UTC (permalink / raw)
To: Petr Baudis; +Cc: Martin Langhoff, Ryan Anderson, git
In-Reply-To: <20060709221326.GU29115@pasky.or.cz>
On Mon, Jul 10, 2006 at 12:13:26AM +0200, Petr Baudis wrote:
> Dear diary, on Sun, Jul 09, 2006 at 11:26:59PM CEST, I got a letter
> where Martin Langhoff <martin.langhoff@gmail.com> said that...
> > So I have to ask... what are the expected benefits of the move?
>
> I've been meaning to do something like this for some time already; my
> itch have been the builtins. The tree size _is_ getting out of hand and
> a little more categorization of the sources would certainly help.
That's what I was thinking, as well, basically. I started with the "scm
interop" tools because they should be the least controversial to move
around.
> Although I'd take a different approach:
>
> libgit/
> builtin/
> standalone/
> scripts/
>
> > In any case, use /interop instead. /scm in the tree of an SCM could be
> > anything ;-)
>
> I agree on this point.
Very good point.
So these seem obvious to me:
libgit/ (maybe just lib/?)
builtin/
interop/
I'm less sure of the rest, but I'll poke at doing the above for the
moment, and worry about the rest later.
Comments on a way to make the Makefile less repetitive would be
appreciated, though.
--
Ryan Anderson
sometimes Pug Majere
^ permalink raw reply
* Re: git on HP-UX
From: Petr Baudis @ 2006-07-09 22:23 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Pavel Roskin, git
In-Reply-To: <7vfyhe465i.fsf@assigned-by-dhcp.cox.net>
Dear diary, on Fri, Jul 07, 2006 at 02:20:41AM CEST, I got a letter
where Junio C Hamano <junkio@cox.net> said that...
> > I hope the Autoconf based configure is on its way to git, but I don't
> > see in in the "pu" branch yet. I'm not very keen about reinventing
> > Autoconf and hacking a hand-made configure script.
>
> OK, you half-convinced me. The other half came from a recent
> series of patches to try using 'which' to detect executables,
> which is another common mistake handcrafted configure script
> makes, which autoconf people have solved for us long time ago.
Good! In fact, I have been a moderate autoconf fan and originally I have
meant the hand-crafted ./configure script partially just as a tease and
a nominal competitor for the autoconf one, so that we would for sure got
_some_ autoconfiguration mechanism (which is what I care about).
I have to admit that I have grown somewhat attached to my script over
time and I like it a lot more than the autoconf thing personally, but
then again I had no idea that we actually want to support such systems
like those with broken which...
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Snow falling on Perl. White noise covering line noise.
Hides all the bugs too. -- J. Putnam
^ permalink raw reply
* Re: [RFC+PATCH 1/1] Move SCM interoperability tools into scm/
From: Johannes Schindelin @ 2006-07-09 22:21 UTC (permalink / raw)
To: Petr Baudis; +Cc: Martin Langhoff, Ryan Anderson, git
In-Reply-To: <20060709221326.GU29115@pasky.or.cz>
Hi,
On Mon, 10 Jul 2006, Petr Baudis wrote:
> Dear diary, on Sun, Jul 09, 2006 at 11:26:59PM CEST, I got a letter
> where Martin Langhoff <martin.langhoff@gmail.com> said that...
> > So I have to ask... what are the expected benefits of the move?
>
> I've been meaning to do something like this for some time already; my
> itch have been the builtins. The tree size _is_ getting out of hand and
> a little more categorization of the sources would certainly help.
Funny. I thought the builtin-* prefix, and the *.sh and *.perl extensions
were there for the sake of categorization.
And I disagree on the "out of hand" thing.
Ciao,
Dscho
^ 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