From 26f305b8b5728d7380f0697c9d5acce594508ce0b1b7e33fc2bec2d9f6c863d0 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 19 Oct 2012 20:55:45 +0000 Subject: [PATCH] Accepting request 138799 from devel:tools:scm Updated to 1.7.12.4 (forwarded request 138736 from douglarek) OBS-URL: https://build.opensuse.org/request/show/138799 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=95 --- git-1.7.12.3.tar.gz | 3 --- git-1.7.12.4.tar.gz | 3 +++ git.changes | 23 +++++++++++++++++++++++ git.spec | 2 +- 4 files changed, 27 insertions(+), 4 deletions(-) delete mode 100644 git-1.7.12.3.tar.gz create mode 100644 git-1.7.12.4.tar.gz diff --git a/git-1.7.12.3.tar.gz b/git-1.7.12.3.tar.gz deleted file mode 100644 index fa237ba..0000000 --- a/git-1.7.12.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d0959c316a2cdebaaf72cf27ac87d2e5616596a530dddeeb3a961c615494094 -size 4109011 diff --git a/git-1.7.12.4.tar.gz b/git-1.7.12.4.tar.gz new file mode 100644 index 0000000..bcaa43c --- /dev/null +++ b/git-1.7.12.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17e545929c16b5efa8fa9545936297d41571521cd7667fb74f92bd7adc8b63da +size 4109554 diff --git a/git.changes b/git.changes index c5b215f..f62eccc 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Oct 18 14:50:30 UTC 2012 - douglarek@outlook.com + +- updated to version 1.7.12.4: + + * "git fetch" over the dumb-http revision walker could segfault when + curl's multi interface was used. + + * It was possible to give specific paths for "asciidoc" and other + tools in the documentation toolchain, but not for "xmlto". + + * "gitweb" did not give the correct committer timezone in its feed + output due to a typo. + + * The "-Xours" (and similarly -Xtheirs) backend option to "git + merge -s recursive" was ignored for binary files. Now it is + honored. + + * The "binary" synthetic attribute made "diff" to treat the path as + binary, but not "merge". + + Also contains many documentation updates. + ------------------------------------------------------------------- Thu Oct 11 00:19:07 CST 2012 - douglarek@outlook.com diff --git a/git.spec b/git.spec index ecb8e05..78ade7b 100644 --- a/git.spec +++ b/git.spec @@ -30,7 +30,7 @@ BuildRequires: perl-Error BuildRequires: python BuildRequires: sgml-skel BuildRequires: xmlto -Version: 1.7.12.3 +Version: 1.7.12.4 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0