Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'master' into next * master: Update draft release notes to 1.8.2
Branches
next
Junio C Hamano
Update draft release notes to 1.8.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'nd/edit-branch-desc-while-detached' Attempt to "branch --edit-description" an existing branch, while being on a detached HEAD, errored out. * nd/edit-branch-desc-while-detached: branch: no detached HEAD check when editing another branch's description
Junio C Hamano
Merge branch 'jk/gc-auto-after-fetch' Help "fetch only" repositories that do not trigger "gc --auto" often enough. * jk/gc-auto-after-fetch: fetch-pack: avoid repeatedly re-scanning pack directory fetch: run gc --auto after fetching
Junio C Hamano
Merge branch 'bc/git-p4-for-python-2.4' With small updates to remove dependency on newer features of Python, keep git-p4 usable with older Python. * bc/git-p4-for-python-2.4: INSTALL: git-p4 does not support Python 3 git-p4.py: support Python 2.4 git-p4.py: support Python 2.5
Junio C Hamano
Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' We used to stuff "user@" and then append what we read from /etc/mailname to come up with a default e-mail ident, but a bug lost the "user@" part. This is to fix it. * jn/do-not-drop-username-when-reading-from-etc-mailname: ident: do not drop username when reading from /etc/mailname
Junio C Hamano
Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' Warn people that other tools are more recommendable over cvsimport+cvsps2 combo when doing a one-shot import, and cvsimport will not work with cvsps3. * jk/cvsimport-does-not-work-with-cvsps3: git-cvsimport.txt: cvsps-2 is deprecated
Junio C Hamano
Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' Scripts to test bash completion was inherently flaky as it was affected by whatever random things the user may have on $PATH. * jc/do-not-let-random-file-interfere-with-completion-tests: t9902: protect test from stray build artifacts
Junio C Hamano
Merge branch 'as/test-cleanup' * as/test-cleanup: t7102 (reset): don't hardcode SHA-1 in expected outputs
Junio C Hamano
Merge branch 'jc/no-git-config-in-clone' We stopped paying attention to $GIT_CONFIG environment that points at a single configuration file from any command other than "git config" quite a while ago, but "git clone" internally set, exported, and then unexported the variable during its operation unnecessarily. * jc/no-git-config-in-clone: clone: do not export and unexport GIT_CONFIG
Junio C Hamano
Merge branch 'nd/fetch-depth-is-broken' "git fetch --depth" was broken in at least three ways. The resulting history was deeper than specified by one commit, it was unclear how to wipe the shallowness of the repository with the command, and documentation was misleading. * nd/fetch-depth-is-broken: fetch: elaborate --depth action upload-pack: fix off-by-one depth calculation in shallow clone fetch: add --unshallow for turning sha…
Junio C Hamano
Merge branch 'master' into next * master: gitk: Ignore gitk-wish buildproduct
Branches
next
Junio C Hamano
Merge branch 'bc/git-p4-for-python-2.4' into next With this, we are (and we will be) incompatible with Python 3 * bc/git-p4-for-python-2.4: INSTALL: git-p4 does not support Python 3
Branches
next
Junio C Hamano
Merge branch 'jk/remote-helpers-in-python-3' into next Finishing touches * jk/remote-helpers-in-python-3: git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean"
Branches
next
Junio C Hamano
Merge git://ozlabs.org/~paulus/gitk * git://ozlabs.org/~paulus/gitk: gitk: Ignore gitk-wish buildproduct
Junio C Hamano
git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean" fadf8c7 (git_remote_helpers: force rebuild if python version changes, 2013-01-20) started using a marker file to keep track of the version of Python interpreter used for the last build, but forgot to remove it when asked to "make clean". Acked-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
INSTALL: git-p4 does not support Python 3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'master' into next * master: README: update stale and/or incorrect information
Branches
next
Junio C Hamano
Merge branch 'pw/git-p4-on-cygwin' into next Improve "git p4" on Cygwin.
Branches
next
Junio C Hamano
Merge branch 'mp/complete-paths' into next The completion script used to let the default completer to suggest pathnames, which gave too many irrelevant choices (e.g. "git add" would not want to add an unmodified path). Teach it to use a more git-aware logic to enumerate only relevant ones. This is logically the right thing to do, and we would really love to see people who have been involved in completion code to review and comment on the…
Branches
next
Junio C Hamano
Merge branch 'nd/edit-branch-desc-while-detached' into next Attempt to "branch --edit-description" an existing branch, while being on a detached HEAD, errored out. * nd/edit-branch-desc-while-detached: branch: no detached HEAD check when editing another branch's description
Branches
next
Junio C Hamano
Merge branch 'bc/git-p4-for-python-2.4' into next With small updates to remove dependency on newer features of Python, keep git-p4 usable with older Python. * bc/git-p4-for-python-2.4: git-p4.py: support Python 2.4 git-p4.py: support Python 2.5
Branches
next
Junio C Hamano
Merge branch 'jk/read-commit-buffer-data-after-free' into next Clarify the ownership rule for commit->buffer field, which some callers incorrectly accessed without making sure it is populated. * jk/read-commit-buffer-data-after-free: logmsg_reencode: lazily load missing commit buffers logmsg_reencode: never return NULL commit: drop useless xstrdup of commit message
Branches
next
Junio C Hamano
Merge branch 'jk/gc-auto-after-fetch' into next Help "fetch only" repositories that do not trigger "gc --auto" often enough. This is to resolve merge conflicts early for the same topic to recent codebase. * jk/gc-auto-after-fetch: fetch-pack: avoid repeatedly re-scanning pack directory fetch: run gc --auto after fetching
Branches
next
Junio C Hamano
Merge branch 'jc/remove-treesame-parent-in-simplify-merges' into next The --simplify-merges logic did not cull irrelevant parents from a merge that is otherwise not interesting with respect to the paths we are following. This touches a fairly core part of the revision traversal infrastructure; even though I think this change is correct, please report immediately if you find any unintended side effect. * jc/remove-treesame-parent-in-simplify-merges: simplify-merg…
Branches
next
Nguyễn Thái Ngọc Duy
branch: no detached HEAD check when editing another branch's description Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'rr/minimal-stat' Some reimplementations of Git does not write all the stat info back to the index due to their implementation limitations (e.g. jgit running on Java). A configuration option can tell Git to ignore changes to most of the stat fields and only pay attention to mtime and size, which these implementations can reliably update. This avoids excessive revalidation of contents. * rr/minimal-stat: Enable…
Junio C Hamano
Merge branch 'nd/magic-pathspec-from-root' When giving arguments without "--" disambiguation, object names that come earlier on the command line must not be interpretable as pathspecs and pathspecs that come later on the command line must not be interpretable as object names. Tweak the disambiguation rule so that ":/" (no other string before or after) is always interpreted as a pathspec, to avoid having to say "git cmd -- :/". * nd/magi…
Junio C Hamano
Merge branch 'maint' * maint: README: update stale and/or incorrect information
Junio C Hamano
Merge branch 'tb/t0050-maint' into maint Update tests that were expecting to fail due to a bug that was fixed earlier. * tb/t0050-maint: t0050: Use TAB for indentation t0050: honor CASE_INSENSITIVE_FS in add (with different case) t0050: known breakage vanished in merge (case change)
  1. Prev
  2. Next