OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=24

asciidoc.diff

@@ -1,6 +1,6 @@
---- a/Documentation/asciidoc.conf
-+++ b/Documentation/asciidoc.conf
-@@ -24,7 +24,7 @@
+--- git-1.6.0.4/Documentation/asciidoc.conf
++++ git-1.6.0.4/Documentation/asciidoc.conf
+@@ -24,7 +24,7 @@ ifdef::backend-docbook[]
  endif::backend-docbook[]
  
  ifdef::backend-docbook[]
@@ -9,12 +9,24 @@
  # "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
  # v1.72 breaks with this because it replaces dots not in roff requests.
  [listingblock]
-@@ -39,7 +39,7 @@
+@@ -39,9 +39,9 @@ ifdef::doctype-manpage[]
  endif::doctype-manpage[]
  </literallayout>
  {title#}</example>
 -endif::docbook-xsl-172[]
 +endif::docbook-xsl-168[]
  
- ifdef::docbook-xsl-172[]
+-ifdef::docbook-xsl-172[]
++ifndef::docbook-xsl-168[]
+ ifdef::doctype-manpage[]
+ # The following two small workarounds insert a simple paragraph after screen
+ [listingblock]
+@@ -59,7 +59,7 @@ ifdef::doctype-manpage[]
+ </literallayout><simpara></simpara>
+ {title#}</para></formalpara>
+ endif::doctype-manpage[]
+-endif::docbook-xsl-172[]
++endif::docbook-xsl-168[]
+ endif::backend-docbook[]
+ 
  ifdef::doctype-manpage[]

git-1.6.1.2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b943fdfd8d347e59dda6c7547342ccdbc7c40aa1a24344e09bdce18dde8b4dd
+size 1973153

git-1.6.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09d64bd88f6f432ddcb0f051a3ead2579f895a7f0dece702bc933ba21a434fe4
-size 1971286

git.changes

@@ -1,3 +1,85 @@
+-------------------------------------------------------------------
+Thu Jan 29 13:24:33 CET 2009 - schwab@suse.de
+
+- Formatting fix for manual pages.
+
+-------------------------------------------------------------------
+Thu Jan 29 11:53:19 CET 2009 - tiwai@suse.de
+
+- updated to 1.6.1.2:
+  * The logic for rename detectin in internal diff used by commands
+    like "git diff" and "git blame" have been optimized to avoid
+    loading the same blob repeatedly.
+  * We did not allow writing out a blob that is larger than 2GB
+    for no good reason.
+  * "git format-patch -o $dir", when $dir is a relative directory,
+    used it as relative to the root of the work tree, not relative
+    to the current directory.
+  * v1.6.1 introduced an optimization for "git push" into a
+    repository (A) that borrows its objects from another
+    repository (B) to avoid sending objects that are available in
+    repository B, when they are not yet used by repository A.
+    However the code on the "git push" sender side was buggy and
+    did not work when repository B had new objects that are not
+    known by the sender.  This caused pushing into a "forked"
+    repository served by v1.6.1 software using "git push" from
+    v1.6.1 sometimes did not work.  The bug was purely on the
+    "git push" sender side, and has been corrected.
+  * "git status -v" did not paint its diff output in colour even
+    when color.ui configuration was set.
+  * "git ls-tree" learned --full-tree option to help Porcelain
+    scripts that want to always see the full path regardless of the
+    current working directory.
+  * "git grep" incorrectly searched in work tree paths even when
+    they are marked as assume-unchanged.  It now searches in the
+    index entries.
+  * "git gc" with no grace period needlessly ejected packed but
+    unreachable objects in their loose form, only to delete them
+    right away.
+
+-------------------------------------------------------------------
+Mon Jan 26 12:21:15 CET 2009 - tiwai@suse.de
+
+- updated to 1.6.1.1:
+  * "git add frotz/nitfol" when "frotz" is a submodule should have
+    errored out, but it didn't.
+  * "git apply" took file modes from the patch text and updated
+    the mode bits of the target tree even when the patch was not
+    about mode changes.
+  * "git bisect view" on Cygwin did not launch gitk
+  * "git checkout $tree" did not trigger an error.
+  * "git commit" tried to remove COMMIT_EDITMSG from the work tree
+    by mistake.
+  * "git describe --all" complained when a commit is described
+    with a tag, which was nonsense.
+  * "git diff --no-index --" did not trigger no-index (aka "use
+    git-diff as a replacement of diff on untracked files") behaviour.
+  * "git format-patch -1 HEAD" on a root commit failed to produce
+    patch text.
+  * "git fsck branch" did not work as advertised; instead it
+    behaved the same way as "git fsck".
+  * "git log --pretty=format:%s" did not handle a multi-line
+    subject the same way as built-in log listers (i.e. shortlog,
+    --pretty=oneline, etc.)
+  * "git daemon", and "git merge-file" are more careful when freopen
+    fails and barf, instead of going on and writing to unopened
+    filehandle.
+  * "git http-push" did not like some RFC 4918 compliant DAV server
+    responses.
+  * "git merge -s recursive" mistakenly overwritten an untracked
+    file in the work tree upon delete/modify conflict.
+  * "git merge -s recursive" didn't leave the index unmerged for
+    entries with rename/delete conflictd.
+  * "git merge -s recursive" clobbered untracked files in the work
+    tree.
+  * "git mv -k" with more than one errorneous paths misbehaved.
+  * "git read-tree -m -u" hence branch switching incorrectly lost
+    a subdirectory in rare cases.
+  * "git rebase -i" issued an unnecessary error message upon a user
+    error of marking the first commit to be "squash"ed.
+  * "git shortlog" did not format a commit message with multi-line
+    subject correctly.
+
 -------------------------------------------------------------------
 Thu Jan  8 15:55:42 CET 2009 - tiwai@suse.de
 

git.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package git (Version 1.6.1)
+# spec file for package git (Version 1.6.1.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.1
+Version:        1.6.1.2
 Release:        1
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL v2 or later
@@ -420,6 +420,79 @@ fi
 /etc/bash_completion.d/git.sh
 
 %changelog
+* Thu Jan 29 2009 schwab@suse.de
+- Formatting fix for manual pages.
+* Thu Jan 29 2009 tiwai@suse.de
+- updated to 1.6.1.2:
+  * The logic for rename detectin in internal diff used by commands
+  like "git diff" and "git blame" have been optimized to avoid
+  loading the same blob repeatedly.
+  * We did not allow writing out a blob that is larger than 2GB
+  for no good reason.
+  * "git format-patch -o $dir", when $dir is a relative directory,
+  used it as relative to the root of the work tree, not relative
+  to the current directory.
+  * v1.6.1 introduced an optimization for "git push" into a
+  repository (A) that borrows its objects from another
+  repository (B) to avoid sending objects that are available in
+  repository B, when they are not yet used by repository A.
+  However the code on the "git push" sender side was buggy and
+  did not work when repository B had new objects that are not
+  known by the sender.  This caused pushing into a "forked"
+  repository served by v1.6.1 software using "git push" from
+  v1.6.1 sometimes did not work.  The bug was purely on the
+  "git push" sender side, and has been corrected.
+  * "git status -v" did not paint its diff output in colour even
+  when color.ui configuration was set.
+  * "git ls-tree" learned --full-tree option to help Porcelain
+  scripts that want to always see the full path regardless of the
+  current working directory.
+  * "git grep" incorrectly searched in work tree paths even when
+  they are marked as assume-unchanged.  It now searches in the
+  index entries.
+  * "git gc" with no grace period needlessly ejected packed but
+  unreachable objects in their loose form, only to delete them
+  right away.
+* Mon Jan 26 2009 tiwai@suse.de
+- updated to 1.6.1.1:
+  * "git add frotz/nitfol" when "frotz" is a submodule should have
+  errored out, but it didn't.
+  * "git apply" took file modes from the patch text and updated
+  the mode bits of the target tree even when the patch was not
+  about mode changes.
+  * "git bisect view" on Cygwin did not launch gitk
+  * "git checkout $tree" did not trigger an error.
+  * "git commit" tried to remove COMMIT_EDITMSG from the work tree
+  by mistake.
+  * "git describe --all" complained when a commit is described
+  with a tag, which was nonsense.
+  * "git diff --no-index --" did not trigger no-index (aka "use
+  git-diff as a replacement of diff on untracked files") behaviour.
+  * "git format-patch -1 HEAD" on a root commit failed to produce
+  patch text.
+  * "git fsck branch" did not work as advertised; instead it
+  behaved the same way as "git fsck".
+  * "git log --pretty=format:%%s" did not handle a multi-line
+  subject the same way as built-in log listers (i.e. shortlog,
+    --pretty=oneline, etc.)
+  * "git daemon", and "git merge-file" are more careful when freopen
+  fails and barf, instead of going on and writing to unopened
+  filehandle.
+  * "git http-push" did not like some RFC 4918 compliant DAV server
+  responses.
+  * "git merge -s recursive" mistakenly overwritten an untracked
+  file in the work tree upon delete/modify conflict.
+  * "git merge -s recursive" didn't leave the index unmerged for
+  entries with rename/delete conflictd.
+  * "git merge -s recursive" clobbered untracked files in the work
+  tree.
+  * "git mv -k" with more than one errorneous paths misbehaved.
+  * "git read-tree -m -u" hence branch switching incorrectly lost
+  a subdirectory in rare cases.
+  * "git rebase -i" issued an unnecessary error message upon a user
+  error of marking the first commit to be "squash"ed.
+  * "git shortlog" did not format a commit message with multi-line
+  subject correctly.
 * Thu Jan 08 2009 tiwai@suse.de
 - updated to 1.6.1:
   * handle properly the exit code when pager is used