Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Git 2.5.0-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v2.5.0-rc1
Junio C Hamano
Merge branch 'me/fetch-into-shallow-safety' "git fetch --depth=<depth>" and "git clone --depth=<depth>" issued a shallow transfer request even to an upload-pack that does not support the capability. * me/fetch-into-shallow-safety: fetch-pack: check for shallow if depth given
Junio C Hamano
Merge branch 'jc/prompt-document-ps1-state-separator' Docfix. * jc/prompt-document-ps1-state-separator: git-prompt.sh: document GIT_PS1_STATESEPARATOR
Junio C Hamano
Merge branch 'mm/describe-doc' Docfix. * mm/describe-doc: Documentation/describe: improve one-line summary
Junio C Hamano
Merge branch 'da/mergetool-winmerge' Hotfix for an earlier change already in 'master' that broke the default tool selection for mergetool. * da/mergetool-winmerge: mergetool-lib: fix default tool selection
Junio C Hamano
Sync with maint * maint:
Junio C Hamano
Merge branch 'jk/stash-require-clean-index' into maint A hotfix for the topic already in 'master'. * jk/stash-require-clean-index: Revert "stash: require a clean index to apply"
Junio C Hamano
Merge branch 'cb/array-size' into maint * cb/array-size: Fix definition of ARRAY_SIZE for non-gcc builds
Junio C Hamano
Git 2.5.0-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v2.5.0-rc0
Junio C Hamano
Merge branch 'cn/cvsimport-perl-update' * cn/cvsimport-perl-update: cvsimport: silence regex warning appearing in Perl 5.22.
Junio C Hamano
Merge branch 'cb/array-size' * cb/array-size: Fix definition of ARRAY_SIZE for non-gcc builds
Junio C Hamano
Sync with 2.4.5
Junio C Hamano
Git 2.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v2.4.5
Junio C Hamano
Merge branch 'sg/merge-summary-config' into maint Doc updates. * sg/merge-summary-config: Documentation: include 'merge.branchdesc' for merge and config as well
Junio C Hamano
Merge branch 'jk/make-fix-dependencies' into maint Build clean-up. * jk/make-fix-dependencies: Makefile: silence perl/PM.stamp recipe Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS Makefile: drop dependency between git-instaweb and gitweb
Junio C Hamano
Merge branch 'sb/pack-protocol-mention-smart-http' into maint Doc updates. * sb/pack-protocol-mention-smart-http: Documentation/technical/pack-protocol: mention http as possible protocol
Junio C Hamano
Merge branch 'jk/die-on-bogus-worktree-late' into maint The setup code used to die when core.bare and core.worktree are set inconsistently, even for commands that do not need working tree. * jk/die-on-bogus-worktree-late: setup_git_directory: delay core.bare/core.worktree errors
Junio C Hamano
Merge branch 'pt/pull-tags-error-diag' into maint There was a dead code that used to handle "git pull --tags" and show special-cased error message, which was made irrelevant when the semantics of the option changed back in Git 1.9 days. * pt/pull-tags-error-diag: pull: remove --tags error in no merge candidates case
Junio C Hamano
Merge branch 'jk/color-diff-plain-is-context' into maint "color.diff.plain" was a misnomer; give it 'color.diff.context' as a more logical synonym. * jk/color-diff-plain-is-context: diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT diff: accept color.diff.context as a synonym for "plain"
Junio C Hamano
Merge branch 'jk/diagnose-config-mmap-failure' into maint The configuration reader/writer uses mmap(2) interface to access the files; when we find a directory, it barfed with "Out of memory?". * jk/diagnose-config-mmap-failure: xmmap(): drop "Out of memory?" config.c: rewrite ENODEV into EISDIR when mmap fails config.c: avoid xmmap error messages config.c: fix mmap leak when writing config read-cache.c: drop PROT_WRITE from mmap of index
Junio C Hamano
Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint Recent "git prune" traverses young unreachable objects to safekeep old objects in the reachability chain from them, which sometimes caused error messages that are unnecessarily alarming. * jk/squelch-missing-link-warning-for-unreachable: suppress errors on missing UNINTERESTING links silence broken link warnings with revs->ignore_missing_links add quieter versions of parse_{tree,commit}
Junio C Hamano
Merge branch 'mm/rebase-i-post-rewrite-exec' into maint "git rebase -i" fired post-rewrite hook when it shouldn't (namely, when it was told to stop sequencing with 'exec' insn). * mm/rebase-i-post-rewrite-exec: t5407: use <<- to align the expected output rebase -i: fix post-rewrite hook with failed exec command rebase -i: demonstrate incorrect behavior of post-rewrite
Junio C Hamano
Merge branch 'nd/diff-i-t-a' * nd/diff-i-t-a: Revert "diff-lib.c: adjust position of i-t-a entries in diff"
Christian Neukirchen
cvsimport: silence regex warning appearing in Perl 5.22. Since Perl 5.22, "A literal '{' should now be escaped in a pattern". Silence the recently added warning by using \{ instead. Signed-off-by: Christian Neukirchen <chneukirchen@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Charles Bailey
Fix definition of ARRAY_SIZE for non-gcc builds The improved ARRAY_SIZE macro uses BARF_UNLESS_AN_ARRAY which expands to a valid check for recent gcc versions and to 0 for older gcc versions but is not defined on non-gcc builds. Non-gcc builds need this macro to expand to 0 as well. The current outer test (defined(__GNUC__) && (__GNUC__ >= 3)) is a strictly weaker condition than the inner test (GIT_GNUC_PREREQ(3, 1)) so we can omit the outer t…
Junio C Hamano
Ninth batch for 2.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jk/stash-require-clean-index' A hotfix for the topic already in 'master'. * jk/stash-require-clean-index: Revert "stash: require a clean index to apply"
Junio C Hamano
Merge branch 'pa/auto-gc-mac-osx' Recent Mac OS X updates breaks the logic to detect that the machine is on the AC power in the sample pre-auto-gc script. * pa/auto-gc-mac-osx: hooks/pre-auto-gc: adjust power checking for newer OS X
Junio C Hamano
Merge branch 'pt/t0302-needs-sanity' * pt/t0302-needs-sanity: t0302: "unreadable" test needs SANITY prereq
Junio C Hamano
Merge branch 'ld/p4-changes-block-size' More Perforce row number limit workaround for "git p4". * ld/p4-changes-block-size: git-p4: fixing --changes-block-size handling git-p4: add tests for non-numeric revision range git-p4: test with limited p4 server results git-p4: additional testing of --changes-block-size
  1. Prev
  2. Next