Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.6.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.6.1
Junio C Hamano
Merge branch 'bg/maint-remote-update-default' into maint * bg/maint-remote-update-default: Fix "git remote update" with remotes.defalt set
Junio C Hamano
Merge branch 'sb/maint-octopus' into maint * sb/maint-octopus: octopus: remove dead code octopus: reenable fast-forward merges octopus: make merge process simpler to follow Conflicts: git-merge-octopus.sh
Junio C Hamano
Merge branch 'bg/maint-add-all-doc' into maint * bg/maint-add-all-doc: git-rm doc: Describe how to sync index & work tree git-add/rm doc: Consistently back-quote Documentation: 'git add -A' can remove files
Junio C Hamano
Merge branch 'maint-1.6.5' into maint * maint-1.6.5: Git 1.6.5.8 Fix mis-backport of t7002 bash completion: factor submodules into dirty state reset: unbreak hard resets with GIT_WORK_TREE Conflicts: Documentation/git.txt GIT-VERSION-GEN RelNotes
Junio C Hamano
Git 1.6.5.8 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.5.8
Junio C Hamano
Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5 * jk/maint-1.6.5-reset-hard: reset: unbreak hard resets with GIT_WORK_TREE
Junio C Hamano
Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1.6.5 * tr/maint-1.6.5-bash-prompt-show-submodule-changes: bash completion: factor submodules into dirty state
Junio C Hamano
Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5 * dp/maint-1.6.5-fast-import-non-commit-tag: fast-import: tag may point to any object type
Junio C Hamano
Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5 * jm/maint-1.6.5-grep-NUL-terminate: grep: NUL terminate input from a file
David Ripton
bisect: fix singular/plural grammar nit Remove the trailing 's' from "revisions" and "steps" when there is only one. Signed-off-by: David Ripton <dripton@ripton.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint-1.6.4' into maint-1.6.5 * maint-1.6.4: Fix mis-backport of t7002 base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file desc…
Junio C Hamano
Merge branch 'maint-1.6.3' into maint-1.6.4 * maint-1.6.3: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup …
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3 * maint-1.6.2: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup …
Junio C Hamano
Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4 * commit 'v1.6.4.4-8-g8de6518': Fix mis-backport of t7002
Junio C Hamano
Fix mis-backport of t7002 The original patch that became cfe370c (grep: do not segfault when -f is used, 2009-10-16), was made against "maint" or newer branch back then, but the fix addressed the issue that was present as far as in 1.6.4 series. The maintainer backported the patch to the 1.6.4 maintenance branch, but failed to notice that the new tests assumed the setup done by the script in "maint", which did quite a lot…
Junio C Hamano
Update draft release notes to 1.6.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint * dp/maint-1.6.5-fast-import-non-commit-tag: fast-import: tag may point to any object type
Junio C Hamano
Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint * jm/maint-1.6.5-grep-NUL-terminate: grep: NUL terminate input from a file
Jim Meyering
grep: NUL terminate input from a file Internally "git grep" runs regexec(3) that expects its input string to be NUL terminated. When searching inside blob data, read_sha1_file() automatically gives such a buffer, but builtin-grep.c forgot to put the NUL at the end, even though it allocated enough space for it. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Richard Weinberger
Fix uninitialized variable in get_refs_via_rsync(). This fixes a crash when cloning via rsync://. Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra
Document git-blame triple -C option Lift the explanation of -CCC option in the source to the documentation. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dmitry Potapov
fast-import: tag may point to any object type If you tried to export the official git repository, and then to import it back then git-fast-import would die complaining that "Mark :1 not a commit". Accordingly to a generated crash file, Mark 1 is not a commit but a blob, which is pointed by junio-gpg-pub tag. Because git-tag allows to create such tags, git-fast-import should import them. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Ack…
Shawn O. Pearce
remote-curl: Fix Accept header for smart HTTP connections We actually expect to see an application/x-git-upload-pack-result but we lied and said we Accept *-response. This was a typo on my part when I was writing the code. Fortunately the wrong Accept header had no real impact, as the deployed git-http-backend servers were not testing the Accept header before they returned their content. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-…
Junio C Hamano
grep: -L should show empty files The -L (--files-without-match) option is supposed to show paths that produced no matches. When running the internal grep on work tree files, however, we had an optimization to just return on zero-sized files, without doing anything. This optimization doesn't matter too much in practice (a tracked empty file must be rare, or there is something wrong with your project); to produce results consiste…
Michael Haggerty
rebase--interactive: Ignore comments and blank lines in peek_next_command Previously, blank lines and/or comments within a series of squash/fixup commands would confuse "git rebase -i" into thinking that the series was finished. It would therefore require the user to edit the commit message for the squash/fixup commits seen so far. Then, after continuing, it would ask the user to edit the commit message again. Ignore comments and blank lines within a group of squash/…
Junio C Hamano
Merge branch 'maint-1.6.2' into maint * maint-1.6.2: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch Conflicts: diff.c
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2 * maint-1.6.1: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup …
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname".
Andreas Gruenbacher
base85: Make the code more obvious instead of explaining the non-obvious Here is another cleanup ... Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next