Commits

Author Commit Message Labels Comments Date
Carlo Marcelo Arenas Belon
documentation: update cvsimport description of "-r" for recent clone the "--use-separate-remote" option no longer exists, having since become the default for a clone. Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David J. Mellor
Documentation: Remove spurious uses of "you" in git-bisect.txt. These were added by accident in a42dea3. This patch also rewords the description of how ranges of commits can be skipped. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt
diff --no-index: Do not generate patch output if other output is requested Previously, 'git diff --no-index --stat a b' generated patch output in addition to the --stat output (or whatever other output format was requested). Now only the requested output is generated, and patch output remains the default. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Shawn O. Pearce
Increase the size of the die/warning buffer to avoid truncation Long messages like those from lockfile.c when a lock can't be obtained truncate with only 256 bytes in the message buffer. Bump it to 1024 to give more space for these longer cases. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint-1.6.1' into maint * maint-1.6.1: close_sha1_file(): make it easier to diagnose errors avoid possible overflow in delta size filtering computation
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: close_sha1_file(): make it easier to diagnose errors avoid possible overflow in delta size filtering computation
Linus Torvalds
close_sha1_file(): make it easier to diagnose errors A bug report with "unable to write sha1 file" made us realize that we do not have enough information to guess why close() is failing. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Pitre
avoid possible overflow in delta size filtering computation On a 32-bit system, the maximum possible size for an object is less than 4GB, while 64-bit systems may cope with larger objects. Due to this limitation, variables holding object sizes are using an unsigned long type (32 bits on 32-bit systems, or 64 bits on 64-bit systems). When large objects are encountered, and/or people play with large delta depth values, it is possible for the maximum allowe…
David J. Mellor
Documentation: minor grammatical fix in git-check-ref-format.txt Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David J. Mellor
Documentation: minor grammatical fixes in git-check-attr.txt Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David J. Mellor
Documentation: minor grammatical fixes in git-cat-file.txt Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David J. Mellor
Documentation: minor grammatical fixes and rewording in git-bundle.txt This commit also converts all reference specifications to a monospaced font, as the embedded ~ character used in some of the references sometimes causes the text up to the next ~ to be displayed incorrectly as a subscript when the HTML pages are generated. This was tested with asciidoc 8.2.5. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.co…
David J. Mellor
Documentation: remove some uses of the passive voice in git-bisect.txt Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint-1.6.1' into maint * maint-1.6.1: everyday: use the dashless form of git-init
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: everyday: use the dashless form of git-init
Junio C Hamano
diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged When the index says that the file in the work tree that corresponds to the blob object that is used for comparison is known to be unchanged, "diff" reads from the file and applies convert_to_git(), instead of inflating the object, to feed the internal diff engine with, because an earlier benchnark found that it tends to be faster to use this optimization. However, the index can lie when the path …
Johannes Schindelin
Smudge the files fed to external diff and textconv When preparing temporary files for an external diff or textconv, it is easier on the external tools, especially when they are implemented using platform tools, if they are fed the input after convert_to_working_tree(). This fixes msysGit issue 177. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar
everyday: use the dashless form of git-init The 'Everyday GIT' guide was using the old dashed form of git-init. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes to 1.6.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
ls-files: require worktree when --deleted is given The code will end up calling lstat() to check whether the file still exists; obviously this doesn't work if we're not in the worktree. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe
pickaxe: count regex matches only once When --pickaxe-regex is used, forward past the end of matches instead of advancing to the byte after their start. This way matches count only once, even if the regular expression matches their tail -- like in the fixed-string fork of the code. E.g.: /.*/ used to count the number of bytes instead of the number of lines. /aa/ resulted in a count of two in "aaa" instead of one. Also document the …
Junio C Hamano
Merge branch 'maint-1.6.1' into maint * maint-1.6.1:
Junio C Hamano
Merge branch 'tr/maint-1.6.0-send-email-irt' into maint * tr/maint-1.6.0-send-email-irt: send-email: test --no-thread --in-reply-to combination send-email: respect in-reply-to regardless of threading Conflicts: t/t9001-send-email.sh
Junio C Hamano
Merge branch 'mg/maint-submodule-normalize-path' into maint * mg/maint-submodule-normalize-path: git submodule: Fix adding of submodules at paths with ./, .. and // git submodule: Add test cases for git submodule add
Junio C Hamano
Merge branch 'rs/memmem' into maint * rs/memmem: optimize compat/ memmem() diffcore-pickaxe: use memmem()
Junio C Hamano
Merge branch 'js/rsync-local' into maint * js/rsync-local: rsync transport: allow local paths, and fix tests
Junio C Hamano
Merge branch 'db/maint-missing-origin' into maint * db/maint-missing-origin: Remove total confusion from git-fetch and git-push Give error when no remote is configured
Junio C Hamano
Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maint * jc/maint-1.6.0-read-tree-overlay: read-tree A B C: do not create a bogus index and do not segfault
Junio C Hamano
Merge branch 'js/maint-1.6.0-path-normalize' into maint-1.6.1 * js/maint-1.6.0-path-normalize: Remove unused normalize_absolute_path() Test and fix normalize_path_copy() Fix GIT_CEILING_DIRECTORIES on Windows Move sanitary_path_copy() to path.c and rename it to normalize_path_copy() Make test-path-utils more robust against incorrect use
Junio C Hamano
Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1 * jc/maint-1.6.0-pack-directory: Fix odb_mkstemp() on AIX Make sure objects/pack exists before creating a new pack Conflicts: wrapper.c
  1. Prev
  2. Next