Git

A release candidate Git 1.7.9.rc1 is available for testing. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: b97f10508f16b4117499cdfc4df9b19c725027d5 git-1.7.9.rc1.tar.gz ... [More] 3064fc295a46440a91ca3f5fa622f5f1d40d3ba4 git-htmldocs-1.7.9.rc1.tar.gz 332e12061823d8def0fb823fa7798093bbe41279 git-manpages-1.7.9.rc1.tar.gz Also the following public repositories all have a copy of the v1.7.9.rc1 tag and the master branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.7.9 Release Notes (draft) ======================== Updates since v1.7.8 -------------------- * gitk updates accumulated since early 2011. * git-gui updated to 0.16.0. * git-p4 (in contrib/) updates. * Git uses gettext to translate its most common interface messages into the user's language if translations are available and the locale is appropriately set. Distributors can drop in new PO files in po/ to add new translations. * The code to handle username/password for HTTP transaction used in "git push" & "git fetch" learned to talk "credential API" to external programs to cache or store them, to allow integration with platform native keychain mechanisms. * The prompted input in the terminal use our own getpass() replacement when possible. HTTP transactions used to ask username without echoing back what was typed, but with this change you will see it as you type. * The internal of "revert/cherry-pick" has been tweaked to prepare building more generic "sequencer" on top of the implementation that drives them. * "git rev-parse FETCH_HEAD" after "git fetch" without specifying what to fetch from the command line will now show the commit that would be merged if the command were "git pull". * "git add" learned to stream large files directly into a packfile instead of writing them into individual loose object files. * "git checkout -B " is a more intuitive way to spell "git reset --keep ". * "git checkout" and "git merge" learned "--no-overwrite-ignore" option to tell Git that untracked and ignored files are not expendable. * "git commit --amend" learned "--no-edit" option to say that the user is amending the tree being recorded, without updating the commit log message. * "git commit" and "git reset" re-learned the optimization to prime the cache-tree information in the index, which makes it faster to write a tree object out after the index entries are updated. * "git commit" detects and rejects an attempt to stuff NUL byte in the commit log message. * "git commit" learned "-S" to GPG-sign the commit; this can be shown with the "--show-signature" option to "git log". * fsck and prune are relatively lengthy operations that still go silent while making the end-user wait. They learned to give progress output like other slow operations. * The set of built-in function-header patterns for various languages knows MATLAB. * "git log --format=''" learned new %g[nNeE] specifiers to show information from the reflog entries when warlking the reflog (i.e. with "-g"). * "git pull" can be used to fetch and merge an annotated/signed tag, instead of the tip of a topic branch. The GPG signature from the signed tag is recorded in the resulting merge commit for later auditing. * "git log" learned "--show-signature" option to show the signed tag that was merged that is embedded in the merge commit. It also can show the signature made on the commit with "git commit -S". * "git branch --edit-description" can be used to add descriptive text to explain what a topic branch is about. * "git fmt-merge-msg" learned to take the branch description into account when preparing a merge summary that "git merge" records when merging a local branch. * "git request-pull" has been updated to convey more information useful for integrators to decide if a topic is worth merging and what is pulled is indeed what the requestor asked to pull, including: - the tip of the branch being requested to be merged; - the branch description describing what the topic is about; - the contents of the annotated tag, when requesting to pull a tag. * "git pull" learned to notice 'pull.rebase' configuration variable, which serves as a global fallback for setting 'branch..rebase' configuration variable per branch. * "git tag" learned "--cleanup" option to control how the whitespaces and empty lines in tag message are cleaned up. * "gitweb" learned to show side-by-side diff. Also contains minor documentation updates and code clean-ups. Fixes since v1.7.8 ------------------ Unless otherwise noted, all the fixes since v1.7.8 in the maintenance releases are contained in this release (see release notes to them for details). ---------------------------------------------------------------- Changes since v1.7.9-rc0 are as follows: Ben Walton (1): Use perl instead of sed for t8006-blame-textconv test Carlos Martín Nieto (1): archive: re-allow HEAD:Documentation on a remote invocation Clemens Buchacher (1): credentials: unable to connect to cache daemon Jeff King (5): send-email: multiedit is a boolean config option attr: don't confuse prefixes with leading directories attr: drop misguided defensive coding attr: fix leak in free_attr_elem thin-pack: try harder to use preferred base objects as base Junio C Hamano (11): attr.c: make bootstrap_attr_stack() leave early attr.c: clarify the logic to pop attr_stack Documentation: rerere's rr-cache auto-creation and rerere.enabled Prepare for 1.7.6.6 Prepare for 1.7.7.6 Prepare for 1.7.8.4 request-pull: use the real fork point when preparing the message Update draft release notes to 1.7.6.6 Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.8.4 Git 1.7.9-rc1 Matthieu Moy (1): gitweb: accept trailing "/" in $project_list Michael Haggerty (3): receive-pack: move more work into write_head_info() show_ref(): remove unused "flag" and "cb_data" arguments write_head_info(): handle "extra refs" locally Nguyễn Thái Ngọc Duy (1): t2203: fix wrong commit command Sebastian Schuberth (2): t9200: On MSYS, do not pass Windows-style paths to CVS git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS Thomas Rast (1): mailinfo documentation: accurately describe non -k case -- 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.9-rc0 is available for testing. This is supposed to be almost feature-complete for the final release. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums ... [More] are: c4a04c92ce9a501ba11cfd0032b1f8371aa6536e git-1.7.9.rc0.tar.gz 60593473ab1111e1bf5af5e491e370ff6a9e9e10 git-htmldocs-1.7.9.rc0.tar.gz 834eff04341ef5bf475654c7a9588d29ae15937c git-manpages-1.7.9.rc0.tar.gz Also the following public repositories all have a copy of the v1.7.9-rc0 tag and the master branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.7.9 Release Notes (draft) ======================== Updates since v1.7.8 -------------------- * gitk updates accumulated since early 2011. * git-gui updated to 0.16.0. * git-p4 (in contrib/) updates. * Git uses gettext to translate its most common interface messages into the user's language if translations are available and the locale is appropriately set. Distributors can drop in new PO files in po/ to add new translations. * The code to handle username/password for HTTP transaction used in "git push" & "git fetch" learned to talk "credential API" to external programs to cache or store them, to allow integration with platform native keychain mechanisms. * The prompted input in the terminal use our own getpass() replacement when possible. HTTP transactions used to ask username without echoing back what was typed, but with this change you will see it as you type. * The internal of "revert/cherry-pick" has been tweaked to prepare building more generic "sequencer" on top of the implementation that drives them. * "git add" learned to stream large files directly into a packfile instead of writing them into individual loose object files. * "git checkout -B " is a more intuitive way to spell "git reset --keep ". * "git checkout" and "git merge" learned "--no-overwrite-ignore" option to tell Git that untracked and ignored files are not expendable. * "git commit --amend" learned "--no-edit" option to say that the user is amending the tree being recorded, without updating the commit log message. * "git commit" and "git reset" re-learned the optimization to prime the cache-tree information in the index, which makes it faster to write a tree object out after the index entries are updated. * "git commit" detects and rejects an attempt to stuff NUL byte in the commit log message. * "git commit" learned "-S" to GPG-sign the commit; this can be shown with the "--show-signature" option to "git log". * fsck and prune are relatively lengthy operations that still go silent while making the end-user wait. They learned to give progress output like other slow operations. * The set of built-in function-header patterns for various languages knows MATLAB. * "git log --format=''" learned new %g[nNeE] specifiers to show information from the reflog entries when warlking the reflog (i.e. with "-g"). * "git pull" can be used to fetch and merge an annotated/signed tag, instead of the tip of a topic branch. The GPG signature from the signed tag is recorded in the resulting merge commit for later auditing. * "git log" learned "--show-signature" option to show the signed tag that was merged that is embedded in the merge commit. It also can show the signature made on the commit with "git commit -S". * "git branch --edit-description" can be used to add descriptive text to explain what a topic branch is about. * "git fmt-merge-msg" learned to take the branch description into account when preparing a merge summary that "git merge" records when merging a local branch. * "git request-pull" has been updated to convey more information useful for integrators to decide if a topic is worth merging and what is pulled is indeed what the requestor asked to pull, including: - the tip of the branch being requested to be merged; - the branch description describing what the topic is about; - the contents of the annotated tag, when requesting to pull a tag. * "git pull" learned to notice 'pull.rebase' configuration variable, which serves as a global fallback for setting 'branch..rebase' configuration variable per branch. * "git tag" learned "--cleanup" option to control how the whitespaces and empty lines in tag message are cleaned up. * "gitweb" learned to show side-by-side diff. Also contains minor documentation updates and code clean-ups. Fixes since v1.7.8 ------------------ Unless otherwise noted, all the fixes since v1.7.8 in the maintenance releases are contained in this release (see release notes to them for details). ---------------------------------------------------------------- Changes since v1.7.8 are as follows: Anders Kaseorg (2): gitk: Remove unused $cdate array gitk: Remember time zones from author and commit timestamps Andrew Wong (1): rebase -i: interrupt rebase when "commit --amend" failed during "reword" Bert Wesarg (14): git-gui: fix multi selected file operation git-gui: handle config booleans without value git-gui: add smart case search mode in searchbar git-gui: add regexp search mode to the searchbar git-gui: add search history to searchbar git-gui: fix unintended line break in message string git-gui: use "untracked" for files which are not known to git git-gui: new config to control staging of untracked files git-gui: fix display of path in browser title git-gui: use a tristate to control the case mode in the searchbar git-gui: span widgets over the full file output area in the blame view git-gui: include the file path in guitools confirmation dialog git-gui: make config gui.warndetachedcommit a boolean git-gui: don't warn for detached head when rebasing Brandon Casey (2): t/t4131-apply-fake-ancestor.sh: fix broken test builtin/apply.c: report error on failure to recognize input Brian Harring (1): fix hang in git fetch if pointed at a 0 length bundle Carlos Martín Nieto (2): convert: track state in LF-to-CRLF filter clone: the -o option has nothing to do with Clemens Buchacher (2): Documentation: read-tree --prefix works with existing subtrees t5550: repack everything into one file Conrad Irwin (1): Update documentation for stripspace Dejan Ribič (1): git-gui: fix spelling error in sshkey.tcl Eric Wong (1): enable SO_KEEPALIVE for connected TCP sockets Erik Faye-Lund (3): mingw: give waitpid the correct signature compat/setenv.c: update errno when erroring out compat/setenv.c: error if name contains '=' Gary Gibbons (5): git-p4: ensure submit clientPath exists before chdir git-p4: use absolute directory for PWD env var git-p4: fix test for unsupported P4 Client Views git-p4: sort client views by reverse View number git-p4: support single file p4 client view maps Gustaf Hendeby (1): Add built-in diff patterns for MATLAB code Jack Nagel (2): Documentation: fix formatting error in merge-options.txt Add MYMETA.json to perl/.gitignore Jakub Narebski (7): gitweb: Refactor diff body line classification gitweb: Extract formatting of diff chunk header gitweb: Give side-by-side diff extra CSS styling t9500: Add test for handling incomplete lines in diff by gitweb t9500: Add basic sanity tests for side-by-side diff in gitweb gitweb: Use href(-replay=>1,...) for formats links in "commitdiff" gitweb: Fix fallback mode of to_utf8 subroutine Jeff King (53): http: drop "local" member from request struct prune: handle --progress/no-progress reachable: per-object progress read-cache: let refresh_cache_ent pass up changed flags refresh_index: rename format variables refresh_index: make porcelain output more specific upload-archive: use start_command instead of fork archive: don't let remote clients get unreachable commits stripspace: fix outdated comment fetch: create status table using strbuf test-lib: add test_config_global variant t5550: fix typo introduce credentials API credential: add function for parsing url components http: use credential API to get passwords credential: apply helper config credential: add credential.*.username credential: make relevance of http path configurable docs: end-user documentation for the credential subsystem credentials: add "cache" helper compat/snprintf: don't look at va_list twice docs: mention "-k" for both forms of "git mv" mv: honor --verbose flag mv: make non-directory destination error more clear mv: improve overwrite warning mv: be quiet about overwriting strbuf: add strbuf_add*_urlencode imap-send: avoid buffer overflow imap-send: don't check return value of git_getpass move git_getpass to its own source file refactor git_getpass into generic prompt function add generic terminal prompt function credentials: add "store" helper prompt: use git_terminal_prompt t: add test harness for external credential helpers credential: use git_prompt instead of git_getpass Makefile: linux has /dev/tty Makefile: OS X has /dev/tty contrib: add credential helper for OS X Keychain drop "match" parameter from get_remote_heads t5500: give fully-qualified refs to fetch-pack fetch-pack: match refs exactly connect.c: drop path_match function t5540: test DAV push with authentication http-push: enable "proactive auth" blame: don't overflow time buffer test-lib: redirect stdin of tests use custom rename score during --follow pretty: give placeholders to reflog identity docs: brush up obsolete bits of git-fsck manpage make "git push -v" actually verbose commit, merge: initialize static strbuf remote-curl: don't pass back fake refs Jelmer Vernooij (1): Fix an incorrect reference to --set-all. Jens Lehmann (2): diff/status: print submodule path when looking for changes fails docs: describe behavior of relative submodule URLs Joey Hess (1): write first for-merge ref to FETCH_HEAD first Johan Herland (3): t9301: Fix testcase covering up a bug in fast-import's notes fanout handling t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling fast-import: Fix incorrect fanout level when modifying existing notes refs Johannes Sixt (3): Compatibility: declare strtoimax() under NO_STRTOUMAX Makefile: unix sockets may not available on some platforms t0090: be prepared that 'wc -l' writes leading blanks Jonathan Nieder (15): gitk: Make vi-style keybindings more vi-like branch: allow a no-op "branch -M HEAD" Allow checkout -B to update the current branch test: add missing "&&" after echo command test: remove a porcelain test that hard-codes commit names t7501 (commit): modernize style test: commit --amend should honor --no-edit revert: give --continue handling its own function revert: allow cherry-pick --continue to commit before resuming revert: pass around rev-list args in already-parsed form revert: allow single-pick in the middle of cherry-pick sequence revert: do not remove state until sequence is finished Revert "reset: Make reset remove the sequencer state" revert: stop creating and removing sequencer-old directory test: errors preparing for a test are not special Jonathon Mah (1): stash: Don't fail if work dir contains file named 'HEAD' Junio C Hamano (65): branch: add read_branch_desc() helper function format-patch: use branch description in cover letter branch: teach --edit-description option request-pull: modernize style request-pull: state what commit to expect request-pull: use the branch description fmt-merge-msg: use branch.$name.description get_tree_entry(): do not call find_tree_entry() on an empty tree unpack_object_header_buffer(): clear the size field upon error write_pack_header(): a helper function create_tmp_packfile(): a helper function finish_tmp_packfile(): a helper function Split GPG interface into its own helper library merge: notice local merging of tags and keep it unwrapped fetch: allow "git fetch $there v1.0" to fetch a tag refs DWIMmery: use the same rule for both "git fetch" and others fmt-merge-msg: avoid early returns fmt-merge-msg: package options into a structure fmt-merge-msg: Add contents of merged tag in the merge message merge: make usage of commit->util more extensible merge: record tag objects without peeling in MERGE_HEAD request-pull: use the annotated tag contents commit: copy merged signed tags to headers of merge commit merge: force edit and no-ff mode when merging a tag object commit: teach --amend to carry forward extra headers commit-tree: update the command line parsing commit-tree: teach -m/-F options to read logs from elsewhere commit: teach --gpg-sign option log: --show-signature test "commit -S" and "log --show-signature" pretty: %G[?GS] placeholders receive-pack, fetch-pack: reject bogus pack that records objects twice pack-object: tolerate broken packs that have duplicated objects gpg-interface: allow use of a custom GPG binary csum-file: introduce sha1file_checkpoint bulk-checkin: replace fast-import based implementation Kick-off the 1.7.9 cycle checkout -m: no need to insist on having all 3 stages commit: honour --no-edit Update draft release notes for 1.7.9 Git 1.7.6.5 Git 1.7.7.5 Update draft release notes for 1.7.8.1 Update draft release notes to 1.7.9 checkout_merged(): squelch false warning from some gcc request-pull: update the "pull" command generation logic lf_to_crlf_filter(): tell the caller we added "\n" when draining Update draft release notes to 1.7.9 lf_to_crlf_filter(): resurrect CRLF->CRLF hack advice: Document that they all default to true request-pull: do not emit "tag" before the tagname Update draft release notes to 1.7.9 commit: do not lose mergetag header when not amending Git 1.7.8.1 Update draft release notes to 1.7.9 Update draft release notes in preparation for 1.7.9-rc0 Git 1.7.8.2 Update draft release notes to 1.7.9 verify_signed_buffer: fix stale comment commit --amend -S: strip existing gpgsig headers log-tree.c: small refactor in show_signature() log-tree: show mergetag in log --show-signature output log --show-signature: reword the common two-head merge case Git 1.7.8.3 Git 1.7.9-rc0 Jürgen Kreileder (3): gitweb: Call to_utf8() on input string in chop_and_escape_str() gitweb: esc_html() site name for title in OPML gitweb: Output valid utf8 in git_blame_common('data') Kato Kazuyoshi (2): gitweb: Add a feature to show side-by-side diff gitweb: Add navigation to select side-by-side diff Kirill A. Shutemov (1): git-tag: introduce --cleanup option Linus Torvalds (1): fetch: do not store peeled tag object names in FETCH_HEAD Martin von Zweigbergk (11): gitk: Fix file highlight when run in subdirectory gitk: Fix "show origin of this line" with separate work tree gitk: Fix "blame parent commit" with separate work tree gitk: Fix "External diff" with separate work tree gitk: Put temporary directory inside .git gitk: Run 'git rev-parse --git-dir' only once gitk: Simplify calculation of gitdir gitk: Show modified files with separate work tree am: don't persist keepcr flag t3401: modernize style t3401: use test_commit in setup Michael Haggerty (17): git symbolic-ref: documentation fix struct ref_entry: document name member refs: rename "refname" variables refs: rename parameters result -> sha1 clear_ref_array(): rename from free_ref_array() is_refname_available(): remove the "quiet" argument parse_ref_line(): add docstring add_ref(): add docstring is_dup_ref(): extract function from sort_ref_array() refs: change signatures of get_packed_refs() and get_loose_refs() get_ref_dir(): change signature resolve_gitlink_ref(): improve docstring Pass a (ref_cache *) to the resolve_gitlink_*() helper functions resolve_gitlink_ref_recursive(): change to work with struct ref_cache repack_without_ref(): remove temporary create_ref_entry(): extract function from add_ref() add_ref(): take a (struct ref_entry *) parameter Michael Schubert (2): builtin/commit: add missing '/' in help message builtin/log: remove redundant initialization Mika Fischer (3): http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping http.c: Use timeout suggested by curl instead of fixed 50ms timeout http.c: Rely on select instead of tracking whether data was received Nguyễn Thái Ngọc Duy (20): tree-walk.c: do not leak internal structure in tree_entry_len() read_directory_recursive: reduce one indentation level tree_entry_interesting(): give meaningful names to return values tree_entry_interesting: make use of local pointer "item" fsck: return error code when verify_pack() goes wrong verify_packfile(): check as many object as possible in a pack fsck: avoid reading every object twice fsck: print progress prune: show progress while marking reachable objects Convert many resolve_ref() calls to read_ref*() and ref_exists() checkout,merge: loosen overwriting untracked file check based on info/exclude checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore Copy resolve_ref() return value for longer use revert: convert resolve_ref() to read_ref_full() Convert resolve_ref xstrdup to new resolve_refdup function Rename resolve_ref() to resolve_ref_unsafe() merge: abort if fails to commit Convert commit_tree() to take strbuf as message commit_tree(): refuse commit messages that contain NULs Catch invalid --depth option passed to clone or fetch Nick Alcock (2): Add strtoimax() compatibility function. Support sizes >=2G in various config options accepting 'g' sizes. Pat Thoyts (11): git-gui: include the number of untracked files to stage when asking the user git-gui: theme the search and line-number entry fields on blame screen git-gui: catch invalid or complete regular expressions and treat as no match. git-gui: enable the smart case sensitive search only if gui.search.smartcase is true git-gui: set suitable extended window manager hints. git-gui: support underline style when parsing diff output git-gui: sort the numeric ansi codes git-gui: set whitespace warnings appropriate to this project git-gui: added config gui.gcwarning to disable the gc hint message git-gui: handle shell script text filters when loading for blame. git-gui 0.16 Paul Mackerras (1): gitk: Update copyright Pete Harlan (1): Test 'checkout -m -- path' Pete Wyckoff (18): git-p4: introduce skipSubmitEdit git-p4: submit test for auto-creating clientPath git-p4: test for absolute PWD problem git-p4: fix skipSubmitEdit regression rename git-p4 tests git-p4: introduce asciidoc documentation git-p4: clone does not use --git-dir git-p4: test cloning with two dirs, clarify doc git-p4: document and test clone --branch git-p4: honor --changesfile option and test git-p4: document and test --import-local git-p4: test --max-changes git-p4: test --keep-path git-p4: test and document --use-client-spec git-p4: document and test submit options git-p4: test client view handling git-p4: rewrite view handling git-p4: view spec documentation Ramkumar Ramachandra (11): t3200 (branch): fix '&&' chaining test: fix '&&' chaining t3030 (merge-recursive): use test_expect_code t1510 (worktree): fix '&&' chaining t3040 (subprojects-basic): fix '&&' chaining, modernize style revert: free msg in format_todo() revert: make commit subjects in insn sheet optional revert: tolerate extra spaces, tabs in insn sheet revert: simplify getting commit subject in format_todo() t3510 (cherry-pick-sequencer): use exit status t3502, t3510: clarify cherry-pick -m failure Ramsay Allan Jones (3): builtin/log.c: Fix an "Using plain integer as NULL pointer" warning environment.c: Fix an sparse "symbol not declared" warning fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse error Raphael Zimmerer (1): gitk: When a commit contains a note, mark it with a yellow box René Scharfe (5): read-cache.c: allocate index entries individually cache.h: put single NUL at end of struct cache_entry use struct sha1_array in diff_tree_combined() pass struct commit to diff_tree_combined_merge() submodule: use diff_tree_combined_merge() instead of diff_tree_combined() SZEDER Gábor (9): completion: document __gitcomp() completion: optimize refs completion completion: make refs completion consistent for local and remote repos completion: improve ls-remote output filtering in __git_refs() completion: support full refs from remote repositories completion: query only refs/heads/ in __git_refs_remotes() completion: improve ls-remote output filtering in __git_refs_remotes() completion: fast initial completion for config 'remote.*.fetch' value completion: remove broken dead code from __git_heads() and __git_tags() Samuel Bronson (1): git-gui: Set both 16x16 and 32x32 icons on X to pacify Xming. Sebastian Morr (1): Add MYMETA.yml to perl/.gitignore Steven Walter (1): git-svn.perl: close the edit for propedits even with no mods Thomas Jarosch (1): imap-send: Remove unused 'use_namespace' variable Thomas Rast (13): userdiff: allow * between cpp funcname words Add test-scrap-cache-tree Test the current state of the cache-tree optimization Refactor cache_tree_update idiom from commit commit: write cache-tree data when writing index anyway reset: update cache-tree data when appropriate grep: load funcname patterns for -W grep: enable threading with -p and -W using lazy attribute lookup grep: disable threading in non-worktree case test-terminal: set output terminals to raw mode git-sh-setup: make require_clean_work_tree part of the interface bash completion: use read -r everywhere Documentation: rerere.enabled is the primary way to configure rerere Tilman Vogel (1): git-gui: add config value gui.diffopts for passing additional diff options Vincent van Ravesteijn (4): Compile fix for MSVC: Do not include sys/resources.h Compile fix for MSVC: Include MSVC: Remove unneeded header stubs Show error for 'git merge' with unset merge.defaultToUpstream Yggy King (1): gitk: Make "touching paths" search support backslashes Ævar Arnfjörð Bjarmason (9): apply: get rid of useless x < 0 comparison on a size_t type cast variable in call to free() in builtin/diff.c and submodule.c pull: introduce a pull.rebase option to enable --rebase i18n: add infrastructure for translating Git with gettext t/t2023-checkout-m.sh: fix use of test_must_fail builtin/init-db.c: eliminate -Wformat warning on Solaris Fix an enum assignment issue spotted by Sun Studio Fix a bitwise negation assignment issue spotted by Sun Studio Appease Sun Studio by renaming "tmpfile" -- 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.8.3 is available. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: e5eb8c289b69d69fd08c81b587a06eb5dd2b5c1c git-1.7.8.3.tar.gz ... [More] 8a65d2425c1b6f646d130cf5846e92e9e0e93736 git-htmldocs-1.7.8.3.tar.gz a6e2b7cff8181ee52a1cc00ebba7b349850d6680 git-manpages-1.7.8.3.tar.gz Also the following public repositories all have a copy of the v1.7.8.3 tag and the maint branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git ---------------------------------------------------------------- Changes since v1.7.8.2 are as follows: Brian Harring (1): fix hang in git fetch if pointed at a 0 length bundle Clemens Buchacher (2): Documentation: read-tree --prefix works with existing subtrees t5550: repack everything into one file Jack Nagel (1): Add MYMETA.json to perl/.gitignore Jakub Narebski (1): gitweb: Fix fallback mode of to_utf8 subroutine Jens Lehmann (1): docs: describe behavior of relative submodule URLs Junio C Hamano (1): Git 1.7.8.3 Jürgen Kreileder (3): gitweb: Call to_utf8() on input string in chop_and_escape_str() gitweb: esc_html() site name for title in OPML gitweb: Output valid utf8 in git_blame_common('data') Nguyễn Thái Ngọc Duy (1): Catch invalid --depth option passed to clone or fetch Thomas Rast (1): Documentation: rerere.enabled is the primary way to configure rerere -- 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.8.2 is available. It contains accumulated fixes that applies to the 1.7.8.X maintenance track that have already been applied to the 'master' branch to be part of the upcoming 1.7.9 release. The release tarballs ... [More] are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 7187c1af96db0c181b801957d6e152ec7cd60ab6 git-1.7.8.2.tar.gz 9047175e5c46aa3260c42e6b4459cf4ee5a7bb8a git-htmldocs-1.7.8.2.tar.gz cc394a0a9689297fddad40c1ccbded0ba9d708da git-manpages-1.7.8.2.tar.gz Also the following public repositories all have a copy of the v1.7.8.2 tag and the maint branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.7.8.2 Release Notes ========================== Fixes since v1.7.8.1 -------------------- * Porcelain commands like "git reset" did not distinguish deletions and type-changes from ordinary modification, and reported them with the same 'M' moniker. They now use 'D' (for deletion) and 'T' (for type-change) to match "git status -s" and "git diff --name-status". * The configuration file parser used for sizes (e.g. bigFileThreshold) did not correctly interpret 'g' suffix. * The replacement implemention for snprintf used on platforms with native snprintf that is broken did not use va_copy correctly. * LF-to-CRLF streaming filter replaced all LF with CRLF, which might be techinically correct but not friendly to people who are trying to recover from earlier mistakes of using CRLF in the repository data in the first place. It now refrains from doing so for LF that follows a CR. * git native connection going over TCP (not over SSH) did not set SO_KEEPALIVE option which failed to receive link layer errors. * "git branch -m HEAD" is an obvious no-op but was not allowed. * "git checkout -m" did not recreate the conflicted state in a "both sides added, without any common ancestor version" conflict situation. * "git cherry-pick $commit" (not a range) created an unnecessary sequencer state and interfered with valid workflow to use the command during a session to cherry-pick multiple commits. * You could make "git commit" segfault by giving the "--no-message" option. * "fast-import" did not correctly update an existing notes tree, possibly corrupting the fan-out. * "git fetch-pack" accepted unqualified refs that do not begin with refs/ by mistake and compensated it by matching the refspec with tail-match, which was doubly wrong. This broke fetching from a repository with a funny named ref "refs/foo/refs/heads/master" and a 'master' branch with "git fetch-pack refs/heads/master", as the command incorrectly considered the former a "match". * "git log --follow" did not honor the rename threshold score given with the -M option (e.g. "-M50%"). * "git mv" gave suboptimal error/warning messages when it overwrites target files. It also did not pay attention to "-v" option. * Authenticated "git push" over dumb HTTP were broken with a recent change and failed without asking for password when username is given. * "git push" to an empty repository over HTTP were broken with a recent change to the ref handling. * "git push -v" forgot how to be verbose by mistake. It now properly becomes verbose when asked to. * When a "reword" action in "git rebase -i" failed to run "commit --amend", we did not give the control back to the user to resolve the situation, and instead kept the original commit log message. Also contains 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]

The latest maintenance release Git 1.7.8.1 is available. Note that this is not a release with new features (upcoming 1.7.9 is expected to be released late January next year to include the pulling of signed tags and other goodies). The release ... [More] tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 198e23e6e50245331590a6159ccdbdbe1792422c git-1.7.8.1.tar.gz 8f674dba39d9ae78928abfe9d924b0855e283e98 git-htmldocs-1.7.8.1.tar.gz b49ce0b4da4f85671693c9b2c6f6a8b8ee65c809 git-manpages-1.7.8.1.tar.gz Also the following public repositories all have a copy of the v1.7.8.1 tag and the maint branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.7.8.1 Release Notes ========================== Fixes since v1.7.8 ------------------ * In some codepaths (notably, checkout and merge), the ignore patterns recorded in $GIT_DIR/info/exclude were not honored. They now are. * "git apply --check" did not error out when given an empty input without any patch. * "git archive" mistakenly allowed remote clients to ask for commits that are not at the tip of any ref. * "git checkout" and "git merge" treated in-tree .gitignore and exclude file in $GIT_DIR/info/ directory inconsistently when deciding which untracked files are ignored and expendable. * LF-to-CRLF streaming filter used when checking out a large-ish blob fell into an infinite loop with a rare input. * The function header pattern for files with "diff=cpp" attribute did not consider "type *funcname(type param1,..." as the beginning of a function. * The error message from "git diff" and "git status" when they fail to inspect changes in submodules did not report which submodule they had trouble with. * After fetching from a remote that has very long refname, the reporting output could have corrupted by overrunning a static buffer. * "git pack-objects" avoids creating cyclic dependencies among deltas when seeing a broken packfile that records the same object in both the deflated form and as a delta. Also contains minor fixes and documentation updates. ---------------------------------------------------------------- Changes since v1.7.8 are as follows: Brandon Casey (2): t/t4131-apply-fake-ancestor.sh: fix broken test builtin/apply.c: report error on failure to recognize input Carlos Martín Nieto (2): convert: track state in LF-to-CRLF filter clone: the -o option has nothing to do with Erik Faye-Lund (1): mingw: give waitpid the correct signature Jack Nagel (1): Documentation: fix formatting error in merge-options.txt Jeff King (5): http: drop "local" member from request struct archive: don't let remote clients get unreachable commits stripspace: fix outdated comment fetch: create status table using strbuf blame: don't overflow time buffer Jens Lehmann (1): diff/status: print submodule path when looking for changes fails Junio C Hamano (9): get_tree_entry(): do not call find_tree_entry() on an empty tree unpack_object_header_buffer(): clear the size field upon error receive-pack, fetch-pack: reject bogus pack that records objects twice pack-object: tolerate broken packs that have duplicated objects Git 1.7.6.5 Git 1.7.7.5 Update draft release notes for 1.7.8.1 lf_to_crlf_filter(): tell the caller we added "\n" when draining Git 1.7.8.1 Martin von Zweigbergk (1): am: don't persist keepcr flag Michael Haggerty (1): git symbolic-ref: documentation fix Michael Schubert (2): builtin/commit: add missing '/' in help message builtin/log: remove redundant initialization Mika Fischer (3): http.c: Use curl_multi_fdset to select on curl fds instead of just sleeping http.c: Use timeout suggested by curl instead of fixed 50ms timeout http.c: Rely on select instead of tracking whether data was received Nguyễn Thái Ngọc Duy (5): tree-walk.c: do not leak internal structure in tree_entry_len() read_directory_recursive: reduce one indentation level tree_entry_interesting(): give meaningful names to return values tree_entry_interesting: make use of local pointer "item" checkout,merge: loosen overwriting untracked file check based on info/exclude Sebastian Morr (1): Add MYMETA.yml to perl/.gitignore Thomas Rast (1): userdiff: allow * between cpp funcname words Ævar Arnfjörð Bjarmason (3): apply: get rid of useless x < 0 comparison on a size_t type cast variable in call to free() in builtin/diff.c and submodule.c builtin/init-db.c: eliminate -Wformat warning on Solaris -- 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.8 is available. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 7453e737e008f7319a5eca24a9ef3c5fb1f13398 git-1.7.8.tar.gz ... [More] 2734079e22a0a6e3e78779582be9138ffc7de6f7 git-htmldocs-1.7.8.tar.gz 93315f7f51d7f27d3e421c9b0d64afa27f3d16df git-manpages-1.7.8.tar.gz Also the following public repositories all have a copy of the v1.7.8 tag and the master branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.7.8 Release Notes ======================== Updates since v1.7.7 -------------------- * Some git-svn, git-gui, git-p4 (in contrib) and msysgit updates. * Updates to bash completion scripts. * The build procedure has been taught to take advantage of computed dependency automatically when the complier supports it. * The date parser now accepts timezone designators that lack minutes part and also has a colon between "hh:mm". * The contents of the /etc/mailname file, if exists, is used as the default value of the hostname part of the committer/author e-mail. * "git am" learned how to read from patches generated by Hg. * "git archive" talking with a remote repository can report errors from the remote side in a more informative way. * "git branch" learned an explicit --list option to ask for branches listed, optionally with a glob matching pattern to limit its output. * "git check-attr" learned "--cached" option to look at .gitattributes files from the index, not from the working tree. * Variants of "git cherry-pick" and "git revert" that take multiple commits learned to "--continue" and "--abort". * "git daemon" gives more human readble error messages to clients using ERR packets when appropriate. * Errors at the network layer is logged by "git daemon". * "git diff" learned "--minimal" option to spend extra cycles to come up with a minimal patch output. * "git diff" learned "--function-context" option to show the whole function as context that was affected by a change. * "git difftool" can be told to skip launching the tool for a path by answering 'n' to its prompt. * "git fetch" learned to honor transfer.fsckobjects configuration to validate the objects that were received from the other end, just like "git receive-pack" (the receiving end of "git push") does. * "git fetch" makes sure that the set of objects it received from the other end actually completes the history before updating the refs. "git receive-pack" (the receiving end of "git push") learned to do the same. * "git fetch" learned that fetching/cloning from a regular file on the filesystem is not necessarily a request to unpack a bundle file; the file could be ".git" with "gitdir: " in it. * "git for-each-ref" learned "%(contents:subject)", "%(contents:body)" and "%(contents:signature)". The last one is useful for signed tags. * "git grep" used to incorrectly pay attention to .gitignore files scattered in the directory it was working in even when "--no-index" option was used. It no longer does this. The "--exclude-standard" option needs to be given to explicitly activate the ignore mechanism. * "git grep" learned "--untracked" option, where given patterns are searched in untracked (but not ignored) files as well as tracked files in the working tree, so that matches in new but not yet added files do not get missed. * The recursive merge backend no longer looks for meaningless existing merges in submodules unless in the outermost merge. * "git log" and friends learned "--children" option. * "git ls-remote" learned to respond to "-h"(elp) requests. * "mediawiki" remote helper can interact with (surprise!) MediaWiki with "git fetch" & "git push". * "git merge" learned the "--edit" option to allow users to edit the merge commit log message. * "git rebase -i" can be told to use special purpose editor suitable only for its insn sheet via sequence.editor configuration variable. * "git send-email" learned to respond to "-h"(elp) requests. * "git send-email" allows the value given to sendemail.aliasfile to begin with "~/" to refer to the $HOME directory. * "git send-email" forces use of Authen::SASL::Perl to work around issues between Authen::SASL::Cyrus and AUTH PLAIN/LOGIN. * "git stash" learned "--include-untracked" option to stash away untracked/ignored cruft from the working tree. * "git submodule clone" does not leak an error message to the UI level unnecessarily anymore. * "git submodule update" learned to honor "none" as the value for submodule..update to specify that the named submodule should not be checked out by default. * When populating a new submodule directory with "git submodule init", the $GIT_DIR metainformation directory for submodules is created inside $GIT_DIR/modules// directory of the superproject and referenced via the gitfile mechanism. This is to make it possible to switch between commits in the superproject that has and does not have the submodule in the tree without re-cloning. * "gitweb" leaked unescaped control characters from syntax hiliter outputs. * "gitweb" can be told to give custom string at the end of the HTML HEAD element. * "gitweb" now has its own manual pages. Also contains other documentation updates and minor code cleanups. Fixes since v1.7.7 ------------------ Unless otherwise noted, all fixes in the 1.7.7.X maintenance track are included in this release. * HTTP transport did not use pushurl correctly, and also did not tell what host it is trying to authenticate with when asking for credentials. (merge deba493 jk/http-auth later to maint). * "git blame" was aborted if started from an uncommitted content and the path had the textconv filter in effect. (merge 8518088 ss/blame-textconv-fake-working-tree later to maint). * Adding many refs to the local repository in one go (e.g. "git fetch" that fetches many tags) and looking up a ref by name in a repository with too many refs were unnecessarily slow. (merge 17d68a54d jp/get-ref-dir-unsorted later to maint). * Report from "git commit" on untracked files was confused under core.ignorecase option. (merge 395c7356 jk/name-hash-dirent later to maint). * "git merge" did not understand ":/" as a way to name a commit. " "git push" on the receiving end used to call post-receive and post-update hooks for attempted removal of non-existing refs. (merge 160b81ed ph/push-to-delete-nothing later to maint). * Help text for "git remote set-url" and "git remote set-branches" were misspelled. (merge c49904e fc/remote-seturl-usage-fix later to maint). (merge 656cdf0 jc/remote-setbranches-usage-fix later to maint). -- 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.8-rc4 is available for testing. This hopefully is the last rc before the final release (we had to make a last-minute UI tweak to a new feature in multi-step "revert" command to avoid later regrets). We already have ... [More] interesting topics queued together with proposed fixes for older non-regression bugs which would make the next cycle short, sweet and fun. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 528b8099e980877eb7e2268be8afdf12efe13490 git-1.7.8.rc4.tar.gz f775ddd3ee207816840ced38c28d1a400a823536 git-htmldocs-1.7.8.rc4.tar.gz b35301ed60712f441a9c3af08446184faf624d51 git-manpages-1.7.8.rc4.tar.gz Also the following public repositories all have a copy of the v1.7.8.rc4 tag and the master branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git ---------------------------------------------------------------- Changes since v1.7.8-rc3 are as follows: Johannes Sixt (1): Fix revert --abort on Windows Jonathan Nieder (11): do not let git_path clobber errno when reporting errors notes merge: eliminate OUTPUT macro Makefile: add missing header file dependencies Makefile: add option to disable automatic dependency generation revert: rename --reset option to --quit revert: rearrange pick_revisions() for clarity revert: improve error message for cherry-pick during cherry-pick revert: write REVERT_HEAD pseudoref during conflicted revert revert: introduce --abort to cancel a failed cherry-pick revert: remove --reset compatibility option revert --abort: do not leave behind useless sequencer-old directory Junio C Hamano (5): name-rev --all: do not even attempt to describe non-commit object Git 1.7.7.4 Hopefully final update of release notes before 1.7.8 final Update 1.7.8 draft release notes in preparation for rc4 Git 1.7.8-rc4 Marc-André Lureau (1): mailmap: xcalloc mailmap_info Nguyễn Thái Ngọc Duy (1): revert: do not pass non-literal string as format to git_path() Ramkumar Ramachandra (4): http: remove unused function hex() convert: don't mix enum with int sha1_file: don't mix enum with int git-compat-util: don't assume value for undefined variable Ramsay Allan Jones (3): t5501-*.sh: Fix url passed to clone in setup test config.c: Fix a static buffer overwrite bug by avoiding mkpath() convert.c: Fix return type of git_path_check_eol() Thomas Hochstein (1): documentation fix: git difftool uses diff tools, not merge tools. Vincent van Ravesteijn (2): builtin-branch: Fix crash on invalid use of --force builtin-reset: Documentation update -- 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]

Hi all, If you have a bandwidth constrained site with multiple local users all cloning/fetching the same set of large repos over a slow WAN link, this may be useful. It can be set up to be accessed via git://, ssh://, or both. You can get it from ... [More] https://github.com/sitaramc/gitpod -- Sitaram -- 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 All, Let me introduce our new project: SubGit (http://subgit.com/). SubGit is a tool for smooth migration from Subversion to Git. As well as from Git to Subversion. Without git-svn insanity. It works like this: - Install SubGit into your ... [More] repository on the server side - Let initial translation complete (time depends on the size of repository) - SubGit installs hooks into repository, so it translates every svn revision and git commit - Committers may now use either Git or Subversion (or both) with the tools of their choice SubGit uses JGit to work with the Git stuff. JGit handles heavy load perfectly thus fitting our needs, and we appreciate efforts JGit community put into this excellent library. Thank you, guys! SubGit EAP builds are free to use, you may try these and let us know what do you miss, so that we make sure that all the features you need are included into the final version of SubGit. SubGit works on Linux, Windows or OS X and requires Java 5 or newer. Download new SubGit EAP build from http://subgit.com/ and follow us at @subgit and +subgit. -- Semen Vadishev, TMate Software, http://subgit.com/ - Two Way Ticket to The Dark Side -- 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.7.4 is available. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 5b6920989480a37ec65977e756b24961578795dd git-1.7.7.4.tar.gz ... [More] 6012cb017a04ded85c48ca5510f741e98c02f671 git-htmldocs-1.7.7.4.tar.gz cb21e55ae793865453c165a0e666348f2db8c740 git-manpages-1.7.7.4.tar.gz Also the following public repositories all have a copy of the v1.7.7.4 tag and the maint branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.7.7.4 Release Notes ========================== Fixes since v1.7.7.3 -------------------- * A few header dependencies were missing from the Makefile. * Some newer parts of the code used C99 __VA_ARGS__ while we still try to cater to older compilers. * "git name-rev --all" tried to name all _objects_, naturally failing to describe many blobs and trees, instead of showing only commits as advertised in its documentation. ---------------------------------------------------------------- Changes since v1.7.7.3 are as follows: Jonathan Nieder (2): notes merge: eliminate OUTPUT macro Makefile: add missing header file dependencies Junio C Hamano (2): name-rev --all: do not even attempt to describe non-commit object Git 1.7.7.4 Marc-André Lureau (1): mailmap: xcalloc mailmap_info -- 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]