CVS commit: pkgsrc/devel

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat May 21 17:25:14 UTC 2011

Modified Files:
        pkgsrc/devel/scmgit: Makefile.version
        pkgsrc/devel/scmgit-base: distinfo

Log Message:
Changes 1.7.5.2:
* "git add -p" did not work correctly when a hunk is split and then
  one of them was given to the editor.
* "git add -u" did not resolve a conflict where our history deleted and
  their history modified the same file, and the working tree resolved to
  keep a file.
* "git cvsimport" did not know that CVSNT stores its password file in a
  location different from the traditional CVS.
* "git diff-files" did not show the mode information from the working
  tree side of an unmerged path correctly.
* "git diff -M --cached" used to use unmerged path as a possible rename
  source candidate, which made no sense.
* The option name parser in "git fast-import" used prefix matches for
  some options where it shouldn't, and accepted non-existent options,
  e.g. "--relative-marksmith" or "--forceps".
* "git format-patch" did not quote RFC822 special characters in the
  email address (e.g From: Junio C. Hamano <jch%example.com@localhost>, not
  From: "Junio C. Hamano" <jch%example.com@localhost>).
* "git format-patch" when run with "--quiet" option used to produce a
  nonsense result that consists of alternating empty output.
* In "git merge", per-branch branch.<name>.mergeoptions configuration
  variables did not override the fallback default merge.<option>
  configuration variables such as merge.ff, merge.log, etc.
* "git merge-one-file" did not honor GIT_WORK_TREE settings when
  handling a "both sides added, differently" conflict.
* "git mergetool" did not handle conflicted submoudules gracefully.
* "git-p4" (in contrib) used a wrong base image while merge a file that
  was added on both branches differently.
* "git rebase -i -p" failed to preserve the history when there is a
  redundant merge created with the --no-ff option.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/scmgit/Makefile.version
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/scmgit-base/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.