Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2013-06-17 10:08:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git" Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2013-05-27 10:18:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2013-06-17 10:08:27.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jun 17 02:06:21 UTC 2013 - [email protected] + +- updated to version 1.8.3.1: + * bug fixes and documentation updates + + more details, please see here: + https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.3.1.txt + +------------------------------------------------------------------- Old: ---- git-1.8.3.tar.gz New: ---- git-1.8.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.XUwQ5i/_old 2013-06-17 10:08:28.000000000 +0200 +++ /var/tmp/diff_new_pack.XUwQ5i/_new 2013-06-17 10:08:28.000000000 +0200 @@ -20,7 +20,7 @@ %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services Name: git -Version: 1.8.3 +Version: 1.8.3.1 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 ++++++ git-1.8.3.tar.gz -> git-1.8.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/Documentation/RelNotes/1.8.3.1.txt new/git-1.8.3.1/Documentation/RelNotes/1.8.3.1.txt --- old/git-1.8.3/Documentation/RelNotes/1.8.3.1.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/git-1.8.3.1/Documentation/RelNotes/1.8.3.1.txt 2013-06-10 22:01:55.000000000 +0200 @@ -0,0 +1,14 @@ +Git v1.8.3.1 Release Notes +======================== + +Fixes since v1.8.3 +------------------ + + * When $HOME is misconfigured to point at an unreadable directory, we + used to complain and die. The check has been loosened. + + * Handling of negative exclude pattern for directories "!dir" was + broken in the update to v1.8.3. + +Also contains a handful of trivial code clean-ups, documentation +updates, updates to the test suite, etc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/Documentation/diff-options.txt new/git-1.8.3.1/Documentation/diff-options.txt --- old/git-1.8.3/Documentation/diff-options.txt 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/Documentation/diff-options.txt 2013-06-10 22:01:55.000000000 +0200 @@ -480,7 +480,7 @@ --ignore-submodules[=<when>]:: Ignore changes to submodules in the diff generation. <when> can be - either "none", "untracked", "dirty" or "all", which is the default + either "none", "untracked", "dirty" or "all", which is the default. Using "none" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/Documentation/git.txt new/git-1.8.3.1/Documentation/git.txt --- old/git-1.8.3/Documentation/git.txt 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/Documentation/git.txt 2013-06-10 22:01:55.000000000 +0200 @@ -43,6 +43,12 @@ branch of the `git.git` repository. Documentation for older releases are available here: +* link:v1.8.3.1/git.html[documentation for release 1.8.3.1] + +* release notes for + link:RelNotes/1.8.3.1.txt[1.8.3.1], + link:RelNotes/1.8.3.txt[1.8.3]. + * link:v1.8.2.3/git.html[documentation for release 1.8.2.3] * release notes for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/Documentation/gitrepository-layout.txt new/git-1.8.3.1/Documentation/gitrepository-layout.txt --- old/git-1.8.3/Documentation/gitrepository-layout.txt 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/Documentation/gitrepository-layout.txt 2013-06-10 22:01:55.000000000 +0200 @@ -211,6 +211,9 @@ and maintained by shallow clone mechanism. See `--depth` option to linkgit:git-clone[1] and linkgit:git-fetch[1]. +modules:: + Contains the git-repositories of the submodules. + SEE ALSO -------- linkgit:git-init[1], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/GIT-VERSION-GEN new/git-1.8.3.1/GIT-VERSION-GEN --- old/git-1.8.3/GIT-VERSION-GEN 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/GIT-VERSION-GEN 2013-06-10 22:01:55.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.8.3-rc3 +DEF_VER=v1.8.3.1 LF=' ' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/RelNotes new/git-1.8.3.1/RelNotes --- old/git-1.8.3/RelNotes 2013-06-17 10:08:29.000000000 +0200 +++ new/git-1.8.3.1/RelNotes 2013-06-17 10:08:29.000000000 +0200 @@ -1 +1 @@ -symbolic link to Documentation/RelNotes/1.8.3.txt +symbolic link to Documentation/RelNotes/1.8.3.1.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/builtin/config.c new/git-1.8.3.1/builtin/config.c --- old/git-1.8.3/builtin/config.c 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/builtin/config.c 2013-06-10 22:01:55.000000000 +0200 @@ -379,8 +379,8 @@ */ die("$HOME not set"); - if (access_or_warn(user_config, R_OK) && - xdg_config && !access_or_warn(xdg_config, R_OK)) + if (access_or_warn(user_config, R_OK, 0) && + xdg_config && !access_or_warn(xdg_config, R_OK, 0)) given_config_file = xdg_config; else given_config_file = user_config; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/compat/mingw.c new/git-1.8.3.1/compat/mingw.c --- old/git-1.8.3/compat/mingw.c 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/compat/mingw.c 2013-06-10 22:01:55.000000000 +0200 @@ -1677,14 +1677,16 @@ #undef signal sig_handler_t mingw_signal(int sig, sig_handler_t handler) { - sig_handler_t old = timer_fn; + sig_handler_t old; switch (sig) { case SIGALRM: + old = timer_fn; timer_fn = handler; break; case SIGINT: + old = sigint_fn; sigint_fn = handler; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/config.c new/git-1.8.3.1/config.c --- old/git-1.8.3/config.c 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/config.c 2013-06-10 22:01:55.000000000 +0200 @@ -58,7 +58,7 @@ path = buf.buf; } - if (!access_or_die(path, R_OK)) { + if (!access_or_die(path, R_OK, 0)) { if (++inc->depth > MAX_INCLUDE_DEPTH) die(include_depth_advice, MAX_INCLUDE_DEPTH, path, cf && cf->name ? cf->name : "the command line"); @@ -954,23 +954,23 @@ home_config_paths(&user_config, &xdg_config, "config"); - if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK)) { + if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0)) { ret += git_config_from_file(fn, git_etc_gitconfig(), data); found += 1; } - if (xdg_config && !access_or_die(xdg_config, R_OK)) { + if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK)) { ret += git_config_from_file(fn, xdg_config, data); found += 1; } - if (user_config && !access_or_die(user_config, R_OK)) { + if (user_config && !access_or_die(user_config, R_OK, ACCESS_EACCES_OK)) { ret += git_config_from_file(fn, user_config, data); found += 1; } - if (repo_config && !access_or_die(repo_config, R_OK)) { + if (repo_config && !access_or_die(repo_config, R_OK, 0)) { ret += git_config_from_file(fn, repo_config, data); found += 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/configure new/git-1.8.3.1/configure --- old/git-1.8.3/configure 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/configure 2013-06-10 22:01:55.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for git 1.8.3. +# Generated by GNU Autoconf 2.67 for git 1.8.3.1. # # Report bugs to <[email protected]>. # @@ -552,8 +552,8 @@ # Identity of this package. PACKAGE_NAME='git' PACKAGE_TARNAME='git' -PACKAGE_VERSION='1.8.3' -PACKAGE_STRING='git 1.8.3' +PACKAGE_VERSION='1.8.3.1' +PACKAGE_STRING='git 1.8.3.1' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1224,7 +1224,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures git 1.8.3 to adapt to many kinds of systems. +\`configure' configures git 1.8.3.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1285,7 +1285,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of git 1.8.3:";; + short | recursive ) echo "Configuration of git 1.8.3.1:";; esac cat <<\_ACEOF @@ -1424,7 +1424,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -git configure 1.8.3 +git configure 1.8.3.1 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1904,7 +1904,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by git $as_me 1.8.3, which was +It was created by git $as_me 1.8.3.1, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -7083,7 +7083,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by git $as_me 1.8.3, which was +This file was extended by git $as_me 1.8.3.1, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7140,7 +7140,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -git config.status 1.8.3 +git config.status 1.8.3.1 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/dir.c new/git-1.8.3.1/dir.c --- old/git-1.8.3/dir.c 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/dir.c 2013-06-10 22:01:55.000000000 +0200 @@ -821,6 +821,9 @@ dir->basebuf, stk->baselen - 1, dir->basebuf + current, &dt); dir->basebuf[stk->baselen - 1] = '/'; + if (dir->exclude && + dir->exclude->flags & EXC_FLAG_NEGATIVE) + dir->exclude = NULL; if (dir->exclude) { dir->basebuf[stk->baselen] = 0; dir->exclude_stack = stk; @@ -1542,9 +1545,9 @@ home_config_paths(NULL, &xdg_path, "ignore"); excludes_file = xdg_path; } - if (!access_or_warn(path, R_OK)) + if (!access_or_warn(path, R_OK, 0)) add_excludes_from_file(dir, path); - if (excludes_file && !access_or_warn(excludes_file, R_OK)) + if (excludes_file && !access_or_warn(excludes_file, R_OK, 0)) add_excludes_from_file(dir, excludes_file); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/git-compat-util.h new/git-1.8.3.1/git-compat-util.h --- old/git-1.8.3/git-compat-util.h 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/git-compat-util.h 2013-06-10 22:01:55.000000000 +0200 @@ -692,8 +692,9 @@ * Call access(2), but warn for any error except "missing file" * (ENOENT or ENOTDIR). */ -int access_or_warn(const char *path, int mode); -int access_or_die(const char *path, int mode); +#define ACCESS_EACCES_OK (1U << 0) +int access_or_warn(const char *path, int mode, unsigned flag); +int access_or_die(const char *path, int mode, unsigned flag); /* Warn on an inaccessible file that ought to be accessible */ void warn_on_inaccessible(const char *path); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/git.spec new/git-1.8.3.1/git.spec --- old/git-1.8.3/git.spec 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/git.spec 2013-06-10 22:01:55.000000000 +0200 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git -Version: 1.8.3 +Version: 1.8.3.1 Release: 1%{?dist} Summary: Core git tools License: GPL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/sha1_file.c new/git-1.8.3.1/sha1_file.c --- old/git-1.8.3/sha1_file.c 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/sha1_file.c 2013-06-10 22:01:55.000000000 +0200 @@ -2138,7 +2138,7 @@ if (!data) die("failed to apply delta"); - free (delta_data); + free(delta_data); } *final_type = type; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/submodule.c new/git-1.8.3.1/submodule.c --- old/git-1.8.3/submodule.c 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/submodule.c 2013-06-10 22:01:55.000000000 +0200 @@ -603,9 +603,8 @@ if (!work_tree) goto out; - if (!the_index.initialized) - if (read_cache() < 0) - die("index file corrupt"); + if (read_cache() < 0) + die("index file corrupt"); argv_array_push(&argv, "fetch"); for (i = 0; i < options->argc; i++) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/t/README new/git-1.8.3.1/t/README --- old/git-1.8.3/t/README 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/t/README 2013-06-10 22:01:55.000000000 +0200 @@ -324,6 +324,9 @@ use 'test_must_fail git cmd'. This will signal a failure if git dies in an unexpected way (e.g. segfault). + On the other hand, don't use test_must_fail for running regular + platform commands; just use '! cmd'. + - use perl without spelling it as "$PERL_PATH". This is to help our friends on Windows where the platform Perl often adds CR before the end of line, and they bundle Git with a version of Perl that diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/t/t3001-ls-files-others-exclude.sh new/git-1.8.3.1/t/t3001-ls-files-others-exclude.sh --- old/git-1.8.3/t/t3001-ls-files-others-exclude.sh 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/t/t3001-ls-files-others-exclude.sh 2013-06-10 22:01:55.000000000 +0200 @@ -175,6 +175,24 @@ grep "^a.1" output ' +test_expect_success 'excluded directory overrides content patterns' ' + + git ls-files --others --exclude="one" --exclude="!one/a.1" >output && + if grep "^one/a.1" output + then + false + fi +' + +test_expect_success 'negated directory doesn'\''t affect content patterns' ' + + git ls-files --others --exclude="!one" --exclude="one/a.1" >output && + if grep "^one/a.1" output + then + false + fi +' + test_expect_success 'subdirectory ignore (setup)' ' mkdir -p top/l1/l2 && ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/version new/git-1.8.3.1/version --- old/git-1.8.3/version 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/version 2013-06-10 22:01:55.000000000 +0200 @@ -1 +1 @@ -1.8.3 +1.8.3.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-1.8.3/wrapper.c new/git-1.8.3.1/wrapper.c --- old/git-1.8.3/wrapper.c 2013-05-24 21:15:35.000000000 +0200 +++ new/git-1.8.3.1/wrapper.c 2013-06-10 22:01:55.000000000 +0200 @@ -408,18 +408,24 @@ warning(_("unable to access '%s': %s"), path, strerror(errno)); } -int access_or_warn(const char *path, int mode) +static int access_error_is_ok(int err, unsigned flag) +{ + return err == ENOENT || err == ENOTDIR || + ((flag & ACCESS_EACCES_OK) && err == EACCES); +} + +int access_or_warn(const char *path, int mode, unsigned flag) { int ret = access(path, mode); - if (ret && errno != ENOENT && errno != ENOTDIR) + if (ret && !access_error_is_ok(errno, flag)) warn_on_inaccessible(path); return ret; } -int access_or_die(const char *path, int mode) +int access_or_die(const char *path, int mode, unsigned flag) { int ret = access(path, mode); - if (ret && errno != ENOENT && errno != ENOTDIR) + if (ret && !access_error_is_ok(errno, flag)) die_errno(_("unable to access '%s'"), path); return ret; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
