Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.9-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.9-rc2
Junio C Hamano
Merge branch 'maint' * maint: Git 1.7.8.4 Git 1.7.7.6 diff-index: enable recursive pathspec matching in unpack_trees Conflicts: GIT-VERSION-GEN
Junio C Hamano
Git 1.7.8.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.8.4
Junio C Hamano
Merge branch 'maint-1.7.7' into maint * maint-1.7.7: Git 1.7.7.6 diff-index: enable recursive pathspec matching in unpack_trees Conflicts: GIT-VERSION-GEN
Junio C Hamano
Git 1.7.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.7.6
Nguyen Thai Ngoc Duy
diff-index: enable recursive pathspec matching in unpack_trees The pathspec structure has a few bits of data to drive various operation modes after we unified the pathspec matching logic in various codepaths. For example, max_depth field is there so that "git grep" can limit the output for files found in limited depth of tree traversal. Also in order to show just the surface level differences in "git diff-tree", recursive field stops us from descending into d…
Junio C Hamano
Merge branch 'jc/pull-signed-tag-doc' * jc/pull-signed-tag-doc: pulling signed tag: add howto document
Junio C Hamano
pulling signed tag: add howto document Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jk/credentials' * jk/credentials: credential-cache: ignore "connection refused" errors unix-socket: do not let close() or chdir() clobber errno during cleanup credential-cache: report more daemon connection errors unix-socket: handle long socket pathnames
Junio C Hamano
Merge branch 'nd/pathspec-recursion-cleanup' * nd/pathspec-recursion-cleanup: diff-index: enable recursive pathspec matching in unpack_trees Document limited recursion pathspec matching with wildcards
Junio C Hamano
Merge branch 'mh/maint-show-ref-doc' * mh/maint-show-ref-doc: git-show-ref doc: typeset regexp in fixed width font git-show-ref: fix escaping in asciidoc source
Junio C Hamano
Merge branch 'tr/maint-word-diff-incomplete-line' * tr/maint-word-diff-incomplete-line: word-diff: ignore '\ No newline at eof' marker
Jeff King
credential-cache: ignore "connection refused" errors The credential-cache helper will try to connect to its daemon over a unix socket. Originally, a failure to do so was silently ignored, and we would either give up (if performing a "get" or "erase" operation), or spawn a new daemon (for a "store" operation). But since 8ec6c8d, we try to report more errors. We detect a missing daemon by checking for ENOENT on our connection attempt. If the daemon …
Junio C Hamano
Merge branch 'jn/maint-gitweb-grep-fix' * jn/maint-gitweb-grep-fix: gitweb: Harden "grep" search against filenames with ':' gitweb: Fix file links in "grep" search
Nguyen Thai Ngoc Duy
diff-index: enable recursive pathspec matching in unpack_trees The pathspec structure has a few bits of data to drive various operation modes after we unified the pathspec matching logic in various codepaths. For example, max_depth field is there so that "git grep" can limit the output for files found in limited depth of tree traversal. Also in order to show just the surface level differences in "git diff-tree", recursive field stops us from descending into d…
Nguyễn Thái Ngọc Duy
Document limited recursion pathspec matching with wildcards It's actually unlimited recursion if wildcards are active regardless --max-depth Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty
git-show-ref doc: typeset regexp in fixed width font Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty
git-show-ref: fix escaping in asciidoc source Two "^" characters were incorrectly being interpreted as markup for superscripting. Fix them by writing them as attribute references "{caret}". Although a single "^" character in a paragraph cannot be misinterpreted in this way, also write other "^" characters as "{caret}" in the interest of good hygiene (unless they are in literal paragraphs, of course, in which context attribute references are…
Junio C Hamano
Git 1.7.9-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.9-rc1
Junio C Hamano
Merge branch 'jc/request-pull-show-head-4' * jc/request-pull-show-head-4: request-pull: use the real fork point when preparing the message
Junio C Hamano
Merge branch 'tr/maint-mailinfo' * tr/maint-mailinfo: mailinfo documentation: accurately describe non -k case
Junio C Hamano
Merge branch 'ss/maint-msys-cvsexportcommit' * ss/maint-msys-cvsexportcommit: git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS t9200: On MSYS, do not pass Windows-style paths to CVS
Junio C Hamano
Merge branch 'jk/maint-upload-archive' * jk/maint-upload-archive: archive: re-allow HEAD:Documentation on a remote invocation
Junio C Hamano
Merge branch 'maint' * maint: Update draft release notes to 1.7.8.4 Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base
Junio C Hamano
Update draft release notes to 1.7.8.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint-1.7.7' into maint * maint-1.7.7: Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base
Junio C Hamano
Update draft release notes to 1.7.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base
Junio C Hamano
Update draft release notes to 1.7.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
thin-pack: try harder to use preferred base objects as base When creating a pack using objects that reside in existing packs, we try to avoid recomputing futile delta between an object (trg) and a candidate for its base object (src) if they are stored in the same packfile, and trg is not recorded as a delta already. This heuristics makes sense because it is likely that we tried to express trg as a delta based on src but it did not produce a good delta when…
  1. Prev
  2. Next