Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'mh/ref-api-lazy-loose' The code to lazily read loose refs unnecessarily read the refs in a subhierarchy by mistake when we free the data for the subhierarchy. By Michael Haggerty * mh/ref-api-lazy-loose: free_ref_entry(): do not trigger reading of loose refs
Junio C Hamano
Merge branch 'ng/pack-objects-cleanup' By Nguyễn Thái Ngọc Duy * ng/pack-objects-cleanup: pack-objects: refactor write_object() into helper functions pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .."
Vincent van Ravesteijn
Do not autosquash in case of an implied interactive rebase The option to autosquash is only used in case of an interactive rebase. When merges are preserved, rebase uses an interactive rebase internally, but in this case autosquash should still be disabled. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy
Reduce cost of deletion in levenstein distance (4 -> 3) Before this patch, a character deletion has the same cost as 2 swaps, or 4 additions, so Git prefers suggesting a completely scrambled command name to removing a character. For example, "git tags" suggests "stage", but not "tag". By setting the deletion cost to 3, we keep it higher than swaps or additions, but prefer 1 deletion to 2 swaps. "git tags" now suggests "tag" in addition to staged. Sig…
Vitor Antunes
git-p4: Clean up branch test cases Correct submit description in one test and remove not required commands from another. Signed-off-by: Vitor Antunes <vitor.hda@gmail.com> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vitor Antunes
git-p4: Verify detection of "empty" branch creation Current implementation of new branch parent detection works on the principle that the new branch is a complete integration, with no changes, of the original files. This test shows this deficiency in the particular case when the new branch is created from a subset of the original files. Signed-off-by: Vitor Antunes <vitor.hda@gmail.com> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C H…
Vitor Antunes
git-p4: Test changelists touching two branches It is possible to modify two different branches in P4 in a single changelist. git-p4 correctly detects this and commits the relevant changes to the different branches separately. This test proves that and avoid future regressions in this behavior. Signed-off-by: Vitor Antunes <vitor.hda@gmail.com> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin
Merge branch 'maint' By Peter Krefting via Peter Krefting * maint: Update Swedish translation (728t0f0u)
Peter Krefting
Update Swedish translation (728t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Jonathan Nieder
git-svn: make Git::SVN::Fetcher a separate file This patch removes a chunk of code (the Git::SVN::Fetcher consumer of libsvn's tree delta protocol) from git-svn.perl and documents its interface so the hurried reader does not have to read that code right away. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net>
Jonathan Nieder
git-svn: rename SVN::Git::* packages to Git::SVN::* Using names in the Git:: namespace means these cannot conflict with a hypothetical binding teaching Subversion to interact with git repositories. Currently the packages are private to git-svn.perl so the choice of name isn't likely to make much difference. This change is mainly meant as preparation for splitting out the packages in question as modules on the public search path. Signed-off-by: J…
Jonathan Nieder
git-svn: move Git::SVN::Prompt into its own file git-svn.perl is very long (around 6500 lines) and although it is nicely split into modules, some new readers do not even notice --- it is too distracting to see all this functionality collected in a single file. Splitting it into multiple files would make it easier for people to read individual modules straight through and to experiment with components separately. Let's start with Git::SVN::Prom…
Junio C Hamano
Git 1.7.11-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.11-rc0
Junio C Hamano
Merge branch 'sp/sh-windows-pwd' * sp/sh-windows-pwd: git-sh-setup: define workaround wrappers before they are used
Junio C Hamano
Merge branch 'mh/test-keep-prove-cache' By Michael Haggerty * mh/test-keep-prove-cache: t/Makefile: retain cache t/.prove across prove runs
Junio C Hamano
Merge branch 'rs/dir-strbuf-read-recursive-fix' Simplification for the codepath to read directories recursively. By René Scharfe * rs/dir-strbuf-read-recursive-fix: dir: simplify fill_directory() dir: respect string length argument of read_directory_recursive()
Junio C Hamano
Merge branch 'fc/git-complete-helper-fix' Resurrects old behaviour of _git/_gitk for external users.
Junio C Hamano
Merge branch 'ap/checkout-no-progress-for-non-tty' The progress indicator for a large "git checkout" was sent to stderr even if it is not a terminal.
Junio C Hamano
Merge branch 'jk/format-person-part-buffer-limit' Avoid buffer overflow in format_person_part() function
Junio C Hamano
Merge branch 'jk/pretty-commit-header-incomplete-line' Fixes error codepath when a malformed commit object has a header line chomped in the middle.
Junio C Hamano
Merge branch 'jk/ident-split-fix' An author/committer name that is a single character was mishandled as an invalid name by mistake.
Junio C Hamano
Merge branch 'rs/xdiff-fast-hash-fix' Fixes compilation issue on 32-bit in an earlier series.
Junio C Hamano
Merge branch 'mh/ref-api' Fixes a performance regression in the earlier series.
Junio C Hamano
Merge branch 'rs/maint-grep-F' "git grep -e '$pattern'", unlike the case where the patterns are read from a file, did not treat individual lines in the given pattern argument as separate regular expressions as it should.
Junio C Hamano
Sync with 1.7.10.3
Junio C Hamano
Git 1.7.10.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.10.3
Junio C Hamano
Merge branch 'hv/submodule-alt-odb' into maint When a submodule repository uses alternate object store mechanism, some commands that were started from the superproject did not notice it and failed with "No such object" errors. The subcommands of "git submodule" command that recursed into the submodule in a separate process were OK; only the ones that cheated and peeked directly into the submodule's repository from the primary process were aff…
Junio C Hamano
Merge branch 'bp/diff-no-index-strbuf-fix' into maint The directory path used in "git diff --no-index", when it recurses down, was broken with a recent update after v1.7.10.1 release. By Bobby Powers * bp/diff-no-index-strbuf-fix: diff --no-index: don't leak buffers in queue_diff diff --no-index: reset temporary buffer lengths on directory iteration
Linus Torvalds
fmt-merge-message: add empty line between tag and signature verification When adding the information from a tag, put an empty line between the message of the tag and the commented-out signature verification information. At least for the kernel workflow, I often end up re-formatting the message that people send me in the tag data. In that situation, putting the tag message and the tag signature verification back-to-back then means that normal editor "reflow parapgraph"…
Jonathan Nieder
config doc: remove confusion about relative GIT_DIR from FILES section From the FILES section of the git-config(1) manual: $GIT_DIR/config:: Repository specific configuration file. (The filename is of course relative to the repository root, not the working directory.) That's confusing because $GIT_DIR really is relative to the working directory. $ GIT_DIR=.git GIT_EDITOR='pwd; echo editing' $ export GIT_DIR GIT_EDITOR $ git config --edit --local /home/j…
  1. Prev
  2. Next