Git

The latest maintenance release Git 1.7.5.3 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.7.5.3.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.5.3.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.5.3.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.7.5.3-1.fc13.$arch.rpm (RPM) Git v1.7.5.3 Release Notes ========================== Fixes since v1.7.5.2 -------------------- * The bash completion scripts should correctly work using zsh's bash completion emulation layer now. * Setting $(prefix) in config.mak did not affect where etc/gitconfig file is read from, even though passing it from the command line of $(MAKE) did. * The logic to handle "&" (expand to UNIX username) in GECOS field miscounted the length of the name it formatted. * "git cherry-pick -s resolve" failed to cherry-pick a root commit. * "git diff --word-diff" misbehaved when diff.suppress-blank-empty was in effect. * "git log --stdin path" with an input that has additional pathspec used to corrupt memory. * "git send-pack" (hence "git push") over smalt-HTTP protocol could deadlock when the client side pack-object died early. * Compressed tarball gitweb generates used to be made with the timestamp of the tarball generation; this was bad because snapshot from the same tree should result in a same tarball. And other minor fixes and documentation updates. ---------------------------------------------------------------- Changes since v1.7.5.2 are as follows: Felipe Contreras (1): git-completion: fix regression in zsh support Fraser Tweedale (1): gitweb: supply '-n' to gzip for identical output Jeff King (8): send-pack: unbreak push over stateless rpc cherry-pick: handle root commits with external strategies revert: allow reverting a root commit t3503: test cherry picking and reverting root commits connect: treat generic proxy processes like ssh processes connect: let callers know if connection is a socket send-pack: avoid deadlock on git:// push with failed pack-objects test core.gitproxy configuration Jim Meyering (1): do not read beyond end of malloc'd buffer Johannes Sixt (3): Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird send-pack: avoid deadlock when pack-object dies early Honor $(prefix) set in config.mak* when defining ETC_GIT* Jonathan Nieder (5): Revert "t0081 (line-buffer): add buffering tests" Documentation: explain how to check for patch corruption Documentation: hints for sending patches inline with Thunderbird Documentation: publicize KMail hints for sending patches inline Documentation: publicize hints for sending patches with GMail Junio C Hamano (4): Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir" setup_revisions(): take pathspec from command line and --stdin correctly sideband_demux(): fix decl-after-stmt Git 1.7.5.3 Kacper Kornet (1): Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir Michael J Gruber (2): config.txt,diff-options.txt: porcelain vs. plumbing for color.diff git-svn: Fix git svn log --show-commit Nguyễn Thái Ngọc Duy (1): init/clone: remove short option -L and document --separate-git-dir Rafael Gieschke (1): copy_gecos: fix not adding nlen to len when processing "&" Stefan Sperling (1): remove noise and inaccuracies from git-svn docs -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest maintenance release Git 1.7.5.2 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.7.5.2.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.5.2.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.5.2.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.7.5.2-1.fc13.$arch.rpm (RPM) Git v1.7.5.2 Release Notes ========================== The release notes to 1.7.5.1 forgot to mention: * "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now mean the same thing. * "git upload-pack" (hence "git push" over git native protocol) had a subtle race condition that could lead to a deadlock. Fixes since v1.7.5.1 -------------------- * "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 , not From: "Junio C. Hamano" ). * "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..mergeoptions configuration variables did not override the fallback default merge. 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. And other minor fixes and documentation updates. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

Hello everyone, as thoroughly requested, and after much delay, here's the new minor libgit2 release. The release has been tagged at: https://github.com/libgit2/libgit2/tree/v0.12.0 A dist package can be found at: ... [More] https://github.com/downloads/libgit2/libgit2/libgit2-0.12.0.tar.gz The full change log follows after the message. Thanks for your time, Vicent ========================= libgit2 v0.12.0 "absolutely no reason" Hey, welcome to yet another minor libgit2 release. Sorry for the delay from the last one. As you'll see the changelog is quite extensive -- hopefully from now on we'll stick to more frequent minor releases. Together with the usual bugfixes, here's a list of the new key features: * Distfiles This version comes with proper distfiles as requested in #131. These are available in the Downloads section of the GitHub project. * Error handling A new error handling API has been implemented that allows the library to return detailed error messages together with the generic error codes. We hope this will be a great when wrapping and integrating the library New external method to get the last detailed error message: + git_lasterror(void) The old `git_strerror` still exists, but will be deprecated in the future as soon as every method in the library returns a valid error message. The task of writing error messages for every method is quite daunting. We appreciate pull requests with more error messages. Check the new error handling documentation in the following commit: https://github.com/libgit2/libgit2/commit/fa59f18d0ddbbb98d45e33934fb0efc3e2bf1557 * Redis backend We now have a Redis backend courtesy of Dmitry Kovega. Just like the SQLite backend, this allows the library to store Git objects in a Redis key-value store. The backend requires the `hiredis` library. Use `--with-redis` when building libgit2 to enable building the backend if `hiredis` is available. * Commits New methods to access tree and parent data as a raw OID value instead of forcing a repository lookup + git_commit_tree_oid(git_commit *commit) + git_commit_parent_oid(git_commit *commit, unsigned int n) * Index The `git_index_add` method has been split into 4 different calls which allow for appending and replacing in-memory entries and on-disk files to the index. + git_index_add(git_index *index, const char *path, int stage) + git_index_add2(git_index *index, const git_index_entry *source_entry) + git_index_append(git_index *index, const char *path, int stage) + git_index_append2(git_index *index, const git_index_entry *source_entry) Index entries can now also be efficiently removed from the index: + git_index_remove(git_index *index, int position) * References Methods to force the creation and renaming of references, even if those already exist on the repository. + git_reference_create_symbolic_f(git_reference **ref_out, git_repository *repo, const char *name, const char *target) + git_reference_create_oid_f(git_reference **ref_out, git_repository *repo, const char *name, const git_oid *id) + git_reference_rename_f(git_reference *ref, const char *new_name) * Repository New auxiliary methods with repository information + git_repository_is_empty(git_repository *repo) + git_repository_path(git_repository *repo) + git_repository_workdir(git_repository *repo) * Signatures New method to create a signature with the current date/time + git_signature_now(const char *name, const char *email) * Tags Several wrappers to automate tag creation. + git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *buffer) + git_tag_create_f(git_oid *oid, git_repository *repo, const char *tag_name, const git_oid *target, git_otype target_type, const git_signature *tagger, const char *message); + git_tag_create_fo(git_oid *oid, git_repository *repo, const char *tag_name, const git_object *target, const git_signature *tagger, const char *message) New functionality to delete and list tags in a repository without having to resort to the `references` API. + git_tag_delete(git_repository *repo, const char *tag_name) + git_tag_list(git_strarray *tag_names, git_repository *repo) * Trees All instances of `git_tree_entry` are now returned and handled as constant, to remind the user that these opaque types are not supposed to be manually free'd. The `git_tree_entry_2object` method now takes a `git_repository` argument which defines in which repository the resolved object should be looked up. (It is expected to be the same repository that contains the parent `git_tree` for the entry). + git_tree_entry_2object(git_object **object_out, git_repository *repo, const git_tree_entry *entry) New opaque type `git_treebuilder` with functionality to create and write trees on memory + git_treebuilder_create(git_treebuilder **builder_p, const git_tree *source) + git_treebuilder_clear(git_treebuilder *bld) + git_treebuilder_free(git_treebuilder *bld) + git_treebuilder_get(git_treebuilder *bld, const char *filename) + git_treebuilder_insert(git_tree_entry **entry_out, git_treebuilder *bld, const char *filename, const git_oid *id, unsigned int attributes) + git_treebuilder_remove(git_treebuilder *bld, const char *filename) + git_treebuilder_filter(git_treebuilder *bld, int (*filter)(const git_tree_entry *, void *), void *payload) + git_treebuilder_write(git_oid *oid, git_repository *repo, git_treebuilder *bld) New method to write an index file as a tree to the ODB. + git_tree_create_fromindex(git_oid *oid, git_index *index) Thanks to the usual guility parties that make this this happen, to all the new contributors who are starting to submit pull requests, and to the bindings developers who have to keep up with our shit. Feedback and questions welcome on [email protected] Signed-off-by: Vicent Marti -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest maintenance release Git 1.7.5.1 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.7.5.1.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.5.1.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.5.1.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.7.5.1-1.fc13.$arch.rpm (RPM) Git v1.7.5.1 Release Notes ========================== Fixes since v1.7.5 ------------------ * When an object "$tree:$path" does not exist, if $path does exist in the subtree of $tree that corresponds to the subdirectory the user is in, git now suggests using "$tree:./$path" in addition to the advice to use the full path from the root of the working tree. * The "--date=relative" output format used to say "X years, 12 months" when it should have said "X+1 years". * The smart-HTTP transfer was broken in 1.7.5 when the client needs to issue a small POST (which uses content-length) and then a large POST (which uses chunked) back to back. * "git clean" used to fail on an empty directory that is not readable, even though rmdir(2) could remove such a directory. Now we attempt it as the last resort. * The "--dirstat" option of "diff" family of commands used to totally ignore a change that only rearranged lines within a file. Such a change now counts as at least a minimum but non zero change. * The "--dirstat" option of "diff" family of commands used to use the pathname in the original, instead of the pathname in the result, when renames are involved. * "git pack-object" did not take core.bigfilethreashold into account (unlike fast-import); now it does. * "git reflog" ignored options like "--format=.." on the command line. * "git stash apply" used to refuse to work if there was any change in the working tree, even when the change did not overlap with the change the stash recorded. * "git stash apply @{99999}" was not diagnosed as an error, even when you did not have that many stash entries. * An error message from "git send-email" to diagnose a broken SMTP connection configuration lacked a space between "hello=" and "port=". And other minor fixes and documentation updates. ---------------------------------------------------------------- Changes since v1.7.5 are as follows: Alex Riesen (1): clean: unreadable directory may still be rmdir-able if it is empty Dan McGee (2): stash: add two more tests for --no-keep-index stash: ensure --no-keep-index and --patch can be used in any order Jeff King (3): stash: fix accidental apply of non-existent stashes stash: drop dirty worktree check on apply upload-pack: start pack-objects before async rev-list Johan Herland (4): --dirstat: Describe non-obvious differences relative to --stat or regular diff --dirstat-by-file: Make it faster and more correct Teach --dirstat not to completely ignore rearranged lines within a file --dirstat: In case of renames, use target filename instead of source filename Jon Seymour (1): stash: fix false positive in the invalid ref test. Junio C Hamano (4): Teach core.bigfilethreashold to pack-objects http: clear POSTFIELDS when initializing a slot Start 1.7.5.1 maintenance track Git 1.7.5.1 Michael J Gruber (6): builtin/log.c: separate default and setup of cmd_log_init() t/t1411: test reflog with formats reflog: fix overriding of command line options t1506: factor out test for "Did you mean..." sha1_name: Suggest commit:./file for path in subdir date: avoid "X years, 12 months" in relative dates Sylvain Rabot (1): git-send-email: fix missing space in error message Valentin Haenel (1): git-add.txt: document 'add.ignoreErrors' -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest feature release Git 1.7.5 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.7.5.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.5.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.5.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.7.5-1.fc13.$arch.rpm (RPM) This release has 500+ changes from 70+ contributors; thanks for everybody who contributed. ---------------------------------------------------------------- Git v1.7.5 Release Notes ======================== Updates since v1.7.4 -------------------- * Various MinGW portability fixes. * Various git-p4 enhancements (in contrib). * Various vcs-svn, git-svn and gitk enhancements and fixes. * Various git-gui updates (0.14.0). * Update to more modern HP-UX port. * The codebase is getting prepared for i18n/l10n; no translated strings nor translation mechanism in the code yet, but the strings are being marked for l10n. * The bash completion script can now complete symmetric difference for "git diff" command, e.g. "git diff ...bra". * The default minimum length of abbreviated and unique object names can now be configured by setting the core.abbrev configuration variable. * "git apply -v" reports offset lines when the patch does not apply at the exact location recorded in the diff output. * "git config" used to be also known as "git repo-config", but the old name is now officially deprecated. * "git checkout --detach " is a more user friendly synonym for "git checkout ^0". * "git checkout" performed on detached HEAD gives a warning and advice when the commit being left behind will become unreachable from any branch or tag. * "git cherry-pick" and "git revert" can be told to use a custom merge strategy, similar to "git rebase". * "git cherry-pick" remembers which commit failed to apply when it is stopped by conflicts, making it unnecessary to use "commit -c $commit" to conclude it. * "git cvsimport" bails out immediately when the cvs server cannot be reached, without spewing unnecessary error messages that complain about the server response it never got. * "git fetch" vs "git upload-pack" transfer learned 'no-done' protocol extension to save one round-trip after the content negotiation is done. This saves one HTTP RPC, reducing the overall latency for a trivial fetch. * "git fetch" can be told to recursively fetch submodules on-demand. * "git grep -f " learned to treat "-" as "read from the standard input stream". * "git grep --no-index" did not honor pathspecs correctly, returning paths outside the specified area. * "git init" learned the --separate-git-dir option to allow the git directory for a new repository created elsewhere and linked via the gitdir mechanism. This is primarily to help submodule support later to switch between a branch of superproject that has the submodule and another that does not. * "git log" type commands now understand globbing pathspecs. You can say "git log -- '*.txt'" for example. * "git log" family of commands learned --cherry and --cherry-mark options that can be used to view two diverged branches while omitting or highlighting equivalent changes that appear on both sides of a symmetric difference (e.g. "log --cherry A...B"). * A lazy "git merge" that didn't say what to merge used to be an error. When run on a branch that has an upstream defined, however, the command now merges from the configured upstream. * "git mergetool" learned how to drive "beyond compare 3" as well. * "git rerere forget" without pathspec used to forget all the saved conflicts that relate to the current merge; it now requires you to give it pathspecs. * "git rev-list --objects $revs -- $pathspec" now limits the objects listed in its output properly with the pathspec, in preparation for narrow clones. * "git push" with no parameters gives better advice messages when "tracking" is used as the push.default semantics or there is no remote configured yet. * A possible value to the "push.default" configuration variable, 'tracking', gained a synonym that more naturally describes what it does, 'upstream'. * "git rerere" learned a new subcommand "remaining" that is similar to "status" and lists the paths that had conflicts which are known to rerere, but excludes the paths that have already been marked as resolved in the index from its output. "git mergetool" has been updated to use this facility. Also contains various documentation updates. Fixes since v1.7.4 ------------------ All of the fixes in the v1.7.4.X maintenance series are included in this release, unless otherwise noted. * "git fetch" from a client that is mostly following the remote needlessly told all of its refs to the server for both sides to compute the set of objects that need to be transferred efficiently, instead of stopping when the server heard enough. In a project with many tags, this turns out to be extremely wasteful, especially over the smart HTTP transport (sp/maint-{upload,fetch}-pack-stop-early~1). * "git fetch" run from a repository that uses the same repository as its alternate object store as the repository it is fetching from did not tell the server that it already has access to objects reachable from the refs in their common alternate object store, causing it to fetch unnecessary objects (jc/maint-fetch-alt). * "git remote add --mirror" created a configuration that is suitable for doing both a mirror fetch and a mirror push at the same time, which made little sense. We now warn and require the command line to specify either --mirror=fetch or --mirror=push. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

A release candidate Git 1.7.5-rc3 is available at the usual places for testing: http://www.kernel.org/pub/software/scm/git/ git-1.7.5.rc3.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.5.rc3.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.5.rc3.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: testing/git-*-1.7.5.rc3-1.fc13.$arch.rpm (RPM) Git v1.7.5 Release Notes (draft) ======================== Updates since v1.7.4 -------------------- * Various MinGW portability fixes. * Various git-p4 enhancements (in contrib). * Various vcs-svn, git-svn and gitk enhancements and fixes. * Various git-gui updates (0.14.0). * Update to more modern HP-UX port. * The codebase is getting prepared for i18n/l10n; no translated strings nor translation mechanism in the code yet, but the strings are being marked for l10n. * The bash completion script can now complete symmetric difference for "git diff" command, e.g. "git diff ...bra". * The default minimum length of abbreviated and unique object names can now be configured by setting the core.abbrev configuration variable. * "git apply -v" reports offset lines when the patch does not apply at the exact location recorded in the diff output. * "git config" used to be also known as "git repo-config", but the old name is now officially deprecated. * "git checkout --detach " is a more user friendly synonym for "git checkout ^0". * "git checkout" performed on detached HEAD gives a warning and advice when the commit being left behind will become unreachable from any branch or tag. * "git cherry-pick" and "git revert" can be told to use a custom merge strategy, similar to "git rebase". * "git cherry-pick" remembers which commit failed to apply when it is stopped by conflicts, making it unnecessary to use "commit -c $commit" to conclude it. * "git cvsimport" bails out immediately when the cvs server cannot be reached, without spewing unnecessary error messages that complain about the server response it never got. * "git fetch" vs "git upload-pack" transfer learned 'no-done' protocol extension to save one round-trip after the content negotiation is done. This saves one HTTP RPC, reducing the overall latency for a trivial fetch. * "git fetch" can be told to recursively fetch submodules on-demand. * "git grep -f " learned to treat "-" as "read from the standard input stream". * "git grep --no-index" did not honor pathspecs correctly, returning paths outside the specified area. * "git init" learned the --separate-git-dir option to allow the git directory for a new repository created elsewhere and linked via the gitdir mechanism. This is primarily to help submodule support later to switch between a branch of superproject that has the submodule and another that does not. * "git log" type commands now understand globbing pathspecs. You can say "git log -- '*.txt'" for example. * "git log" family of commands learned --cherry and --cherry-mark options that can be used to view two diverged branches while omitting or highlighting equivalent changes that appear on both sides of a symmetric difference (e.g. "log --cherry A...B"). * A lazy "git merge" that didn't say what to merge used to be an error. When run on a branch that has an upstream defined, however, the command now merges from the configured upstream. * "git mergetool" learned how to drive "beyond compare 3" as well. * "git rerere forget" without pathspec used to forget all the saved conflicts that relate to the current merge; it now requires you to give it pathspecs. * "git rev-list --objects $revs -- $pathspec" now limits the objects listed in its output properly with the pathspec, in preparation for narrow clones. * "git push" with no parameters gives better advice messages when "tracking" is used as the push.default semantics or there is no remote configured yet. * A possible value to the "push.default" configuration variable, 'tracking', gained a synonym that more naturally describes what it does, 'upstream'. * "git rerere" learned a new subcommand "remaining" that is similar to "status" and lists the paths that had conflicts which are known to rerere, but excludes the paths that have already been marked as resolved in the index from its output. "git mergetool" has been updated to use this facility. Also contains various documentation updates. Fixes since v1.7.4 ------------------ All of the fixes in the v1.7.4.X maintenance series are included in this release, unless otherwise noted. * "git fetch" from a client that is mostly following the remote needlessly told all of its refs to the server for both sides to compute the set of objects that need to be transferred efficiently, instead of stopping when the server heard enough. In a project with many tags, this turns out to be extremely wasteful, especially over the smart HTTP transport (sp/maint-{upload,fetch}-pack-stop-early~1). * "git fetch" run from a repository that uses the same repository as its alternate object store as the repository it is fetching from did not tell the server that it already has access to objects reachable from the refs in their common alternate object store, causing it to fetch unnecessary objects (jc/maint-fetch-alt). * "git remote add --mirror" created a configuration that is suitable for doing both a mirror fetch and a mirror push at the same time, which made little sense. We now warn and require the command line to specify either --mirror=fetch or --mirror=push. ---------------------------------------------------------------- Changes since v1.7.5-rc2 are as follows: Junio C Hamano (3): Revert "run-command: prettify -D_FORTIFY_SOURCE workaround" Git 1.7.4.5 Git 1.7.5-rc3 Michael J Gruber (3): git.txt: fix list continuation t3306,t5304: avoid clock skew issues git-svn.txt: Document --mergeinfo René Scharfe (1): archive: document limitation of tar.umask config setting -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest maintenance release Git 1.7.4.5 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.7.4.5.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.4.5.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.4.5.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.7.4.5-1.fc13.$arch.rpm (RPM) This contains only minor documentation fixes accumulated since 1.7.4.4. ---------------------------------------------------------------- Changes since v1.7.4.4 are as follows: Johannes Sixt (1): t2021: mark a test as fixed Junio C Hamano (2): "log --cherry-pick" documentation regression fix Git 1.7.4.5 Michael J Gruber (3): git.txt: fix list continuation t3306,t5304: avoid clock skew issues git-svn.txt: Document --mergeinfo René Scharfe (1): archive: document limitation of tar.umask config setting -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

A release candidate Git 1.7.5.rc2 is available at the usual places for testing: http://www.kernel.org/pub/software/scm/git/ git-1.7.5.rc2.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.5.rc2.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.5.rc2.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: testing/git-*-1.7.5.rc2-1.fc13.$arch.rpm (RPM) It has been a quiet week on the 'master' front. Hopefully we can conclude this cycle early next week with the 1.7.5 final. Knock wood... ---------------------------------------------------------------- Changes since v1.7.5-rc1 are as follows: Alejandro R. Sedeño (1): git-svn: Add a svn-remote..pushurl config key Anders Kaseorg (2): gitk: Take only numeric version components when computing $git_version gitk: Update cherry-pick error message parsing Andrew Garber (1): git-p4: replace each tab with 8 spaces for consistency James Y Knight (1): git-svn: Cache results of running the executable "git config" Jim Meyering (1): remove doubled words, e.g., s/to to/to/, and fix related typos Johannes Sixt (2): t0001: guard a new test with SYMLINKS prerequisite t2021: mark a test as fixed Junio C Hamano (1): Git 1.7.5-rc2 Pat Thoyts (1): gitk: Quote tag names in event bindings to avoid problems with % chars Paul Mackerras (1): gitk: Allow user to control how much of the SHA1 ID gets auto-selected Ramkumar Ramachandra (1): revert: Hide '-r' option in default usage Ramsay Allan Jones (1): i18n: avoid parenthesized string as array initializer Skip (1): gitk: spelling fixes in Russian translation Ævar Arnfjörð Bjarmason (1): Makefile: extract Q_() source strings as ngettext() -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

A release candidate Git 1.7.5-rc1 is available at the usual places for testing: http://www.kernel.org/pub/software/scm/git/ git-1.7.5.rc1.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.5.rc1.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.5.rc1.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: testing/git-*-1.7.5.rc1-1.fc13.$arch.rpm (RPM) Please hunt for regressions and have fun. Thanks. Git v1.7.5 Release Notes (draft) ======================== Updates since v1.7.4 -------------------- * Various MinGW portability fixes. * Various git-p4 enhancements (in contrib). * Various vcs-svn enhancements. * Various git-gui updates (0.14.0). * Update to more modern HP-UX port. * The codebase is getting prepared for i18n/l10n; no translated strings nor translation mechanism in the code yet, but the strings are being marked for l10n. * The bash completion script can now complete symmetric difference for "git diff" command, e.g. "git diff ...bra". * The default minimum length of abbreviated and unique object names can now be configured by setting the core.abbrev configuration variable. * "git apply -v" reports offset lines when the patch does not apply at the exact location recorded in the diff output. * "git config" used to be also known as "git repo-config", but the old name is now officially deprecated. * "git checkout --detach " is a more user friendly synonym for "git checkout ^0". * "git checkout" performed on detached HEAD gives a warning and advice when the commit being left behind will become unreachable from any branch or tag. * "git cherry-pick" and "git revert" can be told to use a custom merge strategy, similar to "git rebase". * "git cherry-pick" remembers which commit failed to apply when it is stopped by conflicts, making it unnecessary to use "commit -c $commit" to conclude it. * "git cvsimport" bails out immediately when the cvs server cannot be reached, without spewing unnecessary error messages that complain about the server response it never got. * "git fetch" vs "git upload-pack" transfer learned 'no-done' protocol extension to save one round-trip after the content negotiation is done. This saves one HTTP RPC, reducing the overall latency for a trivial fetch. * "git fetch" can be told to recursively fetch submodules on-demand. * "git grep -f " learned to treat "-" as "read from the standard input stream". * "git grep --no-index" did not honor pathspecs correctly, returning paths outside the specified area. * "git init" learned the --separate-git-dir option to allow the git directory for a new repository created elsewhere and linked via the gitdir mechanism. This is primarily to help submodule support later to switch between a branch of superproject that has the submodule and another that does not. * "git log" type commands now understand globbing pathspecs. You can say "git log -- '*.txt'" for example. * "git log" family of commands learned --cherry and --cherry-mark options that can be used to view two diverged branches while omitting or highlighting equivalent changes that appear on both sides of a symmetric difference (e.g. "log --cherry A...B"). * A lazy "git merge" that didn't say what to merge used to be an error. When run on a branch that has an upstream defined, however, the command now merges from the configured upstream. * "git mergetool" learned how to drive "beyond compare 3" as well. * "git rerere forget" without pathspec used to forget all the saved conflicts that relate to the current merge; it now requires you to give it pathspecs. * "git rev-list --objects $revs -- $pathspec" now limits the objects listed in its output properly with the pathspec, in preparation for narrow clones. * "git push" with no parameters gives better advice messages when "tracking" is used as the push.default semantics or there is no remote configured yet. * A possible value to the "push.default" configuration variable, 'tracking', gained a synonym that more naturally describes what it does, 'upstream'. * "git rerere" learned a new subcommand "remaining" that is similar to "status" and lists the paths that had conflicts which are known to rerere, but excludes the paths that have already been marked as resolved in the index from its output. "git mergetool" has been updated to use this facility. Also contains various documentation updates. Fixes since v1.7.4 ------------------ All of the fixes in the v1.7.4.X maintenance series are included in this release, unless otherwise noted. * "git fetch" from a client that is mostly following the remote needlessly told all of its refs to the server for both sides to compute the set of objects that need to be transferred efficiently, instead of stopping when the server heard enough. In a project with many tags, this turns out to be extremely wasteful, especially over the smart HTTP transport (sp/maint-{upload,fetch}-pack-stop-early~1). * "git fetch" run from a repository that uses the same repository as its alternate object store as the repository it is fetching from did not tell the server that it already has access to objects reachable from the refs in their common alternate object store, causing it to fetch unnecessary objects (jc/maint-fetch-alt). * "git remote add --mirror" created a configuration that is suitable for doing both a mirror fetch and a mirror push at the same time, which made little sense. We now warn and require the command line to specify either --mirror=fetch or --mirror=push. ---------------------------------------------------------------- Changes since v1.7.5-rc0 are as follows: Dan McGee (2): Remove old binaries from .gitignore Fix two unused variable warnings in gcc 4.6 Jakub Narebski (1): gitweb: Fix parsing of negative fractional timezones in JavaScript Jared Hance (1): merge: match the help text with the documentation Jeff King (7): merge: merge unborn index before setting ref pull: do not clobber untracked files on initial pull remote: disallow some nonsensical option combinations remote: separate the concept of push and fetch mirrors remote: deprecate --mirror docs: fix filter-branch subdir example for exotic repo names pull: do not clobber untracked files on initial pull Jens Lehmann (7): fetch/pull: recurse into submodules when necessary fetch/pull: Add the 'on-demand' value to the --recurse-submodules option config: teach the fetch.recurseSubmodules option the 'on-demand' value Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option fetch/pull: Don't recurse into a submodule when commits are already present submodule update: Don't fetch when the submodule commit is already present fetch/pull: Describe --recurse-submodule restrictions in the BUGS section Joe Ratterman (1): grep: allow -E and -n to be turned on by default via configuration Jonathan Nieder (1): compat: add missing #include Junio C Hamano (8): merge: merge with the default upstream branch without argument "log --cherry-pick" documentation regression fix Doc: mention --delta-base-offset is the default for Porcelain commands Git 1.7.4.3 Update release notes Start preparing for 1.7.4.4 Git 1.7.4.4 Git 1.7.5-rc1 Lawrence Mitchell (1): git.el: Don't use font-lock-compile-keywords Michael J Gruber (3): revisions.txt: consistent use of quotes revisions.txt: structure with a labelled list revisions.txt: language improvements Nguyễn Thái Ngọc Duy (2): git-init.txt: move description section up init, clone: support --separate-git-dir for .git file Nicolas Morey-Chaisemartin (1): submodule: process conflicting submodules only once SZEDER Gábor (1): Documentation: trivial grammar fix in core.worktree description Stephen Boyd (2): Makefile: Cover more files with make check sparse: Fix errors and silence warnings Ævar Arnfjörð Bjarmason (70): i18n: git-init basic messages i18n: git-init "Initialized [...] repository" message i18n: git-clone basic messages i18n: git-clone "Cloning into" message i18n: git-clone "Cloning into" message i18n: git-add basic messages i18n: git-add "The following paths are ignored" message i18n: git-add "did not match any files" message i18n: git-add "remove '%s'" message i18n: git-add "Unstaged changes" message i18n: git-branch basic messages i18n: git-branch "remote branch '%s' not found" message i18n: git-branch "Deleted branch [...]" message i18n: git-branch "git branch -v" messages i18n: git-branch "(no branch)" message i18n: git-checkout basic messages i18n: git-checkout: our/their version message i18n: git-checkout describe_detached_head messages i18n: git-checkout "HEAD is now at" message i18n: git-checkout "Switched to a .. branch" message i18n: git-commit basic messages i18n: git-commit "middle of a merge" message i18n: git-commit formatting messages i18n: git-commit print_summary messages i18n: git-commit "enter the commit message" message i18n: git-commit advice messages i18n: git-diff basic messages i18n: git-fetch basic messages i18n: git-fetch formatting messages i18n: git-fetch update_local_ref messages i18n: git-fetch split up "(non-fast-forward)" message i18n: git-grep basic messages i18n: git-grep "--open-files-in-pager" message i18n: git-log basic messages i18n: git-log "--OPT does not make sense" messages i18n: git-merge basic messages i18n: git-merge "Updating %s..%s" message i18n: git-merge "You have not concluded your merge" messages i18n: git-merge "Wonderful" message i18n: git-mv basic messages i18n: git-mv "bad" messages i18n: git-rm basic messages i18n: git-reset basic messages i18n: git-reset reset_type_names messages i18n: git-reset "Unstaged changes after reset" message i18n: git-tag basic messages i18n: git-tag tag_template message i18n: git-push basic messages i18n: git-push "prevent you from losing" message i18n: git-status basic messages i18n: git-status "nothing to commit" messages i18n: git-status shortstatus messages i18n: git-status "Changes to be committed" message i18n: git-status "Initial commit" message i18n: git-status "renamed: " message i18n: git-archive basic messages i18n: git-bundle basic messages i18n: git-clean basic messages i18n: git-clean clean.requireForce messages i18n: git-describe basic messages i18n: git-gc basic messages i18n: git-gc "Auto packing the repository" message i18n: git-notes basic commands i18n: git-notes GIT_NOTES_REWRITE_MODE error message i18n: git-revert basic messages i18n: git-revert "Your local changes" message i18n: git-revert literal "me" messages i18n: git-revert split up "could not revert/apply" message i18n: git-shortlog basic messages t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUT -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest maintenance release Git 1.7.4.4 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.7.4.4.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.4.4.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.7.4.4.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.7.4.4-1.fc13.$arch.rpm (RPM) Git v1.7.4.4 Release Notes ========================== Fixes since v1.7.4.3 -------------------- * Compilation of sha1_file.c on BSD platforms were broken due to our recent use of getrlimit() without including . * "git config" did not diagnose incorrect configuration variable names. * "git format-patch" did not wrap a long subject line that resulted from rfc2047 encoding. * "git instaweb" should work better again with plackup. * "git log --max-count=4 -Sfoobar" now shows 4 commits that changes the number of occurrences of string "foobar"; it used to scan only for 4 commits and then emitted only matching ones. * "git log --first-parent --boundary $c^..$c" segfaulted on a merge. * "git pull" into an empty branch should have behaved as if fast-forwarding from emptiness to the version being pulled, with the usual protection against overwriting untracked files. * "git submodule" that is run while a merge in the superproject is in conflicted state tried to process each conflicted submodule up to three times. * "git status" spent all the effort to notice racily-clean index entries but didn't update the index file to help later operations go faster in some cases. And other minor fixes and documentation updates. ---------------------------------------------------------------- Changes since v1.7.4.3 are as follows: Jakub Narebski (2): git-instaweb: Change how gitweb.psgi is made runnable as standalone app gitweb: Fix parsing of negative fractional timezones in JavaScript Jeff King (4): strbuf: add fixed-length version of add_wrapped_text format-patch: wrap long header lines format-patch: rfc2047-encode newlines in headers pull: do not clobber untracked files on initial pull Jonathan Nieder (1): compat: add missing #include Junio C Hamano (6): list-objects.c: don't add an unparsed NULL as a pending tree Rename core.abbrevlength back to core.abbrev diff/status: refactor opportunistic index update update $GIT_INDEX_FILE when there are racily clean entries Start preparing for 1.7.4.4 Git 1.7.4.4 Libor Pechacek (2): Sanity-check config variable names Disallow empty section and variable names Linus Torvalds (1): Make the default abbrev length configurable Matthieu Moy (1): log: fix --max-count when used together with -S or -G Michael J Gruber (2): git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting git-log.txt,rev-list-options.txt: put option blocks in proper order Nicolas Morey-Chaisemartin (1): submodule: process conflicting submodules only once SZEDER Gábor (1): Documentation: trivial grammar fix in core.worktree description -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]