diff --git a/git-1.6.2.1.tar.bz2 b/git-1.6.2.1.tar.bz2 deleted file mode 100644 index 35c9d8f..0000000 --- a/git-1.6.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:519a4a137b282771297f9991ec231301106d4e35420e92345f92a8e82933a79c -size 2017208 diff --git a/git-1.6.2.3.tar.bz2 b/git-1.6.2.3.tar.bz2 new file mode 100644 index 0000000..f841e9a --- /dev/null +++ b/git-1.6.2.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c61eaf1c775b56b1421d1f53e4cd4f1eb9a0fd874d653f4810db126cf14651ba +size 2017249 diff --git a/git-daemon.init b/git-daemon.init index 6add7b6..9399cf6 100644 --- a/git-daemon.init +++ b/git-daemon.init @@ -32,11 +32,6 @@ # Description: server for git repositories ### END INIT INFO -git=/usr/bin/git -test -x $git|| { echo "GIT not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } - if test -x /usr/lib64/git/git-daemon; then git_daemon=/usr/lib64/git/git-daemon elif test -x /usr/lib/git/git-daemon; then @@ -50,6 +45,8 @@ else fi fi +pidfile=/var/run/git-daemon.pid + # Check for existence of needed config file and read it git_daemon_config=/etc/sysconfig/git-daemon test -r $git_daemon_config || { echo "$git_daemon_config not existing"; @@ -69,13 +66,13 @@ rc_reset case "$1" in start) echo -n "Starting git-daemon " - /sbin/start_daemon $git daemon \ + /sbin/startproc -p $pidfile $git_daemon \ --syslog \ --detach \ --reuseaddr \ --user=git-daemon \ --group=nogroup \ - --pid-file=/var/run/git-daemon.pid \ + --pid-file=$pidfile \ --base-path="$GIT_DAEMON_BASE_PATH" \ $GIT_DAEMON_ARGS @@ -83,7 +80,7 @@ case "$1" in ;; stop) echo -n "Shutting down git-daemon " - /sbin/killproc -p /var/run/git-daemon.pid $git_daemon -TERM + /sbin/killproc -p $pidfile $git_daemon -TERM rc_status -v ;; try-restart|condrestart) @@ -119,11 +116,11 @@ case "$1" in ;; status) echo -n "Checking for service git-daemon " - /sbin/checkproc $git_daemon + /sbin/checkproc -p $pidfile $git_daemon rc_status -v ;; probe) - test $git_daemon_config -nt /var/run/git-daemon.pid && echo reload + test $git_daemon_config -nt $pidfile && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" diff --git a/git.changes b/git.changes index 972de0b..91c3849 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Thu Apr 16 11:02:04 CEST 2009 - tiwai@suse.de + +- updated to 1.6.2.2: + * A longstanding confusing description of what --pickaxe option + of git-diff does has been clarified in the documentation. + * "git-blame -S" did not quite work near the commits that were + given on the command line correctly. + * "git diff --pickaxe-regexp" did not count overlapping matches + correctly. + * "git diff" did not feed files in work-tree representation to + external diff and textconv. + * "git-fetch" in a repository that was not cloned from anywhere + said it cannot find 'origin', which was hard to understand for + new people. + * "git-format-patch --numbered-files --stdout" did not have to + die of incompatible options; it now simply ignores + --numbered-files as no files are produced anyway. + * "git-ls-files --deleted" did not work well with GIT_DIR&GIT_WORK_TREE. + * "git-read-tree A B C..." without -m option has been broken for + a long time. + * git-send-email ignored --in-reply-to when --no-thread was given. + * 'git-submodule add' did not tolerate extra slashes and ./ in + the path it accepted from the command line; it now is more lenient. + * git-svn misbehaved when the project contained a path that began + with two dashes. + * import-zips script (in contrib) did not compute the common + directory prefix correctly. + * miscompilation of negated enum constants by old gcc (2.9) + affected the codepaths to spawn subprocesses. +- updated to 1.6.2.3: + * Setting an octal mode value to core.sharedrepository + configuration to restrict access to the repository to group + members did not work as advertised. + * A fairly large and trivial memory leak while rev-list shows + list of reachable objects has been identified and plugged. + * "git-commit --interactive" did not abort when underlying + "git-add -i" signaled a failure. + * git-repack (invoked from git-gc) did not work as nicely as it + should in a repository that borrows objects from neighbours + via alternates mechanism especially when some packs are marked + with the ".keep" flag to prevent them from being repacked. +- fix the start-check in git-daemon script (bnc#494824) + ------------------------------------------------------------------- Mon Mar 16 09:50:24 CET 2009 - tiwai@suse.de diff --git a/git.spec b/git.spec index e9fe265..5abe70e 100644 --- a/git.spec +++ b/git.spec @@ -1,5 +1,5 @@ # -# spec file for package git (Version 1.6.2.1) +# spec file for package git (Version 1.6.2.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -36,7 +36,7 @@ BuildRequires: libopenssl-devel %endif BuildRequires: sgml-skel BuildRequires: xmlto -Version: 1.6.2.1 +Version: 1.6.2.3 Release: 1 Summary: Fast, scalable, distributed revision control system License: GPL v2 or later @@ -420,6 +420,47 @@ fi /etc/bash_completion.d/git.sh %changelog +* Thu Apr 16 2009 tiwai@suse.de +- updated to 1.6.2.2: + * A longstanding confusing description of what --pickaxe option + of git-diff does has been clarified in the documentation. + * "git-blame -S" did not quite work near the commits that were + given on the command line correctly. + * "git diff --pickaxe-regexp" did not count overlapping matches + correctly. + * "git diff" did not feed files in work-tree representation to + external diff and textconv. + * "git-fetch" in a repository that was not cloned from anywhere + said it cannot find 'origin', which was hard to understand for + new people. + * "git-format-patch --numbered-files --stdout" did not have to + die of incompatible options; it now simply ignores + --numbered-files as no files are produced anyway. + * "git-ls-files --deleted" did not work well with GIT_DIR&GIT_WORK_TREE. + * "git-read-tree A B C..." without -m option has been broken for + a long time. + * git-send-email ignored --in-reply-to when --no-thread was given. + * 'git-submodule add' did not tolerate extra slashes and ./ in + the path it accepted from the command line; it now is more lenient. + * git-svn misbehaved when the project contained a path that began + with two dashes. + * import-zips script (in contrib) did not compute the common + directory prefix correctly. + * miscompilation of negated enum constants by old gcc (2.9) + affected the codepaths to spawn subprocesses. +- updated to 1.6.2.3: + * Setting an octal mode value to core.sharedrepository + configuration to restrict access to the repository to group + members did not work as advertised. + * A fairly large and trivial memory leak while rev-list shows + list of reachable objects has been identified and plugged. + * "git-commit --interactive" did not abort when underlying + "git-add -i" signaled a failure. + * git-repack (invoked from git-gc) did not work as nicely as it + should in a repository that borrows objects from neighbours + via alternates mechanism especially when some packs are marked + with the ".keep" flag to prevent them from being repacked. +- fix the start-check in git-daemon script (bnc#494824) * Mon Mar 16 2009 tiwai@suse.de - updated to 1.6.2.1: * .gitignore learned to handle backslash as a quoting mechanism @@ -603,7 +644,7 @@ fi * Wed Aug 06 2008 anosek@suse.cz - fixed Add git xinetd.d file for ability to use yast2 (bnc#398361) - created file git.xinetd to run git under xinetd daemon -* Tue Jun 24 2008 dmueller@suse.de +* Wed Jun 25 2008 dmueller@suse.de - update to 1.5.6: * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.txt * Mon Jun 16 2008 lnussel@suse.de @@ -698,7 +739,7 @@ fi - Update to 1.5.2.3: * fix many segfaults with the SVN gateway * various bugfixes -* Thu May 17 2007 dmueller@suse.de +* Fri May 18 2007 dmueller@suse.de - Update to 1.5.1.4: * GIT <-> SVN gateway * New porcelain, much improved index handling @@ -748,7 +789,7 @@ fi (former does not exist) * Fri Mar 10 2006 pbaudis@suse.cz - Add Olaf Hering's patch for easier cut'n'pasting. -* Tue Mar 07 2006 pbaudis@suse.cz +* Wed Mar 08 2006 pbaudis@suse.cz - Update to git-core 1.2.4. - This is a security fix: there was a buffer overflow when checking out a tree with an insanely long symlink. (No Bugzilla id.) @@ -756,7 +797,7 @@ fi - converted neededforbuild to BuildRequires * Tue Jan 17 2006 pbaudis@suse.cz - Fix the specfile build (no expat and asciidoc, xmlto problems) -* Mon Jan 16 2006 pbaudis@suse.cz +* Tue Jan 17 2006 pbaudis@suse.cz - Update to git-core 1.1.3. - Modify the specfile so that it looks more like the stock one. - Split bits to subpackages