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>, not From: "Junio C. Hamano" <jch@example.com>). * "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.diff -r1.23 -r1.24 pkgsrc/devel/scmgit/Makefile.version
(adam)
@@ -1,3 +1,3 @@ | @@ -1,3 +1,3 @@ | |||
1 | # $NetBSD: Makefile.version,v 1.23 2011/05/05 10:57:06 adam Exp $ | 1 | # $NetBSD: Makefile.version,v 1.24 2011/05/21 17:25:13 adam Exp $ | |
2 | 2 | |||
3 | GIT_VERSION= 1.7.5.1 | 3 | GIT_VERSION= 1.7.5.2 |
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.36 2011/05/05 10:57:07 adam Exp $ | 1 | $NetBSD: distinfo,v 1.37 2011/05/21 17:25:14 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (git-1.7.5.1.tar.bz2) = 7ae089a8e252e8b2ce84ad018d55d6ba6f4b5591 | 3 | SHA1 (git-1.7.5.2.tar.bz2) = c7cc4f9b0a8718e966d32c8f834df67ed2b5560f | |
4 | RMD160 (git-1.7.5.1.tar.bz2) = 981a73b0492bd66ee0f99e0e3adba19ad436197e | 4 | RMD160 (git-1.7.5.2.tar.bz2) = c1e4e065b0fe7e756d22ac0a3c867ebd4923bb4c | |
5 | Size (git-1.7.5.1.tar.bz2) = 2753815 bytes | 5 | Size (git-1.7.5.2.tar.bz2) = 2766306 bytes | |
6 | SHA1 (patch-aa) = f47ff9d8b9ba8592f7bbd21d4b0ab30394e8f9a0 | 6 | SHA1 (patch-aa) = f47ff9d8b9ba8592f7bbd21d4b0ab30394e8f9a0 | |
7 | SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 | 7 | SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 | |
8 | SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce | 8 | SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce | |
9 | SHA1 (patch-af) = 60029a215edf5218a76be41932afb5b9f8c4729a | 9 | SHA1 (patch-af) = 60029a215edf5218a76be41932afb5b9f8c4729a | |
10 | SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 | 10 | SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 | |
11 | SHA1 (patch-ah) = 132ab70b77140c88b2f24b9c696cbe306eb41ca8 | 11 | SHA1 (patch-ah) = 132ab70b77140c88b2f24b9c696cbe306eb41ca8 | |
12 | SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e | 12 | SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e |