1. Stefan Saasen
  2. git

Commits

Show all
Author Commit Message Date Builds
Junio C Hamano
Git 1.7.11-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
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…
Junio C Hamano
Sync with maint By Jeff King (1) and Junio C Hamano (1) * maint: Update draft release notes to 1.7.10.3 osxkeychain: pull make config from top-level directory
Junio C Hamano
Update draft release notes to 1.7.10.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jk/maint-status-porcelain-z-b' into maint "git status --porcelain" ignored "--branch" option by mistake. The output for "git status --branch -z" was also incorrect and did not terminate the record for the current branch name with NUL as asked. By Jeff King * jk/maint-status-porcelain-z-b: status: respect "-b" for porcelain format status: fix null termination with "-b" status: refactor null_termination option commit: refactor opt…
Michael Haggerty
Avoid sorting if references are added to ref_cache in order The old code allowed many references to be efficiently added to a single directory, because it just appended the references to the containing directory unsorted without doing any searching (and therefore without requiring any intermediate sorting). But the old code was inefficient when a large number of subdirectories were added to a directory, because the directory always had to be searched to s…
Avery Pennarun
checkout: no progress messages if !isatty(2). If stderr isn't a tty, we shouldn't be printing incremental progress messages. In particular, this affects 'git checkout -f . >&logfile' unless you provided -q. And git-new-workdir has no way to provide -q. It would probably be better to have progress.c check isatty(2) all the time, but that wouldn't allow things like 'git push --progress' to force progress reporting to on, so I won't try to so…
Jeff King
osxkeychain: pull make config from top-level directory The default compiler and cflags were mostly "works for me" when I built the original version. We need to be much less careful here than usual, because we know we are building only on OS X. But it's only polite to at least respect the CFLAGS and CC definitions that the user may have provided earlier. While we're at it, let's update our definitions and rules to be more like the top-level Makefile;…
Junio C Hamano
Update draft release notes to 1.7.11 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'rs/archive-tree-in-tip-simplify' By René Scharfe * rs/archive-tree-in-tip-simplify: archive-tar: keep const in checksum calculation archive: simplify refname handling
Junio C Hamano
Merge branch 'js/rev-parse-doc-fix' By Jon Seymour * js/rev-parse-doc-fix: rev-parse doc: --git-dir does not always show a relative path
Junio C Hamano
Merge branch 'js/rebase-i-p-test-fix' By Johannes Sixt * js/rebase-i-p-test-fix: Fix t3411.3 to actually rebase something
Junio C Hamano
Merge branch 'bp/diff-no-index-strbuf-fix' Fix regressions to "git diff --no-index" when it recurses down. 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
Junio C Hamano
Merge branch 'hv/submodule-alt-odb' When peeking into object stores of submodules, the code forgot that they might borrow objects from alternate object stores on their own. By Heiko Voigt * hv/submodule-alt-odb: teach add_submodule_odb() to look for alternates
  1. Prev
  2. Next