From 64e307b0d0115de48742960e6269cc50982f7c96d31a7a9d7b839aafe0bbd44f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 9 Feb 2009 09:38:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=25 --- git-1.6.1.2.tar.bz2 | 3 --- git-1.6.1.3.tar.bz2 | 3 +++ git.changes | 21 +++++++++++++++++++++ git.spec | 22 ++++++++++++++++++++-- 4 files changed, 44 insertions(+), 5 deletions(-) delete mode 100644 git-1.6.1.2.tar.bz2 create mode 100644 git-1.6.1.3.tar.bz2 diff --git a/git-1.6.1.2.tar.bz2 b/git-1.6.1.2.tar.bz2 deleted file mode 100644 index 421c000..0000000 --- a/git-1.6.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b943fdfd8d347e59dda6c7547342ccdbc7c40aa1a24344e09bdce18dde8b4dd -size 1973153 diff --git a/git-1.6.1.3.tar.bz2 b/git-1.6.1.3.tar.bz2 new file mode 100644 index 0000000..bb8bf50 --- /dev/null +++ b/git-1.6.1.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aef4814634ac9ce8119fabc4bd1c363bb946f73ed34475a4baaad09a3fb23682 +size 1973574 diff --git a/git.changes b/git.changes index 4a2b449..9f882a2 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon Feb 9 08:27:53 CET 2009 - tiwai@suse.de + +- updated to 1.6.1.3: + * "git diff --binary | git apply" pipeline did not work well + when a binary blob is changed to a symbolic link. + * some combinations of -b/-w/--ignore-space-at-eol to "git diff" + did not work as expected. + * "git grep" did not pass the -I (ignore binary) option when + calling out an external grep program. + * "git log" and friends include HEAD to the set of starting + points when --all is given. This makes a difference when you + are not on any branch. + * "git mv" to move an untracked file to overwrite a tracked + contents misbehaved. + * "git merge -s octopus" with many potential merge bases did not + work correctly. + * RPM binary package installed the html manpages in a wrong + place. + Also includes minor documentation fixes and updates. + ------------------------------------------------------------------- Thu Jan 29 13:24:33 CET 2009 - schwab@suse.de diff --git a/git.spec b/git.spec index 2889ad2..543e49e 100644 --- a/git.spec +++ b/git.spec @@ -1,5 +1,5 @@ # -# spec file for package git (Version 1.6.1.2) +# spec file for package git (Version 1.6.1.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.1.2 +Version: 1.6.1.3 Release: 1 Summary: Fast, scalable, distributed revision control system License: GPL v2 or later @@ -420,6 +420,24 @@ fi /etc/bash_completion.d/git.sh %changelog +* Mon Feb 09 2009 tiwai@suse.de +- updated to 1.6.1.3: + * "git diff --binary | git apply" pipeline did not work well + when a binary blob is changed to a symbolic link. + * some combinations of -b/-w/--ignore-space-at-eol to "git diff" + did not work as expected. + * "git grep" did not pass the -I (ignore binary) option when + calling out an external grep program. + * "git log" and friends include HEAD to the set of starting + points when --all is given. This makes a difference when you + are not on any branch. + * "git mv" to move an untracked file to overwrite a tracked + contents misbehaved. + * "git merge -s octopus" with many potential merge bases did not + work correctly. + * RPM binary package installed the html manpages in a wrong + place. + Also includes minor documentation fixes and updates. * Thu Jan 29 2009 schwab@suse.de - Formatting fix for manual pages. * Thu Jan 29 2009 tiwai@suse.de