Hello community,
here is the log from the commit of package git
checked in at Thu Oct 26 21:01:17 CEST 2006.
--------
--- git/git.changes 2006-10-20 15:49:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/git/git.changes 2006-10-26 14:56:51.000000000 +0200
@@ -1 +0,0 @@
-Thu Oct 19 02:14:05 CEST 2006 - pbaudis(a)suse.cz
@@ -2,0 +2,7 @@
+Thu Oct 26 14:56:47 CEST 2006 - pbaudis(a)suse.cz
+
+- Upgrade to git-1.4.3.3 - bugfixes release
+
+-------------------------------------------------------------------
+Thu Oct 19 02:14:05 CEST 2006 - pbaudis(a)suse.cz
+
@@ -8 +13,0 @@
-Tue Jul 25 08:43:27 CEST 2006 - pbaudis(a)suse.cz
@@ -9,0 +15 @@
+Tue Jul 25 08:43:27 CEST 2006 - pbaudis(a)suse.cz
@@ -19 +24,0 @@
-Mon May 15 01:04:34 CEST 2006 - pbaudis(a)suse.cz
@@ -20,0 +26 @@
+Mon May 15 01:04:34 CEST 2006 - pbaudis(a)suse.cz
Old:
----
git-1.4.3.tar.bz2
New:
----
git-1.4.3.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ git.spec ++++++
--- /var/tmp/diff_new_pack.86EosB/_old 2006-10-26 20:57:24.000000000 +0200
+++ /var/tmp/diff_new_pack.86EosB/_new 2006-10-26 20:57:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package git (Version 1.4.3)
+# spec file for package git (Version 1.4.3.3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
Name: git
BuildRequires: asciidoc curl-devel sgml-skel xmlto
-Version: 1.4.3
+Version: 1.4.3.3
Release: 1
Summary: git - a source code management tool
License: GNU General Public License (GPL) - all versions
@@ -215,6 +215,8 @@
%{perl_vendorarch}/auto/Git/
%changelog -n git
+* Thu Oct 26 2006 - pbaudis(a)suse.cz
+- Upgrade to git-1.4.3.3 - bugfixes release
* Thu Oct 19 2006 - pbaudis(a)suse.cz
- Update to git-1.4.3 - UI improvements, speedups, random new
features (e.g. git-daemon name-based virtual hosting support),
++++++ git-1.4.3.tar.bz2 -> git-1.4.3.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/Documentation/SubmittingPatches new/git-1.4.3.3/Documentation/SubmittingPatches
--- old/git-1.4.3/Documentation/SubmittingPatches 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/Documentation/SubmittingPatches 2006-10-26 00:43:31.000000000 +0200
@@ -101,8 +101,13 @@
is trivially correct or after the list reached a consensus, send
it "To:" the maintainer and optionally "cc:" the list.
+Also note that your maintainer does not actively involve himself in
+maintaining what are in contrib/ hierarchy. When you send fixes and
+enhancements to them, do not forget to "cc: " the person who primarily
+worked on that hierarchy in contrib/.
-(6) Sign your work
+
+(4) Sign your work
To improve tracking of who did what, we've borrowed the
"sign-off" procedure from the Linux kernel project on patches
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/Documentation/config.txt new/git-1.4.3.3/Documentation/config.txt
--- old/git-1.4.3/Documentation/config.txt 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/Documentation/config.txt 2006-10-26 00:43:31.000000000 +0200
@@ -230,6 +230,18 @@
pull.twohead::
The default merge strategy to use when pulling a single branch.
+remote.<name>.url::
+ The URL of a remote repository. See gitlink:git-fetch[1] or
+ gitlink:git-push[1].
+
+remote.<name>.fetch::
+ The default set of "refspec" for gitlink:git-fetch[1]. See
+ gitlink:git-fetch[1].
+
+remote.<name>.push::
+ The default set of "refspec" for gitlink:git-push[1]. See
+ gitlink:git-push[1].
+
show.difftree::
The default gitlink:git-diff-tree[1] arguments to be used
for gitlink:git-show[1].
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/Documentation/git-cherry.txt new/git-1.4.3.3/Documentation/git-cherry.txt
--- old/git-1.4.3/Documentation/git-cherry.txt 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/Documentation/git-cherry.txt 2006-10-26 00:43:31.000000000 +0200
@@ -14,8 +14,9 @@
The changeset (or "diff") of each commit between the fork-point and <head>
is compared against each commit between the fork-point and <upstream>.
-Every commit with a changeset that doesn't exist in the other branch
-has its id (sha1) reported, prefixed by a symbol. Those existing only
+Every commit that doesn't exist in the <upstream> branch
+has its id (sha1) reported, prefixed by a symbol. The ones that have
+equivalent change already
in the <upstream> branch are prefixed with a minus (-) sign, and those
that only exist in the <head> branch are prefixed with a plus (+) symbol.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/Documentation/git-rev-parse.txt new/git-1.4.3.3/Documentation/git-rev-parse.txt
--- old/git-1.4.3/Documentation/git-rev-parse.txt 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/Documentation/git-rev-parse.txt 2006-10-26 00:43:31.000000000 +0200
@@ -111,7 +111,9 @@
A revision parameter typically, but not necessarily, names a
commit object. They use what is called an 'extended SHA1'
-syntax.
+syntax. Here are various ways to spell object names. The
+ones listed near the end of this list are to name trees and
+blobs contained in a commit.
* The full SHA1 object name (40-byte hexadecimal string), or
a substring of such that is unique within the repository.
@@ -119,6 +121,9 @@
name the same commit object if there are no other object in
your repository whose object name starts with dae86e.
+* An output from `git-describe`; i.e. a closest tag, followed by a
+ dash, a 'g', and an abbreviated object name.
+
* A symbolic ref name. E.g. 'master' typically means the commit
object referenced by $GIT_DIR/refs/heads/master. If you
happen to have both heads/master and tags/master, you can
@@ -156,6 +161,15 @@
and dereference the tag recursively until a non-tag object is
found.
+* A suffix ':' followed by a path; this names the blob or tree
+ at the given path in the tree-ish object named by the part
+ before the colon.
+
+* A colon, optionally followed by a stage number (0 to 3) and a
+ colon, followed by a path; this names a blob object in the
+ index at the given path. Missing stage number (and the colon
+ that follows it) names an stage 0 entry.
+
Here is an illustration, by Jon Loeliger. Both node B and C are
a commit parents of commit node A. Parent commits are ordered
left-to-right.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/Documentation/git.txt new/git-1.4.3.3/Documentation/git.txt
--- old/git-1.4.3/Documentation/git.txt 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/Documentation/git.txt 2006-10-26 00:43:31.000000000 +0200
@@ -562,6 +562,9 @@
a valid head 'name'
(i.e. the contents of `$GIT_DIR/refs/heads/<head>`).
+For a more complete list of ways to spell object names, see
+"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+
File/Directory Structure
------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/Documentation/urls.txt new/git-1.4.3.3/Documentation/urls.txt
--- old/git-1.4.3/Documentation/urls.txt 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/Documentation/urls.txt 2006-10-26 00:43:31.000000000 +0200
@@ -51,6 +51,14 @@
respectively. Multiple `Push:` and `Pull:` lines may
be specified for additional branch mappings.
+Or, equivalently, in the `$GIT_DIR/config` (note the use
+of `fetch` instead of `Pull:`):
+
+[remote "<remote>"]
+ url = <url>
+ push = <refspec>
+ fetch = <refspec>
+
The name of a file in `$GIT_DIR/branches` directory can be
specified as an older notation short-hand; the named
file should contain a single line, a URL in one of the
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/builtin-apply.c new/git-1.4.3.3/builtin-apply.c
--- old/git-1.4.3/builtin-apply.c 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/builtin-apply.c 2006-10-26 00:43:31.000000000 +0200
@@ -934,6 +934,7 @@
switch (*line) {
default:
return -1;
+ case '\n': /* newer GNU diff, an empty context line */
case ' ':
oldlines--;
newlines--;
@@ -1623,6 +1624,14 @@
first = '-';
}
switch (first) {
+ case '\n':
+ /* Newer GNU diff, empty context line */
+ if (plen < 0)
+ /* ... followed by '\No newline'; nothing */
+ break;
+ old[oldsize++] = '\n';
+ new[newsize++] = '\n';
+ break;
case ' ':
case '-':
memcpy(old + oldsize, patch + 1, plen);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/builtin-prune-packed.c new/git-1.4.3.3/builtin-prune-packed.c
--- old/git-1.4.3/builtin-prune-packed.c 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/builtin-prune-packed.c 2006-10-26 00:43:31.000000000 +0200
@@ -4,9 +4,7 @@
static const char prune_packed_usage[] =
"git-prune-packed [-n]";
-static int dryrun;
-
-static void prune_dir(int i, DIR *dir, char *pathname, int len)
+static void prune_dir(int i, DIR *dir, char *pathname, int len, int dryrun)
{
struct dirent *de;
char hex[40];
@@ -31,7 +29,7 @@
rmdir(pathname);
}
-static void prune_packed_objects(void)
+void prune_packed_objects(int dryrun)
{
int i;
static char pathname[PATH_MAX];
@@ -50,7 +48,7 @@
d = opendir(pathname);
if (!d)
continue;
- prune_dir(i, d, pathname, len + 3);
+ prune_dir(i, d, pathname, len + 3, dryrun);
closedir(d);
}
}
@@ -58,6 +56,7 @@
int cmd_prune_packed(int argc, const char **argv, const char *prefix)
{
int i;
+ int dryrun = 0;
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
@@ -73,6 +72,6 @@
usage(prune_packed_usage);
}
sync();
- prune_packed_objects();
+ prune_packed_objects(dryrun);
return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/builtin-prune.c new/git-1.4.3.3/builtin-prune.c
--- old/git-1.4.3/builtin-prune.c 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/builtin-prune.c 2006-10-26 00:43:31.000000000 +0200
@@ -255,5 +255,7 @@
prune_object_dir(get_object_directory());
+ sync();
+ prune_packed_objects(show_only);
return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/builtin.h new/git-1.4.3.3/builtin.h
--- old/git-1.4.3/builtin.h 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/builtin.h 2006-10-26 00:43:31.000000000 +0200
@@ -11,6 +11,7 @@
extern int split_mbox(const char **mbox, const char *dir, int allow_bare, int nr_prec, int skip);
extern void stripspace(FILE *in, FILE *out);
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
+extern void prune_packed_objects(int);
extern int cmd_add(int argc, const char **argv, const char *prefix);
extern int cmd_apply(int argc, const char **argv, const char *prefix);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/contrib/emacs/vc-git.el new/git-1.4.3.3/contrib/emacs/vc-git.el
--- old/git-1.4.3/contrib/emacs/vc-git.el 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/contrib/emacs/vc-git.el 2006-10-26 00:43:31.000000000 +0200
@@ -23,7 +23,10 @@
;; system.
;;
;; To install: put this file on the load-path and add GIT to the list
-;; of supported backends in `vc-handled-backends'.
+;; of supported backends in `vc-handled-backends'; the following line,
+;; placed in your ~/.emacs, will accomplish this:
+;;
+;; (add-to-list 'vc-handled-backends 'GIT)
;;
;; TODO
;; - changelog generation
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/daemon.c new/git-1.4.3.3/daemon.c
--- old/git-1.4.3/daemon.c 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/daemon.c 2006-10-26 00:43:31.000000000 +0200
@@ -450,6 +450,8 @@
* Replace literal host with lowercase-ized hostname.
*/
hp = interp_table[INTERP_SLOT_HOST].value;
+ if (!hp)
+ return;
for ( ; *hp; hp++)
*hp = tolower(*hp);
@@ -544,8 +546,10 @@
loginfo("Extended attributes (%d bytes) exist <%.*s>",
(int) pktlen - len,
(int) pktlen - len, line + len + 1);
- if (len && line[len-1] == '\n')
+ if (len && line[len-1] == '\n') {
line[--len] = 0;
+ pktlen--;
+ }
/*
* Initialize the path interpolation table for this connection.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/git-branch.sh new/git-1.4.3.3/git-branch.sh
--- old/git-1.4.3/git-branch.sh 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/git-branch.sh 2006-10-26 00:43:31.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/sh
-USAGE='[-l] [(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]] | -r'
+USAGE='[-l] [-f] <branchname> [<start-point>] | (-d | -D) <branchname> | [-r]'
LONG_USAGE='If no arguments, show available branches and mark current branch with a star.
If one argument, create a new branch <branchname> based off of current HEAD.
If two arguments, create a new branch <branchname> based off of <start-point>.'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/git-cherry.sh new/git-1.4.3.3/git-cherry.sh
--- old/git-1.4.3/git-cherry.sh 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/git-cherry.sh 2006-10-26 00:43:31.000000000 +0200
@@ -12,8 +12,8 @@
Each commit between the fork-point (or <limit> if given) and <head> is
examined, and compared against the change each commit between the
fork-point and <upstream> introduces. If the change seems to be in
-the upstream, it is shown on the standard output with prefix "+".
-Otherwise it is shown with prefix "-".'
+the upstream, it is shown on the standard output with prefix "-".
+Otherwise it is shown with prefix "+".'
. git-sh-setup
case "$1" in -v) verbose=t; shift ;; esac
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/git-clone.sh new/git-1.4.3.3/git-clone.sh
--- old/git-1.4.3/git-clone.sh 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/git-clone.sh 2006-10-26 00:43:31.000000000 +0200
@@ -414,7 +414,8 @@
case "$no_checkout" in
'')
- git-read-tree -m -u -v HEAD HEAD
+ test "z$quiet" = z && v=-v || v=
+ git-read-tree -m -u $v HEAD HEAD
esac
fi
rm -f "$GIT_DIR/CLONE_HEAD" "$GIT_DIR/REMOTE_HEAD"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/git-fetch.sh new/git-1.4.3.3/git-fetch.sh
--- old/git-1.4.3/git-fetch.sh 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/git-fetch.sh 2006-10-26 00:43:31.000000000 +0200
@@ -287,6 +287,7 @@
# There are transports that can fetch only one head at a time...
case "$remote" in
http://* | https://* | ftp://*)
+ proto=`expr "$remote" : '\([^:]*\):'`
if [ -n "$GIT_SSL_NO_VERIFY" ]; then
curl_extra_args="-k"
fi
@@ -310,7 +311,7 @@
done
expr "z$head" : "z$_x40\$" >/dev/null ||
die "Failed to fetch $remote_name from $remote"
- echo >&2 Fetching "$remote_name from $remote" using http
+ echo >&2 "Fetching $remote_name from $remote using $proto"
git-http-fetch -v -a "$head" "$remote/" || exit
;;
rsync://*)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/git-merge.sh new/git-1.4.3.3/git-merge.sh
--- old/git-1.4.3/git-merge.sh 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/git-merge.sh 2006-10-26 00:43:31.000000000 +0200
@@ -93,6 +93,8 @@
esac
}
+case "$#" in 0) usage ;; esac
+
rloga=
while case "$#" in 0) break ;; esac
do
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/git-svn.perl new/git-1.4.3.3/git-svn.perl
--- old/git-1.4.3/git-svn.perl 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/git-svn.perl 2006-10-26 00:43:31.000000000 +0200
@@ -1501,10 +1501,13 @@
apply_mod_line_blob($m);
svn_check_prop_executable($m);
} elsif ($m->{chg} eq 'T') {
- sys(qw(svn rm --force),$m->{file_b});
- apply_mod_line_blob($m);
- sys(qw(svn add), $m->{file_b});
svn_check_prop_executable($m);
+ apply_mod_line_blob($m);
+ if ($m->{mode_a} =~ /^120/ && $m->{mode_b} !~ /^120/) {
+ sys(qw(svn propdel svn:special), $m->{file_b});
+ } else {
+ sys(qw(svn propset svn:special *),$m->{file_b});
+ }
} elsif ($m->{chg} eq 'A') {
svn_ensure_parent_path( $m->{file_b} );
apply_mod_line_blob($m);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/git.spec new/git-1.4.3.3/git.spec
--- old/git-1.4.3/git.spec 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/git.spec 2006-10-26 00:43:31.000000000 +0200
@@ -1,6 +1,6 @@
# Pass --without docs to rpmbuild if you don't want the documentation
Name: git
-Version: 1.4.3
+Version: 1.4.3.3
Release: 1%{?dist}
Summary: Git core and tools
License: GPL
@@ -96,10 +96,10 @@
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
-(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
%if %{!?_without_docs:1}0
-(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
%else
rm -rf $RPM_BUILD_ROOT%{_mandir}
%endif
@@ -126,10 +126,10 @@
%files arch
%defattr(-,root,root)
-%doc Documentation/*arch*.txt
-%{_bindir}/*arch*
-%{!?_without_docs: %{_mandir}/man1/*arch*.1*}
-%{!?_without_docs: %doc Documentation/*arch*.html }
+%doc Documentation/git-archimport.txt
+%{_bindir}/git-archimport
+%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
+%{!?_without_docs: %doc Documentation/git-archimport.html }
%files email
%defattr(-,root,root)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/git.spec.in new/git-1.4.3.3/git.spec.in
--- old/git-1.4.3/git.spec.in 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/git.spec.in 2006-10-26 00:43:31.000000000 +0200
@@ -96,10 +96,10 @@
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
-(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
%if %{!?_without_docs:1}0
-(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
%else
rm -rf $RPM_BUILD_ROOT%{_mandir}
%endif
@@ -126,10 +126,10 @@
%files arch
%defattr(-,root,root)
-%doc Documentation/*arch*.txt
-%{_bindir}/*arch*
-%{!?_without_docs: %{_mandir}/man1/*arch*.1*}
-%{!?_without_docs: %doc Documentation/*arch*.html }
+%doc Documentation/git-archimport.txt
+%{_bindir}/git-archimport
+%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
+%{!?_without_docs: %doc Documentation/git-archimport.html }
%files email
%defattr(-,root,root)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/gitweb/gitweb.perl new/git-1.4.3.3/gitweb/gitweb.perl
--- old/git-1.4.3/gitweb/gitweb.perl 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/gitweb/gitweb.perl 2006-10-26 00:43:31.000000000 +0200
@@ -1009,12 +1009,11 @@
if (defined $commit_text) {
@commit_lines = @$commit_text;
} else {
- $/ = "\0";
+ local $/ = "\0";
open my $fd, "-|", git_cmd(), "rev-list", "--header", "--parents", "--max-count=1", $commit_id
or return;
@commit_lines = split '\n', <$fd>;
close $fd or return;
- $/ = "\n";
pop @commit_lines;
}
my $header = shift @commit_lines;
@@ -1671,13 +1670,13 @@
if ($t->{'type'} eq "blob") {
print "<td class=\"list\">" .
$cgi->a({-href => href(action=>"blob", hash=>$t->{'hash'},
- file_name=>"$basedir$t->{'name'}", %base_key),
- -class => "list"}, esc_html($t->{'name'})) . "</td>\n";
+ file_name=>"$basedir$t->{'name'}", %base_key),
+ -class => "list"}, esc_html($t->{'name'})) . "</td>\n";
print "<td class=\"link\">";
if ($have_blame) {
print $cgi->a({-href => href(action=>"blame", hash=>$t->{'hash'},
- file_name=>"$basedir$t->{'name'}", %base_key)},
- "blame");
+ file_name=>"$basedir$t->{'name'}", %base_key)},
+ "blame");
}
if (defined $hash_base) {
if ($have_blame) {
@@ -1689,8 +1688,8 @@
}
print " | " .
$cgi->a({-href => href(action=>"blob_plain", hash_base=>$hash_base,
- file_name=>"$basedir$t->{'name'}")},
- "raw");
+ file_name=>"$basedir$t->{'name'}")},
+ "raw");
print "</td>\n";
} elsif ($t->{'type'} eq "tree") {
@@ -1758,7 +1757,7 @@
print "<td>";
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
hash_base=>$hash, file_name=>$diff{'file'}),
- -class => "list"}, esc_html($diff{'file'}));
+ -class => "list"}, esc_html($diff{'file'}));
print "</td>\n";
print "<td>$mode_chng</td>\n";
print "<td class=\"link\">";
@@ -1785,11 +1784,11 @@
print " | ";
}
print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
- file_name=>$diff{'file'})},
- "blame") . " | ";
+ file_name=>$diff{'file'})},
+ "blame") . " | ";
print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
- file_name=>$diff{'file'})},
- "history");
+ file_name=>$diff{'file'})},
+ "history");
print "</td>\n";
} elsif ($diff{'status'} eq "M" || $diff{'status'} eq "T") { # modified, or type changed
@@ -1810,8 +1809,8 @@
}
print "<td>";
print $cgi->a({-href => href(action=>"blob", hash=>$diff{'to_id'},
- hash_base=>$hash, file_name=>$diff{'file'}),
- -class => "list"}, esc_html($diff{'file'}));
+ hash_base=>$hash, file_name=>$diff{'file'}),
+ -class => "list"}, esc_html($diff{'file'}));
print "</td>\n";
print "<td>$mode_chnge</td>\n";
print "<td class=\"link\">";
@@ -1822,19 +1821,19 @@
print $cgi->a({-href => "#patch$patchno"}, "patch");
} else {
print $cgi->a({-href => href(action=>"blobdiff",
- hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
- hash_base=>$hash, hash_parent_base=>$parent,
- file_name=>$diff{'file'})},
- "diff");
+ hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
+ hash_base=>$hash, hash_parent_base=>$parent,
+ file_name=>$diff{'file'})},
+ "diff");
}
print " | ";
}
print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
- file_name=>$diff{'file'})},
- "blame") . " | ";
+ file_name=>$diff{'file'})},
+ "blame") . " | ";
print $cgi->a({-href => href(action=>"history", hash_base=>$hash,
- file_name=>$diff{'file'})},
- "history");
+ file_name=>$diff{'file'})},
+ "history");
print "</td>\n";
} elsif ($diff{'status'} eq "R" || $diff{'status'} eq "C") { # renamed or copied
@@ -1862,19 +1861,19 @@
print $cgi->a({-href => "#patch$patchno"}, "patch");
} else {
print $cgi->a({-href => href(action=>"blobdiff",
- hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
- hash_base=>$hash, hash_parent_base=>$parent,
- file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
- "diff");
+ hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
+ hash_base=>$hash, hash_parent_base=>$parent,
+ file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
+ "diff");
}
print " | ";
}
print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
- file_name=>$diff{'from_file'})},
- "blame") . " | ";
+ file_name=>$diff{'from_file'})},
+ "blame") . " | ";
print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
- file_name=>$diff{'from_file'})},
- "history");
+ file_name=>$diff{'from_file'})},
+ "history");
print "</td>\n";
} # we should not encounter Unmerged (U) or Unknown (X) status
@@ -2783,7 +2782,7 @@
my $refs = git_get_references();
my $ref = format_ref_marker($refs, $hash_base);
git_header_html();
- my $base = "";
+ my $basedir = '';
my ($have_blame) = gitweb_check_feature('blame');
if (defined $hash_base && (my %co = parse_commit($hash_base))) {
my @views_nav = ();
@@ -2800,7 +2799,7 @@
# FIXME: Should be available when we have no hash base as well.
push @views_nav,
$cgi->a({-href => href(action=>"snapshot", hash=>$hash)},
- "snapshot");
+ "snapshot");
}
git_print_page_nav('tree','', $hash_base, undef, undef, join(' | ', @views_nav));
git_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash_base);
@@ -2811,7 +2810,10 @@
print "<div class=\"title\">$hash</div>\n";
}
if (defined $file_name) {
- $base = esc_html("$file_name/");
+ $basedir = $file_name;
+ if ($basedir ne '' && substr($basedir, -1) ne '/') {
+ $basedir .= '/';
+ }
}
git_print_page_path($file_name, 'tree', $hash_base);
print "<div class=\"page_body\">\n";
@@ -2827,7 +2829,7 @@
}
$alternate ^= 1;
- git_print_tree_entry(\%t, $base, $hash_base, $have_blame);
+ git_print_tree_entry(\%t, $basedir, $hash_base, $have_blame);
print "</tr>\n";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/pager.c new/git-1.4.3.3/pager.c
--- old/git-1.4.3/pager.c 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/pager.c 2006-10-26 00:43:31.000000000 +0200
@@ -50,7 +50,7 @@
close(fd[0]);
close(fd[1]);
- setenv("LESS", "-RS", 0);
+ setenv("LESS", "FRSX", 0);
run_pager(pager);
die("unable to execute pager '%s'", pager);
exit(255);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/sha1_file.c new/git-1.4.3.3/sha1_file.c
--- old/git-1.4.3/sha1_file.c 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/sha1_file.c 2006-10-26 00:43:31.000000000 +0200
@@ -908,7 +908,7 @@
if (sizep) {
const unsigned char *data;
- unsigned char delta_head[64];
+ unsigned char delta_head[20];
unsigned long result_size;
z_stream stream;
int st;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/sha1_name.c new/git-1.4.3.3/sha1_name.c
--- old/git-1.4.3/sha1_name.c 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/sha1_name.c 2006-10-26 00:43:31.000000000 +0200
@@ -157,7 +157,7 @@
char canonical[40];
unsigned char res[20];
- if (len < MINIMUM_ABBREV)
+ if (len < MINIMUM_ABBREV || len > 40)
return -1;
hashclr(res);
memset(canonical, 'x', 40);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/show-index.c new/git-1.4.3.3/show-index.c
--- old/git-1.4.3/show-index.c 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/show-index.c 2006-10-26 00:43:31.000000000 +0200
@@ -8,7 +8,7 @@
static unsigned int top_index[256];
if (fread(top_index, sizeof(top_index), 1, stdin) != 1)
- die("unable to read idex");
+ die("unable to read index");
nr = 0;
for (i = 0; i < 256; i++) {
unsigned n = ntohl(top_index[i]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/t/t4118-apply-empty-context.sh new/git-1.4.3.3/t/t4118-apply-empty-context.sh
--- old/git-1.4.3/t/t4118-apply-empty-context.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/git-1.4.3.3/t/t4118-apply-empty-context.sh 2006-10-26 00:43:31.000000000 +0200
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Junio C Hamano
+#
+
+test_description='git-apply with new style GNU diff with empty context
+
+'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ {
+ echo; echo;
+ echo A; echo B; echo C;
+ echo;
+ } >file1 &&
+ cat file1 >file1.orig &&
+ {
+ cat file1 &&
+ echo Q | tr -d "\\012"
+ } >file2 &&
+ cat file2 >file2.orig
+ git add file1 file2 &&
+ sed -e "/^B/d" <file1.orig >file1 &&
+ sed -e "/^B/d" <file2.orig >file2 &&
+ cat file1 >file1.mods &&
+ cat file2 >file2.mods &&
+ git diff |
+ sed -e "s/^ \$//" >diff.output
+'
+
+test_expect_success 'apply --numstat' '
+
+ git apply --numstat diff.output >actual &&
+ {
+ echo "0 1 file1" &&
+ echo "0 1 file2"
+ } >expect &&
+ diff -u expect actual
+
+'
+
+test_expect_success 'apply --apply' '
+
+ cat file1.orig >file1 &&
+ cat file2.orig >file2 &&
+ git update-index file1 file2 &&
+ git apply --index diff.output &&
+ diff -u file1.mods file1 &&
+ diff -u file2.mods file2
+'
+
+test_done
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/t/test-lib.sh new/git-1.4.3.3/t/test-lib.sh
--- old/git-1.4.3/t/test-lib.sh 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/t/test-lib.sh 2006-10-26 00:43:31.000000000 +0200
@@ -207,7 +207,8 @@
# t/ subdirectory and are run in trash subdirectory.
PATH=$(pwd)/..:$PATH
GIT_EXEC_PATH=$(pwd)/..
-export PATH GIT_EXEC_PATH
+HOME=$(pwd)/trash
+export PATH GIT_EXEC_PATH HOME
# Similarly use ../compat/subprocess.py if our python does not
# have subprocess.py on its own.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/version new/git-1.4.3.3/version
--- old/git-1.4.3/version 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/version 2006-10-26 00:43:31.000000000 +0200
@@ -1 +1 @@
-1.4.3
+1.4.3.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/git-1.4.3/xdiff/xemit.c new/git-1.4.3.3/xdiff/xemit.c
--- old/git-1.4.3/xdiff/xemit.c 2006-10-19 01:32:58.000000000 +0200
+++ new/git-1.4.3.3/xdiff/xemit.c 2006-10-26 00:43:31.000000000 +0200
@@ -86,11 +86,10 @@
if (len > 0 &&
(isalpha((unsigned char)*rec) || /* identifier? */
*rec == '_' || /* also identifier? */
- *rec == '(' || /* lisp defun? */
- *rec == '#')) { /* #define? */
+ *rec == '$')) { /* mysterious GNU diff's invention */
if (len > sz)
len = sz;
- if (len && rec[len - 1] == '\n')
+ while (0 < len && isspace((unsigned char)rec[len - 1]))
len--;
memcpy(buf, rec, len);
*ll = len;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
