| 3346330 | Junio C Hamano | 02 April 2009, 19:21:57 UTC | GIT 1.6.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2009, 19:34:16 UTC |
| 5ab2f7b | Junio C Hamano | 02 April 2009, 19:14:37 UTC | Merge branch 'jc/maint-1.6.0-blame-s' into maint * jc/maint-1.6.0-blame-s: blame: read custom grafts given by -S before calling setup_revisions() Conflicts: builtin-blame.c | 02 April 2009, 19:14:37 UTC |
| cb365a7 | Junio C Hamano | 02 April 2009, 19:02:30 UTC | Merge branch 'js/maint-diff-temp-smudge' into maint * js/maint-diff-temp-smudge: Smudge the files fed to external diff and textconv | 02 April 2009, 19:02:30 UTC |
| 1e7ef02 | Junio C Hamano | 02 April 2009, 19:02:25 UTC | Merge branch 'js/maint-1.6.0-exec-path-env' into maint * js/maint-1.6.0-exec-path-env: Propagate --exec-path setting to external commands via GIT_EXEC_PATH | 02 April 2009, 19:02:25 UTC |
| 8afd317 | Junio C Hamano | 02 April 2009, 19:02:18 UTC | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint * bc/maint-1.6.1-branch-deleted-was: git-branch: display "was sha1" on branch deletion rather than just "sha1" Conflicts: builtin-branch.c | 02 April 2009, 19:02:18 UTC |
| b5a1878 | Junio C Hamano | 02 April 2009, 19:00:59 UTC | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint * tr/maint-1.6.1-doc-format-patch--root: Documentation: format-patch --root clarifications | 02 April 2009, 19:00:59 UTC |
| 66c9e7d | Junio C Hamano | 02 April 2009, 18:58:39 UTC | Merge branch 'dm/maint-docco' into maint * dm/maint-docco: Documentation: Remove spurious uses of "you" in git-bisect.txt. Documentation: minor grammatical fix in git-check-ref-format.txt Documentation: minor grammatical fixes in git-check-attr.txt Documentation: minor grammatical fixes in git-cat-file.txt Documentation: minor grammatical fixes and rewording in git-bundle.txt Documentation: remove some uses of the passive voice in git-bisect.txt Documentation: reword example text in git-bisect.txt. Documentation: reworded the "Description" section of git-bisect.txt. Documentation: minor grammatical fixes in git-branch.txt. Documentation: minor grammatical fixes in git-blame.txt. Documentation: reword the "Description" section of git-bisect.txt. Documentation: minor grammatical fixes in git-archive.txt. | 02 April 2009, 18:58:39 UTC |
| 7634817 | Junio C Hamano | 02 April 2009, 05:36:05 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: Documentation: Remove an odd "instead" | 02 April 2009, 05:36:05 UTC |
| f054a41 | Junio C Hamano | 02 April 2009, 05:35:57 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: Documentation: Remove an odd "instead" | 02 April 2009, 05:35:57 UTC |
| 5bd27eb | Holger Weiß | 31 March 2009, 16:57:01 UTC | Documentation: Remove an odd "instead" Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2009, 18:34:02 UTC |
| fd94836 | Jeff King | 31 March 2009, 12:29:23 UTC | fix portability problem with IS_RUN_COMMAND_ERR Some old versions of gcc don't seem to like us negating an enum constant. Let's work around it by negating the other half of the comparison instead. Reported by Pierre Poissinger on gcc 2.9. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2009, 18:05:54 UTC |
| bf63780 | Johannes Schindelin | 31 March 2009, 00:18:36 UTC | mailmap: resurrect lower-casing of email addresses Commit 0925ce4(Add map_user() and clear_mailmap() to mailmap) broke the lower-casing of email addresses. This mostly did not matter if your .mailmap has only lower-case email addresses; However, we did not require .mailmap to contain lowercase-only email addresses. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2009, 18:00:54 UTC |
| 8c7f788 | Junio C Hamano | 30 March 2009, 20:29:31 UTC | Update draft release notes to 1.6.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 20:29:31 UTC |
| b19293d | Junio C Hamano | 30 March 2009, 20:25:27 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: Fix bash completion in path with spaces bash completion: only show 'log --merge' if merging git-tag(1): add hint about commit messages Documentation: update graph api example. Conflicts: contrib/completion/git-completion.bash | 30 March 2009, 20:25:27 UTC |
| dcbf041 | Junio C Hamano | 30 March 2009, 20:23:53 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: Fix bash completion in path with spaces bash completion: only show 'log --merge' if merging git-tag(1): add hint about commit messages Documentation: update graph api example. | 30 March 2009, 20:23:53 UTC |
| ba7906f | Daniel Cheng (aka SDiZ) | 30 March 2009, 11:27:37 UTC | Fix bash completion in path with spaces Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com> Trivially-acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 16:07:03 UTC |
| 67f1fe5 | Thomas Rast | 16 February 2009, 16:34:57 UTC | bash completion: only show 'log --merge' if merging The gitk completion only shows --merge if MERGE_HEAD is present. Do it the same way for git-log completion. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 16:06:48 UTC |
| abfd5fa | Nico -telmich- Schottelius | 30 March 2009, 11:58:21 UTC | git-tag(1): add hint about commit messages If a tag is not annotated, git tag displays the commit message instead. Add this hint to the manpage to unhide this secret. Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 16:00:04 UTC |
| 7b60d0d | Allan Caffee | 30 March 2009, 14:13:45 UTC | Documentation: update graph api example. As of commit 03300c0 the graph API uses '*' for all nodes including merges. This updates the example in the documentation to match. Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 15:59:45 UTC |
| 510a309 | Junio C Hamano | 30 March 2009, 06:11:13 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: import-zips: fix thinko | 30 March 2009, 06:11:13 UTC |
| 8e4f767 | Junio C Hamano | 30 March 2009, 06:11:03 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: import-zips: fix thinko | 30 March 2009, 06:11:03 UTC |
| b8fee3a | Eric Wong | 29 March 2009, 06:10:45 UTC | git-svn: fix ls-tree usage with dash-prefixed paths To find the blob object name given a tree and pathname, we were incorrectly calling "git ls-tree" with a "--" argument followed by the pathname of the file we wanted to get. git ls-tree <TREE> -- --dashed/path/name.c Unlike many command-line interfaces, the "--" alone does not symbolize the end of non-option arguments on the command-line. ls-tree interprets the "--" as a prefix to match against, thus the entire contents of the --dashed/* hierarchy would be returned because the "--" matches "--dashed" and every path under it. Thanks to Anton Gyllenberg for pointing me toward the Twisted repository as a real-world example of this case. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 02:58:10 UTC |
| 63801da | Johannes Schindelin | 29 March 2009, 20:42:27 UTC | import-zips: fix thinko Embarrassingly, the common prefix calculation did not work properly, due to a mistake in the assignment: instead of assigning the dirname of the current file name, the dirname of the current common prefix needs to be assigned to common prefix, when the current prefix does not match the current file name. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 02:56:26 UTC |
| 9d51564 | Junio C Hamano | 28 March 2009, 07:41:50 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: test-lib: Clean up comments and Makefile. diff --no-index: Do not generate patch output if other output is requested | 28 March 2009, 07:41:50 UTC |
| 81db4ab | Emil Sit | 28 March 2009, 01:57:18 UTC | test-lib: Clean up comments and Makefile. Bring documentation in test-lib and clean target in Makefile in-line with abc5d372. Signed-off-by: Emil Sit <sit@emilsit.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2009, 07:11:27 UTC |
| 2d266f9 | Thomas Rast | 26 March 2009, 17:29:25 UTC | Documentation: format-patch --root clarifications Users were confused about the meaning and use of the --root option. Notably, since 68c2ec7 (format-patch: show patch text for the root commit, 2009-01-10), --root has nothing to do with showing the patch text for the root commit any more. Shorten and clarify the corresponding paragraph in the DESCRIPTION section, document --root under OPTIONS, and add an explicit note that root commits are formatted regardless. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2009, 07:38:01 UTC |
| a8fac79 | Carlo Marcelo Arenas Belon | 26 March 2009, 07:08:09 UTC | 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> | 26 March 2009, 07:24:26 UTC |
| 19fa5e8 | David J. Mellor | 26 March 2009, 03:44:44 UTC | 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> | 26 March 2009, 03:47:29 UTC |
| 5d83f9c | Johannes Sixt | 25 March 2009, 17:19:46 UTC | 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> | 25 March 2009, 19:15:30 UTC |
| 389d176 | Shawn O. Pearce | 24 March 2009, 23:10:35 UTC | 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> | 24 March 2009, 23:58:20 UTC |
| b0de555 | Junio C Hamano | 24 March 2009, 22:31:21 UTC | 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 | 24 March 2009, 22:31:21 UTC |
| 2a5643d | Junio C Hamano | 24 March 2009, 22:31:15 UTC | 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 | 24 March 2009, 22:31:15 UTC |
| e8bd78c | Linus Torvalds | 24 March 2009, 19:31:36 UTC | 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> | 24 March 2009, 21:39:20 UTC |
| 720fe22 | Nicolas Pitre | 24 March 2009, 19:56:12 UTC | 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 allowed delta size computation to overflow, especially on a 32-bit system. When this occurs, surviving result bits may represent a value much smaller than what it is supposed to be, or even zero. This prevents some objects from being deltified although they do get deltified when a smaller depth limit is used. Fix this by always performing a 64-bit multiplication. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 March 2009, 21:37:30 UTC |
| cd747dc | David J. Mellor | 23 March 2009, 01:00:17 UTC | 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> | 23 March 2009, 04:03:39 UTC |
| 3460a60 | David J. Mellor | 23 March 2009, 01:00:16 UTC | 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> | 23 March 2009, 04:02:38 UTC |
| d83a42f | David J. Mellor | 23 March 2009, 01:00:15 UTC | 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> | 23 March 2009, 04:02:08 UTC |
| 1d52b02 | David J. Mellor | 23 March 2009, 01:00:14 UTC | 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.com> | 23 March 2009, 03:59:20 UTC |
| a42dea3 | David J. Mellor | 23 March 2009, 03:11:10 UTC | 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> | 23 March 2009, 03:58:16 UTC |
| cbc8c61 | Junio C Hamano | 22 March 2009, 22:41:00 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: everyday: use the dashless form of git-init | 22 March 2009, 22:41:00 UTC |
| 0abd527 | Junio C Hamano | 22 March 2009, 22:40:55 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: everyday: use the dashless form of git-init | 22 March 2009, 22:40:55 UTC |
| 4e218f5 | Johannes Schindelin | 21 March 2009, 11:42:52 UTC | 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> | 22 March 2009, 22:03:59 UTC |
| 3e5970a | David Aguilar | 22 March 2009, 09:15:13 UTC | 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> | 22 March 2009, 17:33:36 UTC |
| 93467ee | Junio C Hamano | 22 March 2009, 06:21:15 UTC | Update draft release notes to 1.6.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 March 2009, 06:21:15 UTC |
| 67c176f | Jeff King | 17 March 2009, 09:03:19 UTC | 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> | 22 March 2009, 06:19:27 UTC |
| 7ad3c52 | René Scharfe | 16 March 2009, 18:38:42 UTC | 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 fact that regexec() needs a NUL-terminated string as its second argument by adding an assert(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 March 2009, 06:18:53 UTC |
| c0250b6 | Junio C Hamano | 22 March 2009, 06:10:42 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: | 22 March 2009, 06:10:42 UTC |
| 923cc82 | Junio C Hamano | 22 March 2009, 06:09:21 UTC | 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 | 22 March 2009, 06:09:21 UTC |
| 8af95ca | Junio C Hamano | 22 March 2009, 06:08:27 UTC | 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 | 22 March 2009, 06:08:27 UTC |
| 2aa93de | Junio C Hamano | 22 March 2009, 06:08:21 UTC | Merge branch 'rs/memmem' into maint * rs/memmem: optimize compat/ memmem() diffcore-pickaxe: use memmem() | 22 March 2009, 06:08:21 UTC |
| 10a73f5 | Junio C Hamano | 22 March 2009, 06:03:17 UTC | Merge branch 'js/rsync-local' into maint * js/rsync-local: rsync transport: allow local paths, and fix tests | 22 March 2009, 06:03:17 UTC |
| 3c954c2 | Junio C Hamano | 22 March 2009, 06:02:55 UTC | 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 | 22 March 2009, 06:02:55 UTC |
| 0e1aa2f | Junio C Hamano | 22 March 2009, 06:02:47 UTC | 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 | 22 March 2009, 06:02:47 UTC |
| e10d48d | Junio C Hamano | 22 March 2009, 05:59:19 UTC | 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 | 22 March 2009, 05:59:19 UTC |
| 2990034 | Junio C Hamano | 22 March 2009, 05:53:36 UTC | 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 | 22 March 2009, 05:53:36 UTC |
| b60df87 | Stephen Boyd | 22 March 2009, 04:32:43 UTC | format-patch: --numbered-files and --stdout aren't mutually exclusive For example: git format-patch --numbered-files --stdout --attach HEAD~~ will create two messages with files 1 and 2 attached respectively. Without --attach/--inline but with --stdout, --numbered-files option can be simply ignored, because we are not creating any file ourselves. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 March 2009, 05:45:28 UTC |
| c90d565 | Johannes Sixt | 21 March 2009, 22:21:18 UTC | Propagate --exec-path setting to external commands via GIT_EXEC_PATH Let PATH0=$PATH that was set before the invocation. Let /foo be a build directory. Let /pfx be the installation prefix. Let pfxexecpath=/pfx/libexec/git-core. The following is going on when 'git --exec-path=/foo gc' is invoked: 1. git sets PATH=/foo:$PATH0 using the path from --exec-path 2. gc execs 'git repack' (note: no dash). 3. Since there is a git in /foo (it's a build directory), /foo/git is taken. 4. No explicit exec-path is set this time, hence, this secondary git sets PATH=$pfxexecpath:/foo:$PATH 5. Since 'repack' is not a built-in, execv_dashed_external execs 'git-repack' (note: dash). 6. There is a $pfxexecpath/git-repack, and it is taken. 7. This git-repack runs 'git pack-objects' (note: no dash). 8. There is no git in $pfxexecpath, but there is one in /foo. Hence, /foo/git is run. 9. pack-objects is a builtin, hence, in effect /foo/git-pack-objects is run. As you can see, the way in which we previously set the PATH allowed to mix gits of different vintage. By setting GIT_EXEC_PATH when --exec-path was given on the command line, we reduce the confusion. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 March 2009, 04:45:14 UTC |
| 76aac71 | Brandon Casey | 22 March 2009, 00:09:17 UTC | git-branch: display "was sha1" on branch deletion rather than just "sha1" Make it more pleasant to read about a branch deletion by adding "was". Jeff King suggested this, and I ignored it. He was right. Update t3200 test again to match the change in output. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 March 2009, 00:30:51 UTC |
| 4306bcb | David J. Mellor | 20 March 2009, 03:35:34 UTC | Documentation: reword example text in git-bisect.txt. Avoid splitting sentences across examples of command usage. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2009, 16:34:44 UTC |
| 821d56a | Jeff King | 03 March 2009, 15:40:41 UTC | doc: clarify how -S works The existing text was very vague about what exactly it means for difference to "contain" a change. This seems to cause confusion on the mailing list every month or two. To fix it we: 1. use "introduce or remove an instance of" instead of "contain" 2. point the user to gitdiffcore(7), which contains a more complete explanation Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 March 2009, 09:47:40 UTC |
| ee9cf14 | David J. Mellor | 19 March 2009, 07:00:12 UTC | Documentation: reworded the "Description" section of git-bisect.txt. Added fixes missing from 2364259. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 March 2009, 08:38:35 UTC |
| aa9ea77 | Junio C Hamano | 18 March 2009, 07:13:03 UTC | blame: read custom grafts given by -S before calling setup_revisions() setup_revisions() while getting the command line arguments parses the given commits from the command line, which means their direct parents will not be rewritten by the custom graft file. Call read_ancestry() early to work around this issue. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 March 2009, 07:13:03 UTC |
| e5ac121 | David J. Mellor | 17 March 2009, 06:16:17 UTC | Documentation: minor grammatical fixes in git-branch.txt. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2009, 19:08:43 UTC |
| b89510f | David J. Mellor | 17 March 2009, 06:16:16 UTC | Documentation: minor grammatical fixes in git-blame.txt. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2009, 19:08:43 UTC |
| 2364259 | David J. Mellor | 17 March 2009, 06:16:15 UTC | Documentation: reword the "Description" section of git-bisect.txt. Reword this section to make it less chatty. Also make minor grammatical fixes. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2009, 19:08:10 UTC |
| 3f7cdf3 | David J. Mellor | 17 March 2009, 06:16:14 UTC | Documentation: minor grammatical fixes in git-archive.txt. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2009, 07:13:39 UTC |
| 9326d49 | Junio C Hamano | 16 March 2009, 07:35:09 UTC | Remove total confusion from git-fetch and git-push The config file is not the only place remotes are defined, and without consulting .git/remotes and .git/branches, you won't know if "origin" is configured by the user. Don't give up too early and insult the user with a wisecrack "Where do you want to fetch from today?" The only thing the previous patch seems to want to prevent from happening is a lazy "git fetch/push" that does not say where-from/to to produce an error message 'origin not found', and we can do that by not letting add_url_alias() to turn a nickname "origin" literally into a pathname "origin" without changing the rest of the logic. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2009, 07:35:09 UTC |
| 6f55ee4 | Junio C Hamano | 15 March 2009, 20:03:19 UTC | GIT 1.6.2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 March 2009, 20:05:05 UTC |
| a54a216 | Junio C Hamano | 13 March 2009, 06:37:16 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: | 13 March 2009, 06:37:16 UTC |
| bf0fe35 | Junio C Hamano | 13 March 2009, 06:36:57 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: bisect: fix another instance of eval'ed string bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped Support "\" in non-wildcard exclusion entries Conflicts: git-bisect.sh | 13 March 2009, 06:36:57 UTC |
| 1e68adc | Junio C Hamano | 13 March 2009, 06:11:23 UTC | Merge branch 'en/maint-1.6.1-hash-object' into maint-1.6.1 * en/maint-1.6.1-hash-object: Ensure proper setup of git_dir for git-hash-object | 13 March 2009, 06:11:23 UTC |
| 688ba09 | Junio C Hamano | 13 March 2009, 04:48:43 UTC | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.0 * ks/maint-1.6.0-mailinfo-folded: mailinfo: tests for RFC2047 examples mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)' mailinfo: 'From:' header should be unfold as well mailinfo: correctly handle multiline 'Subject:' header | 13 March 2009, 04:48:43 UTC |
| 3e186ef | Junio C Hamano | 13 March 2009, 04:48:26 UTC | Merge branch 'cc/maint-1.6.0-bisect-fix' into maint-1.6.0 * cc/maint-1.6.0-bisect-fix: bisect: fix another instance of eval'ed string bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped | 13 March 2009, 04:48:26 UTC |
| fa711bc | Junio C Hamano | 13 March 2009, 04:48:07 UTC | Merge branch 'fg/maint-1.6.0-exclude-bq' into maint-1.6.0 * fg/maint-1.6.0-exclude-bq: Support "\" in non-wildcard exclusion entries | 13 March 2009, 04:48:07 UTC |
| 532b74b | Junio C Hamano | 13 March 2009, 04:46:50 UTC | Merge branch 'js/maint-1.6.1-filter-branch-submodule' into maint-1.6.1 * js/maint-1.6.1-filter-branch-submodule: filter-branch: do not consider diverging submodules a 'dirty worktree' | 13 March 2009, 04:46:50 UTC |
| c26901a | Junio C Hamano | 13 March 2009, 04:46:35 UTC | Merge branch 'gt/maint-1.6.1-utf8-width' into maint-1.6.1 * gt/maint-1.6.1-utf8-width: builtin-blame.c: Use utf8_strwidth for author's names utf8: add utf8_strwidth() | 13 March 2009, 04:46:35 UTC |
| 2f5bfa7 | Junio C Hamano | 13 March 2009, 04:45:56 UTC | Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1 * js/maint-1.6.1-remote-remove-mirror: builtin-remote: make rm operation safer in mirrored repository builtin-remote: make rm() use properly named variable to hold return value | 13 March 2009, 04:45:56 UTC |
| 592ebd0 | Junio C Hamano | 13 March 2009, 04:45:21 UTC | Merge branch 'ek/maint-1.6.1-filter-branch-bare' into maint-1.6.1 * ek/maint-1.6.1-filter-branch-bare: filter-branch: Fix fatal error on bare repositories | 13 March 2009, 04:45:21 UTC |
| d9b0443 | Junio C Hamano | 13 March 2009, 04:45:14 UTC | Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1 * jc/maint-1.6.1-add-u-remove-conflicted: add -u: do not fail to resolve a path as deleted | 13 March 2009, 04:45:14 UTC |
| 54e7e78 | Junio C Hamano | 13 March 2009, 04:45:02 UTC | Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1 * js/maint-1.6.1-rebase-i-submodule: Fix submodule squashing into unrelated commit rebase -i squashes submodule changes into unrelated commit | 13 March 2009, 04:45:02 UTC |
| daf713d | Junio C Hamano | 13 March 2009, 04:44:48 UTC | Merge branch 'jc/maint-1.6.1-allow-uninteresting-missing' into maint-1.6.1 * jc/maint-1.6.1-allow-uninteresting-missing: revision traversal: allow UNINTERESTING objects to be missing | 13 March 2009, 04:44:48 UTC |
| e89b991 | Junio C Hamano | 13 March 2009, 04:44:00 UTC | Merge branch 'ks/maint-1.6.0-mailinfo-folded' into maint-1.6.1 * ks/maint-1.6.0-mailinfo-folded: mailinfo: tests for RFC2047 examples mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)' mailinfo: 'From:' header should be unfold as well mailinfo: correctly handle multiline 'Subject:' header | 13 March 2009, 04:44:00 UTC |
| 8bb78b7 | Junio C Hamano | 13 March 2009, 04:43:38 UTC | Merge branch 'jk/maint-1.6.1-cleanup-after-exec-failure' into maint-1.6.1 * jk/maint-1.6.1-cleanup-after-exec-failure: git: use run_command() to execute dashed externals run_command(): help callers distinguish errors run_command(): handle missing command errors more gracefully git: s/run_command/run_builtin/ | 13 March 2009, 04:43:38 UTC |
| de55390 | Junio C Hamano | 13 March 2009, 03:01:28 UTC | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into maint-1.6.0 * jc/maint-1.6.0-split-diff-metainfo: diff.c: output correct index lines for a split diff | 13 March 2009, 03:01:28 UTC |
| aab3b9a | Junio C Hamano | 12 March 2009, 07:02:12 UTC | read-tree A B C: do not create a bogus index and do not segfault "git read-tree A B C..." without the "-m" (merge) option is a way to read these trees on top of each other to get an overlay of them. An ancient commit ee6566e (Rewrite read-tree, 2005-09-05) passed the ADD_CACHE_SKIP_DFCHECK flag when calling add_index_entry() to add the paths obtained from these trees to the index, but it is an incorrect use of the flag. The flag is meant to be used by callers who know the addition of the entry does not introduce a D/F conflict to the index in order to avoid the overhead of checking. This bug resulted in a bogus index that records both "x" and "x/z" as a blob after reading three trees that have paths ("x"), ("x", "y"), and ("x/z", "y") respectively. 34110cd (Make 'unpack_trees()' have a separate source and destination index, 2008-03-06) refactored the callsites of add_index_entry() incorrectly and added more codepaths that use this flag when it shouldn't be used. Also, 0190457 (Move 'unpack_trees()' over to 'traverse_trees()' interface, 2008-03-05) introduced a bug to call add_index_entry() for the tree that does not have the path in it, passing NULL as a cache entry. This caused reading multiple trees, one of which has path "x" but another doesn't, to segfault. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2009, 00:06:07 UTC |
| aaab4b9 | Thomas Rast | 11 March 2009, 22:40:13 UTC | send-email: test --no-thread --in-reply-to combination 3e0c4ff (send-email: respect in-reply-to regardless of threading, 2009-03-01) fixed the handling of the In-Reply-To header when both --no-thread and --in-reply-to are in effect. Add a test for it. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 March 2009, 03:54:42 UTC |
| c2aca7c | Junio C Hamano | 11 March 2009, 21:37:15 UTC | Update draft release notes for 1.6.2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2009, 21:37:15 UTC |
| 7681ed2 | Junio C Hamano | 11 March 2009, 21:01:24 UTC | Merge branch 'js/maint-send-email' into maint * js/maint-send-email: send-email: don't create temporary compose file until it is needed send-email: --suppress-cc improvements send-email: handle multiple Cc addresses when reading mbox message send-email: allow send-email to run outside a repo | 11 March 2009, 21:01:24 UTC |
| ecab04d | Junio C Hamano | 11 March 2009, 20:59:38 UTC | Merge branch 'jk/sane-relative-time' into maint * jk/sane-relative-time: never fallback relative times to absolute | 11 March 2009, 20:59:38 UTC |
| 6c3b3e1 | Junio C Hamano | 11 March 2009, 20:55:49 UTC | Merge branch 'jc/maint-add-p-unquote' into maint * jc/maint-add-p-unquote: git-add -i/-p: learn to unwrap C-quoted paths | 11 March 2009, 20:55:49 UTC |
| 5f7b338 | Junio C Hamano | 11 March 2009, 20:53:53 UTC | Merge branch 'fg/maint-exclude-bq' into maint * fg/maint-exclude-bq: Support "\" in non-wildcard exclusion entries | 11 March 2009, 20:53:53 UTC |
| bbc6a14 | Junio C Hamano | 11 March 2009, 20:51:59 UTC | Merge branch 'en/maint-hash-object' into maint * en/maint-hash-object: Ensure proper setup of git_dir for git-hash-object Conflicts: hash-object.c | 11 March 2009, 20:51:59 UTC |
| 7efaeba | Johannes Schindelin | 09 March 2009, 18:44:55 UTC | rsync transport: allow local paths, and fix tests Earlier, the rsync tests were disabled by default, as they needed a running rsyncd daemon. This was only due to the limitation that our rsync transport only allowed full URLs of the form rsync://<host>/<path> Relaxing the URLs to allow rsync:<path> permitted the change in the tests to run whenever rsync is available, without requiring a fully configured and running rsyncd. While at it, the tests were fixed so that they run in directories with a space in their name. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2009, 06:17:56 UTC |
| fa685bd | Daniel Barkalow | 11 March 2009, 05:47:20 UTC | Give error when no remote is configured When there's no explicitly-named remote, we use the remote specified for the current branch, which in turn defaults to "origin". But it this case should require the remote to actually be configured, and not fall back to the path "origin". Possibly, the config file's "remote = something" should require the something to be a configured remote instead of a bare repository URL, but we actually test with a bare repository URL. In fetch, we were giving the sensible error message when coming up with a URL failed, but this wasn't actually reachable, so move that error up and use it when appropriate. In push, we need a new error message, because the old one (formerly unreachable without a lot of help) used the repo name, which was NULL. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2009, 06:14:20 UTC |
| 9a6682b | Junio C Hamano | 08 March 2009, 05:00:27 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: builtin-revert.c: release index lock when cherry-picking an empty commit | 08 March 2009, 05:00:27 UTC |
| 0d66e95 | Chris Johnsen | 07 March 2009, 09:30:51 UTC | builtin-revert.c: release index lock when cherry-picking an empty commit When a cherry-pick of an empty commit is done, release the lock held on the index. The fix is the same as was applied to similar code in 4271666046. Signed-off-by: Chris Johnsen <chris_johnsen@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2009, 20:21:45 UTC |
| d57f07e | Jeff King | 07 March 2009, 17:14:06 UTC | document config --bool-or-int The documentation is just a pointer to the --bool and --int options, but it makes sense to at least mention that it exists. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2009, 19:33:51 UTC |
| 003f69b | Jeff King | 07 March 2009, 17:14:04 UTC | t1300: use test_must_fail as appropriate Some of the tests checked the exit code manually, even going so far as to run git outside of the test_expect harness. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2009, 19:28:53 UTC |
| c2e9364 | René Scharfe | 07 March 2009, 13:06:49 UTC | cleanup: add isascii() Add a standard definition of isascii() and use it to replace an open coded high-bit test in pretty.c. While we're there, write the ESC char as the more commonly used '\033' instead of as 0x1b to enhance its grepability. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2009, 19:22:42 UTC |
| 3d2d4f9 | Christian Couder | 07 March 2009, 12:37:24 UTC | Documentation: fix badly indented paragraphs in "--bisect-all" description Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2009, 19:21:41 UTC |
