user/sven/git.git/t, branch v1.7.7.4

Merge branch 'rs/maint-estimate-cache-size' into maint

2011-11-01T23:41:41Z

* rs/maint-estimate-cache-size: t7511: avoid use of reserved filename on Windows.

Merge branch 'bc/attr-ignore-case' into maint

2011-11-01T22:54:46Z

* bc/attr-ignore-case: attr.c: respect core.ignorecase when matching attribute patterns attr: read core.attributesfile from git_default_core_config builtin/mv.c: plug miniscule memory leak cleanup: use internal memory allocation wrapper functions everywhere attr.c: avoid inappropriate access to strbuf "buf" member Conflicts: remote.c

Merge branch 'cn/fetch-prune' into maint

2011-11-01T22:51:01Z

* cn/fetch-prune: fetch: treat --tags like refs/tags/*:refs/tags/* when pruning fetch: honor the user-provided refspecs when pruning refs remote: separate out the remote_find_tracking logic into query_refspecs t5510: add tests for fetch --prune fetch: free all the additional refspecs

t7511: avoid use of reserved filename on Windows.

2011-10-31T19:31:42Z

PRN is a special filename on Windows to send data to the printer. As this is generated during test 3 substitute an alternate prefix to avoid this. Signed-off-by: Pat Thoyts Signed-off-by: Junio C Hamano

Merge branch 'rs/maint-estimate-cache-size' into maint

2011-10-27T19:03:16Z

* rs/maint-estimate-cache-size: read-cache.c: fix index memory allocation

Merge branch 'maint-1.7.6' into maint

2011-10-26T23:13:27Z

* maint-1.7.6: notes_merge_commit(): do not pass temporary buffer to other function gitweb: Fix links to lines in blobs when javascript-actions are enabled mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files t9159-*.sh: skip for mergeinfo test for svn <= 1.4 date.c: Support iso8601 timezone formats remote: only update remote-tracking branch if updating refspec remote rename: warn when refspec was not updated remote: "rename o foo" should not rename ref "origin/bar" remote: write correct fetch spec when renaming remote 'remote'

Merge branch 'jm/mergetool-pathspec' into maint-1.7.6

2011-10-26T23:12:25Z

* jm/mergetool-pathspec: mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files

Merge branch 'mz/remote-rename' into maint-1.7.6

2011-10-26T23:12:19Z

* mz/remote-rename: remote: only update remote-tracking branch if updating refspec remote rename: warn when refspec was not updated remote: "rename o foo" should not rename ref "origin/bar" remote: write correct fetch spec when renaming remote 'remote'

Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6

2011-10-26T23:12:13Z

* rj/maint-t9159-svn-rev-notation: t9159-*.sh: skip for mergeinfo test for svn <= 1.4

Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6

2011-10-26T23:11:28Z

* hl/iso8601-more-zone-formats: date.c: Support iso8601 timezone formats