From 0f1b28fe029fbdd3dd08454fe014f6af504c93e411ca78726a35a1618b91cf01 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 2 Sep 2009 16:48:38 +0000 Subject: [PATCH] Accepting request 19394 from devel:tools:scm Copy from devel:tools:scm/git based on submit request 19394 from user tiwai OBS-URL: https://build.opensuse.org/request/show/19394 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=33 --- git-1.6.3.3.tar.bz2 | 3 --- git-1.6.4.2.tar.bz2 | 3 +++ git-nohardlink.diff | 14 +++++++------- git.changes | 27 +++++++++++++++++++++++++++ git.spec | 6 +++--- 5 files changed, 40 insertions(+), 13 deletions(-) delete mode 100644 git-1.6.3.3.tar.bz2 create mode 100644 git-1.6.4.2.tar.bz2 diff --git a/git-1.6.3.3.tar.bz2 b/git-1.6.3.3.tar.bz2 deleted file mode 100644 index 06911f0..0000000 --- a/git-1.6.3.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f94bc0d1fc861a12c7fb821b27a4e6a80901e84432cdb7894cb7a437d4c939ad -size 2061691 diff --git a/git-1.6.4.2.tar.bz2 b/git-1.6.4.2.tar.bz2 new file mode 100644 index 0000000..c7a5cf1 --- /dev/null +++ b/git-1.6.4.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad8f8fcff37db52031ab9b190fab6a910c59d83ca7322d3f92a8aeabf6029135 +size 2173527 diff --git a/git-nohardlink.diff b/git-nohardlink.diff index 3ad6b69..4a4db5c 100644 --- a/git-nohardlink.diff +++ b/git-nohardlink.diff @@ -6,11 +6,11 @@ hardlinks to symlinks again in an unpredicatable way --- a/Makefile +++ b/Makefile -@@ -1472,7 +1472,6 @@ - cp "$$bindir/git$X" "$$execdir/git-add$X"; } && \ - { for p in $(filter-out git-add$X,$(BUILT_INS)); do \ +@@ -1667,7 +1667,6 @@ + cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \ + { for p in $(BUILT_INS); do \ $(RM) "$$execdir/$$p" && \ -- ln "$$execdir/git-add$X" "$$execdir/$$p" 2>/dev/null || \ - ln -s "git-add$X" "$$execdir/$$p" 2>/dev/null || \ - cp "$$execdir/git-add$X" "$$execdir/$$p" || exit; \ - done } && \ +- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ + ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ + cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ + done; } && \ diff --git a/git.changes b/git.changes index e4a04b3..b00a0d8 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Mon Aug 31 14:32:04 CEST 2009 - tiwai@suse.de + +- updated to version 1.6.4.2: + * rounding fix for --date=relative output between 1 and 5 years + * regression fix of "git add -p" to handleexec bits changes + * fix "git apply" to honor GNU diff's convention to mark the + creation/deletion event with UNIX epoch timestamp + * fix "git checkout" to removed files correctly with symlinks + * make "git clean -d -f" safer for separate git repos + * fix bugs in "git fetch/push" over http transports + * fix "git format-patch --cover-letter" with non-ASCII strings + * See details in + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.4.2.txt + +------------------------------------------------------------------- +Mon Aug 24 14:34:08 CEST 2009 - tiwai@suse.de + +- updated to version 1.6.4: + git push into the currently checked-out branch will be refused + by default. + See details in + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.4.txt +- updated to version 1.6.4.1: + Bug fix release. See details in + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.4.1.txt + ------------------------------------------------------------------- Mon Jun 22 13:08:41 CEST 2009 - tiwai@suse.de diff --git a/git.spec b/git.spec index cd330e7..87226ea 100644 --- a/git.spec +++ b/git.spec @@ -1,5 +1,5 @@ # -# spec file for package git (Version 1.6.3.3) +# spec file for package git (Version 1.6.4.2) # # 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.3.3 +Version: 1.6.4.2 Release: 1 Summary: Fast, scalable, distributed revision control system License: GPL v2 or later @@ -128,7 +128,7 @@ Authors: %package arch License: GPL v2 or later -Summary: git-arch - Git tools for importing Arch repositories +Summary: Git tools for importing Arch repositories Group: Development/Tools/Version Control Requires: git-core = %{version}, tla