#gitfr http://www.gitfr.net/blog Projet pour la promotion du bien et la destruction du mal Sun, 15 Apr 2012 21:04:43 GMT Blogofile hourly 1 Git 1.7.10 publiée http://www.gitfr.net/blog/2012/04/15/git-1.7.10-publiee Sun, 15 Apr 2012 22:52:00 CEST http://www.gitfr.net/blog/2012/04/15/git-1.7.10-publiee Git 1.7.10 publiée Pas mal de petites changements dans cette version 1.7.10 sortie le 10 avril. Je voulais initialement tester cette version avant de publier l'annonce mais je n'ai pas eu le cou^H^H^Htemps :(. Mais rapidement de ce qu'ai pu voir :

  • gitk a pas mal de petites évolutions.

  • Un éditeur s'ouvre lors d'un git-commit pour pousser les gens à expliquer les changements.

  • On peut cloner qu'un répertoire.

N'hésitez pas comme d'habitude à commenter ce billet si vous voyez des changements intéressants dans votre façon de travailler avec Git.

Le changelog

  • various "gitk" updates.

  • Teams for localizing the messages from the Porcelain layer of commands are starting to form, thanks to Jiang Xin who volunteered to be the localization coordinator. Translated messages for simplified Chinese, Swedish and Portuguese are available.

  • The configuration mechanism learned an "include" facility; an assignment to the include.path pseudo-variable causes the named file to be included in-place when Git looks up configuration variables.

  • A content filter (clean/smudge) used to be just a way to make the recorded contents "more useful", and allowed to fail; a filter can now optionally be marked as "required".

  • Options whose names begin with "--no-" (e.g. the "--no-verify" option of the "git commit" command) can be negated by omitting "no-" from its name, e.g. "git commit --verify".

  • "git am" learned to pass "-b" option to underlying "git mailinfo", so that a bracketed string other than "PATCH" at the beginning can be kept.

  • "git clone" learned "--single-branch" option to limit cloning to a single branch (surprise!); tags that do not point into the history of the branch are not fetched.

  • "git clone" learned to detach the HEAD in the resulting repository when the user specifies a tag with "--branch" (e.g., "--branch=v1.0"). Clone also learned to print the usual "detached HEAD" advice in such a case, similar to "git checkout v1.0".

  • When showing a patch while ignoring whitespace changes, the context lines are taken from the postimage, in order to make it easier to view the output.

  • "git diff --stat" learned to adjust the width of the output on wider terminals, and give more columns to pathnames as needed.

  • "diff-highlight" filter (in contrib/) was updated to produce more aesthetically pleasing output.

  • "fsck" learned "--no-dangling" option to omit dangling object information.

  • "git log -G" and "git log -S" learned to pay attention to the "-i" option. With "-i", "log -G" ignores the case when finding patch hunks that introduce or remove a string that matches the given pattern. Similarly with "-i", "log -S" ignores the case when finding the commit the given block of text appears or disappears from the file.

  • "git merge" in an interactive session learned to spawn the editor by default to let the user edit the auto-generated merge message, to encourage people to explain their merges better. Legacy scripts can export GIT_MERGE_AUTOEDIT=no to retain the historical behavior. Both "git merge" and "git pull" can be given --no-edit from the command line to accept the auto-generated merge message.

  • The advice message given when the user didn't give enough clue on what to merge to "git pull" and "git merge" has been updated to be more concise and easier to understand.

  • "git push" learned the "--prune" option, similar to "git fetch".

  • The whole directory that houses a top-level superproject managed by "git submodule" can be moved to another place.

  • "git symbolic-ref" learned the "--short" option to abbreviate the refname it shows unambiguously.

  • "git tag --list" can be given "--points-at " to limit its output to those that point at the given object.

  • "gitweb" allows intermediate entries in the directory hierarchy that leads to a project to be clicked, which in turn shows the list of projects inside that directory.

  • "gitweb" learned to read various pieces of information for the repositories lazily, instead of reading everything that could be needed (including the ones that are not necessary for a specific task).

  • Project search in "gitweb" shows the substring that matched in the project name and description highlighted.

  • HTTP transport learned to authenticate with a proxy if needed.

  • A new script "diffall" is added to contrib/; it drives an external tool to perform a directory diff of two Git revisions in one go, unlike "difftool" that compares one file at a time.

  • Improved handling of views, labels and branches in "git-p4" (in contrib).

  • "git-p4" (in contrib) suffered from unnecessary merge conflicts when p4 expanded the embedded $RCS$-like keywords; it can be now told to unexpand them.

  • Some "git-svn" updates.

  • "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and support incremental imports.

  • "git difftool/mergetool" learned to drive DeltaWalker.

  • Unnecessary calls to parse_object() "git upload-pack" makes in response to "git fetch", have been eliminated, to help performance in repositories with excessive number of refs.

  • Recursive call chains in "git index-pack" to deal with long delta chains have been flattened, to reduce the stack footprint.

  • Use of add_extra_ref() API is now gone, to make it possible to cleanly restructure the overall refs API.

  • The command line parser of "git pack-objects" now uses parse-options API.

  • The test suite supports the new "test_pause" helper function.

  • Parallel to the test suite, there is a beginning of performance benchmarking framework.

  • t/Makefile is adjusted to prevent newer versions of GNU make from running tests in seemingly random order.

  • The code to check if a path points at a file beyond a symbolic link has been restructured to be thread-safe.

  • When pruning directories that has become empty during "git prune" and "git prune-packed", call closedir() that iterates over a directory before rmdir() it.

  • Build with NO_PERL_MAKEMAKER was broken and Git::I18N did not work with versions of Perl older than 5.8.3. (merge 5eb660e ab/perl-i18n later to maint).

  • "git tag -s" honored "gpg.program" configuration variable since 1.7.9, but "git tag -v" and "git verify-tag" didn't. (merge a2c2506 az/verify-tag-use-gpg-config later to maint).

  • "configure" script learned to take "--with-sane-tool-path" from the command line to record SANE_TOOL_PATH (used to avoid broken platform tools in /usr/bin) in config.mak.autogen. This may be useful for people on Solaris who have saner tools outside /usr/xpg[46]/bin.

  • zsh port of bash completion script needed another workaround.

  • 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 new PO files in po/ to add new translations.

  • The code to handle username/password for HTTP transactions 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 input prompts in the terminal use our own getpass() replacement when possible. HTTP transactions used to ask for the username without echoing back what was typed, but with this change you will see it as you type.

  • The internals of "revert/cherry-pick" have 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 walking 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.

    • ]]> Git 1.7.9 publiée http://www.gitfr.net/blog/2012/01/28/git-1.7.9-publiee Sat, 28 Jan 2012 21:13:00 CET http://www.gitfr.net/blog/2012/01/28/git-1.7.9-publiee Git 1.7.9 publiée La version 1.7.9 est sortie le 27 janvier avec plusieurs évolutions intéressantes :

    • Un meilleur support des gros fichiers (Git n'étant pas réputé pour ça).

    • La signature des commits, qui fait suite au piratage de la machine qui héberge le dépôt Git du projet Linux de Linus Torvalds.

    • L'internationalisation est maintenant activée (honte à moi, toujours pas démarré le projet de traduction en Français).

    • La possibilité d'ajouter une description à une branche.

    • L'option --no-edit quand on amende un commit.

    Je vous laisse comme d'habitude lire le changelog mais je trouve cette version bien excitente ! J'attends la mise à jour sur ma machine pour faire quelques tests.

    Le changelog

    • 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 new PO files in po/ to add new translations.

    • The code to handle username/password for HTTP transactions 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 input prompts in the terminal use our own getpass() replacement when possible. HTTP transactions used to ask for the username without echoing back what was typed, but with this change you will see it as you type.

    • The internals of "revert/cherry-pick" have 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 walking 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.

    ]]>         Git 1.7.8 publiée http://www.gitfr.net/blog/2011/12/11/git-1.7.8-publiee Sun, 11 Dec 2011 23:13:00 CET http://www.gitfr.net/blog/2011/12/11/git-1.7.8-publiee Git 1.7.8 publiée La version 1.7.8 est sortie le 2 décembre. Comme vous pouvez constater, le changelog est assez gros avec surtout de nouvelles options pour plusieurs commandes et l'habituel lot de corrections.

    Le changelog

    • 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.

    • 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).

    ]]>         Git 1.7.7 publiée http://www.gitfr.net/blog/2011/10/01/git-1.7.7-publiee Sat, 01 Oct 2011 10:34:00 CEST http://www.gitfr.net/blog/2011/10/01/git-1.7.7-publiee Git 1.7.7 publiée Reprenons la bonne habitude d'annoncer les nouvelles versions. Rien de bien méchant dans cette 1.7.7, il faut attendre la 1.8 je pense pour des plus gros changements.

    Le changelog

    • The scripting part of the codebase is getting prepared for i18n/l10n.

    • Interix, Cygwin and Minix ports got updated.

    • Various updates to git-p4 (in contrib/), fast-import, and git-svn.

    • Gitweb learned to read from /etc/gitweb-common.conf when it exists, before reading from gitweb_config.perl or from /etc/gitweb.conf (this last one is read only when per-repository gitweb_config.perl does not exist).

    • Various codepaths that invoked zlib deflate/inflate assumed that these functions can compress or uncompress more than 4GB data in one call on platforms with 64-bit long, which has been corrected.

    • Git now recognizes loose objects written by other implementations that use a non-standard window size for zlib deflation (e.g. Agit running on Android with 4kb window). We used to reject anything that was not deflated with 32kb window.

    • Interaction between the use of pager and coloring of the output has been improved, especially when a command that is not built-in was involved.

    • "git am" learned to pass the "--exclude=" option through to underlying "git apply".

    • You can now feed many empty lines before feeding an mbox file to "git am".

    • "git archive" can be told to pass the output to gzip compression and produce "archive.tar.gz".

    • "git bisect" can be used in a bare repository (provided that the test you perform per each iteration does not need a working tree, of course).

    • The length of abbreviated object names in "git branch -v" output now honors the core.abbrev configuration variable.

    • "git check-attr" can take relative paths from the command line.

    • "git check-attr" learned an "--all" option to list the attributes for a given path.

    • "git checkout" (both the code to update the files upon checking out a different branch and the code to checkout a specific set of files) learned to stream the data from object store when possible, without having to read the entire contents of a file into memory first. An earlier round of this code that is not in any released version had a large leak but now it has been plugged.

    • "git clone" can now take a "--config key=value" option to set the repository configuration options that affect the initial checkout.

    • "git commit ..." now lets you feed relative pathspecs that refer to outside your current subdirectory.

    • "git diff --stat" learned a --stat-count option to limit the output of a diffstat report.

    • "git diff" learned a "--histogram" option to use a different diff generation machinery stolen from jgit, which might give better performance.

    • "git diff" had a weird worst case behaviour that can be triggered when comparing files with potentially many places that could match.

    • "git fetch", "git push" and friends no longer show connection errors for addresses that couldn't be connected to when at least one address succeeds (this is arguably a regression but a deliberate one).

    • "git grep" learned "--break" and "--heading" options, to let users mimic the output format of "ack".

    • "git grep" learned a "-W" option that shows wider context using the same logic used by "git diff" to determine the hunk header.

    • Invoking the low-level "git http-fetch" without "-a" option (which git itself never did---normal users should not have to worry about this) is now deprecated.

    • The "--decorate" option to "git log" and its family learned to highlight grafted and replaced commits.

    • "git rebase master topci" no longer spews usage hints after giving the "fatal: no such branch: topci" error message.

    • The recursive merge strategy implementation got a fairly large fix for many corner cases that may rarely happen in real world projects (it has been verified that none of the 16000+ merges in the Linux kernel history back to v2.6.12 is affected with the corner case bugs this update fixes).

    • "git stash" learned an "--include-untracked option".

    • "git submodule update" used to stop at the first error updating a submodule; it now goes on to update other submodules that can be updated, and reports the ones with errors at the end.

    • "git push" can be told with the "--recurse-submodules=check" option to refuse pushing of the supermodule, if any of its submodules' commits hasn't been pushed out to their remotes.

    • "git upload-pack" and "git receive-pack" learned to pretend that only a subset of the refs exist in a repository. This may help a site to put many tiny repositories into one repository (this would not be useful for larger repositories as repacking would be problematic).

    • "git verify-pack" has been rewritten to use the "index-pack" machinery that is more efficient in reading objects in packfiles.

    • test scripts for gitweb tried to run even when CGI-related perl modules are not installed; they now exit early when the latter are unavailable.

    ]]>         Git 1.7.6.1 publiée http://www.gitfr.net/blog/2011/08/29/git-1.7.6.1-publiee Mon, 29 Aug 2011 00:34:00 CEST http://www.gitfr.net/blog/2011/08/29/git-1.7.6.1-publiee Git 1.7.6.1 publiée La première version de maintenance de la branche 1.7.6.x est sortie le 24 août, avec 88 corrections.

    Le changelog

    • Various codepaths that invoked zlib deflate/inflate assumed that these functions can compress or uncompress more than 4GB data in one call on platforms with 64-bit long, which has been corrected.

    • "git unexecutable" reported that "unexecutable" was not found, even though the actual error was that "unexecutable" was found but did not have a proper she-bang line to be executed.

    • Error exits from $PAGER were silently ignored.

    • "git checkout -b " was confused when attempting to create a branch whose name ends with "-g" followed by hexadecimal digits, and refused to work.

    • "git checkout -b " sometimes wrote a bogus reflog entry, causing later "git checkout -" to fail.

    • "git diff --cc" learned to correctly ignore binary files.

    • "git diff -c/--cc" mishandled a deletion that resolves a conflict, and looked in the working tree instead.

    • "git fast-export" forgot to quote pathnames with unsafe characters in its output.

    • "git fetch" over smart-http transport used to abort when the repository was updated between the initial connection and the subsequent object transfer.

    • "git fetch" did not recurse into submodules in subdirectories.

    • "git ls-tree" did not error out when asked to show a corrupt tree.

    • "git pull" without any argument left an extra whitespace after the command name in its reflog.

    • "git push --quiet" was not really quiet.

    • "git rebase -i -p" incorrectly dropped commits from side branches.

    • "git reset [] paths..." did not reset the index entry correctly for unmerged paths.

    • "git submodule add" did not allow a relative repository path when the superproject did not have any default remote url.

    • "git submodule foreach" failed to correctly give the standard input to the user-supplied command it invoked.

    • submodules that the user has never showed interest in by running "git submodule init" was incorrectly marked as interesting by "git submodule sync".

    • "git submodule update --quiet" was not really quiet.

    • "git tag -l ..." did not take multiple glob patterns from the command line.

    ]]>         Git 1.7.6 publiée http://www.gitfr.net/blog/2011/07/09/git-1.7.6-publiee Sat, 09 Jul 2011 20:34:00 CEST http://www.gitfr.net/blog/2011/07/09/git-1.7.6-publiee Git 1.7.6 publiée Nouvelle fournée pour Git avec cette branche 1.7.6.x. A noter que c'est la première version qui respecte le nouveau cycle de release plus court voulu par Junio.

    A la lecture du changelog, voici quelques points que je remarque :

    • Le magic pathspec ":/".

    • L'option patch pour la commande git-commit.

    • La possibilité d'utiliser les expressions rationnelles pour git-grep.

    • La variable de configuration merge.ff pour spécifier s'il faut toujours ou jamais faire un commit de merge.

    • Ne pas spécifier de branche à git-rebase signifie rebaser sur upstream.

    Changelog

    • Various git-svn updates.

    • Updates the way content tags are handled in gitweb. Also adds a UI to choose common timezone for displaying the dates.

    • Similar to branch names, tagnames that begin with "-" are now disallowed.

    • Clean-up of the C part of i18n (but not l10n---please wait) continues.

    • The scripting part of the codebase is getting prepared for i18n/l10n.

    • Pushing and pulling from a repository with large number of refs that point to identical commits are optimized by not listing the same commit during the common ancestor negotiation exchange with the other side.

    • Adding a file larger than core.bigfilethreshold (defaults to 1/2 Gig) using "git add" will send the contents straight to a packfile without having to hold it and its compressed representation both at the same time in memory.

    • Processes spawned by "[alias] = !process" in the configuration can inspect GIT_PREFIX environment variable to learn where in the working tree the original command was invoked.

    • A magic pathspec ":/" tells a command that limits its operation to the current directory when ran from a subdirectory to work on the entire working tree. In general, ":/path/to/file" would be relative to the root of the working tree hierarchy.

    After "git reset --hard; edit Makefile; cd t/", "git add -u" would be a no-op, but "git add -u :/" would add the updated contents of the Makefile at the top level. If you want to name a path in the current subdirectory whose unusual name begins with ":/", you can name it by "./:/that/path" or by "\:/that/path".

    • "git blame" learned "--abbrev[=]" option to control the minimum number of hexdigits shown for commit object names.

    • "git blame" learned "--line-porcelain" that is less efficient but is easier to parse.

    • Aborting "git commit --interactive" discards updates to the index made during the interactive session.

    • "git commit" learned a "--patch" option to directly jump to the per-hunk selection UI of the interactive mode.

    • "git diff" and its family of commands learned --dirstat=0 to show directories that contribute less than 0.1% of changes.

    • "git diff" and its family of commands learned --dirstat=lines mode to assess damage to the directory based on number of lines in the patch output, not based on the similarity numbers.

    • "git format-patch" learned "--quiet" option to suppress the output of the names of generated files.

    • "git format-patch" quotes people's names when it has RFC822 special characters in it, e.g. "Junio C. Hamano" jch@example.com. Earlier it was up to the user to do this when using its output.

    • "git format-patch" can take an empty --subject-prefix now.

    • "git grep" learned the "-P" option to take pcre regular expressions.

    • "git log" and friends learned a new "--notes" option to replace the "--show-notes" option. Unlike "--show-notes", "--notes=" does not imply showing the default notes.

    • They also learned a log.abbrevCommit configuration variable to augment the --abbrev-commit command line option.

    • "git ls-remote" learned "--exit-code" option to consider it a different kind of error when no remote ref to be shown.

    • "git merge" learned "-" as a short-hand for "the previous branch", just like the way "git checkout -" works.

    • "git merge" uses "merge.ff" configuration variable to decide to always create a merge commit (i.e. --no-ff, aka merge.ff=no), refuse to create a merge commit (i.e. --ff-only, aka merge.ff=only). Setting merge.ff=yes (or not setting it at all) restores the default behaviour of allowing fast-forward to happen when possible.

    • p4-import (from contrib) learned a new option --preserve-user.

    • "git read-tree -m" learned "--dry-run" option that reports if a merge would fail without touching the index nor the working tree.

    • "git rebase" that does not specify on top of which branch to rebase the current branch now uses @{upstream} of the current branch.

    • "git rebase" finished either normally or with --abort did not update the reflog for HEAD to record the event to come back to where it started from.

    • "git remote add -t only-this-branch --mirror=fetch" is now allowed. Earlier a fetch-mode mirror meant mirror everything, but now it only means refs are not renamed.

    • "git rev-list --count" used with "--cherry-mark" counts the cherry-picked commits separately, producing more a useful output.

    • "git submodule update" learned "--force" option to get rid of local changes in submodules and replace them with the up-to-date version.

    • "git status" and friends ignore .gitmodules file while the file is still in a conflicted state during a merge, to avoid using information that is not final and possibly corrupt with conflict markers.

    • "git config" used to choke with an insanely long line. (merge ef/maint-strbuf-init later)

    • "git diff --quiet" did not work well with --diff-filter. (merge jk/diff-not-so-quick later)

    • "git status -z" did not default to --porcelain output format. (merge bc/maint-status-z-to-use-porcelain later)

    ]]>         Git 1.7.5.4 publiée http://www.gitfr.net/blog/2011/06/13/git-1.7.5.4-publiee Mon, 13 Jun 2011 02:10:00 CEST http://www.gitfr.net/blog/2011/06/13/git-1.7.5.4-publiee Git 1.7.5.4 publiée La quatrième version de la branche 1.7.5.x est sortie le 2 juin, soit seulement 5 jours aprés la précédente. C'est la dernière ligne du changelog qui nous donne la réponse.

    Changelog

    • The single-key mode of "git add -p" was easily fooled into thinking that it was told to add everthing ('a') when up-arrow was pressed by mistake.

    • Setting a git command that uses custom configuration via "-c var=val" as an alias caused a crash due to a realloc(3) failure.

    • "git diff -C -C" used to disable the rename detection entirely when there are too many copy candidate paths in the tree; now it falls back to "-C" when doing so would keep the copy candidate paths under the rename detection limit.

    • "git rerere" did not diagnose a corrupt MERGE_RR file in some cases.

    ]]>         Git 1.7.5.3 publiée http://www.gitfr.net/blog/2011/06/13/git-1.7.5.3-publiee Mon, 13 Jun 2011 02:07:00 CEST http://www.gitfr.net/blog/2011/06/13/git-1.7.5.3-publiee Git 1.7.5.3 publiée La troisième version de maintenance de la branche 1.7.5.x est sortie le 27 mai.

    Changelog

    • 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.

    ]]>         Git 1.7.5.2 publiée http://www.gitfr.net/blog/2011/06/13/git-1.7.5.2-publiee Mon, 13 Jun 2011 02:05:00 CEST http://www.gitfr.net/blog/2011/06/13/git-1.7.5.2-publiee Git 1.7.5.2 publiée La deuxième version de maintenance de la branche 1.7.5.x est sortie la 20 mai.

    Changelog

    • "git add -p" did not work correctly when a hunk is split and then one of them was given to the editor.

    • "git add -u" did not resolve a conflict where our history deleted and their history modified the same file, and the working tree resolved to keep a file.

    • "git cvsimport" did not know that CVSNT stores its password file in a location different from the traditional CVS.

    • "git diff-files" did not show the mode information from the working tree side of an unmerged path correctly.

    • "git diff -M --cached" used to use unmerged path as a possible rename source candidate, which made no sense.

    • The option name parser in "git fast-import" used prefix matches for some options where it shouldn't, and accepted non-existent options, e.g. "--relative-marksmith" or "--forceps".

    • "git format-patch" did not quote RFC822 special characters in the email address (e.g From: Junio C. Hamano jch@example.com, not From: "Junio C. Hamano" jch@example.com).

    • "git format-patch" when run with "--quiet" option used to produce a nonsense result that consists of alternating empty output.

    • In "git merge", per-branch branch..mergeoptions configuration variables did not override the fallback default merge.

    • "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 submodules 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.

    ]]>         Git 1.7.5.1 publiée http://www.gitfr.net/blog/2011/06/13/git-1.7.5.1-publiee Mon, 13 Jun 2011 01:57:00 CEST http://www.gitfr.net/blog/2011/06/13/git-1.7.5.1-publiee Git 1.7.5.1 publiée La première version de maintenance de la branche 1.7.5.x est sortie la 5 mai.

    Le changelog

    • 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=".

    • "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.

    ]]>