| b296e8f | Junio C Hamano | 29 January 2009, 08:12:52 UTC | GIT 1.6.1.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2009, 08:12:52 UTC |
| a9ed6ce | Junio C Hamano | 29 January 2009, 07:56:13 UTC | Merge branch 'jc/maint-format-patch-o-relative' into maint * jc/maint-format-patch-o-relative: Teach format-patch to handle output directory relative to cwd Conflicts: t/t4014-format-patch.sh | 29 January 2009, 07:56:13 UTC |
| 9530eb1 | Junio C Hamano | 29 January 2009, 07:42:57 UTC | Merge branch 'bs/maint-rename-populate-filespec' into maint * bs/maint-rename-populate-filespec: Rename detection: Avoid repeated filespec population | 29 January 2009, 07:42:57 UTC |
| 0630a66 | Junio C Hamano | 29 January 2009, 07:42:53 UTC | Merge branch 'mh/maint-commit-color-status' into maint * mh/maint-commit-color-status: git-status -v: color diff output when color.ui is set git-commit: color status output when color.ui is set | 29 January 2009, 07:42:53 UTC |
| f9686cd | Junio C Hamano | 29 January 2009, 07:42:41 UTC | Merge branch 'nd/grep-assume-unchanged' into maint * nd/grep-assume-unchanged: grep: grep cache entries if they are "assume unchanged" grep: support --no-ext-grep to test builtin grep | 29 January 2009, 07:42:41 UTC |
| 32fe027 | Junio C Hamano | 29 January 2009, 07:42:15 UTC | Merge branch 'jc/maint-ls-tree' into maint * jc/maint-ls-tree: Document git-ls-tree --full-tree ls-tree: add --full-tree option | 29 January 2009, 07:42:15 UTC |
| 8e7d1f6 | Junio C Hamano | 29 January 2009, 07:42:10 UTC | Merge branch 'np/no-loosen-prune-expire-now' into maint * np/no-loosen-prune-expire-now: objects to be pruned immediately don't have to be loosened | 29 January 2009, 07:42:10 UTC |
| 20bd35c | Junio C Hamano | 29 January 2009, 07:41:56 UTC | Merge branch 'mc/cd-p-pwd' into maint * mc/cd-p-pwd: git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X | 29 January 2009, 07:41:56 UTC |
| 8561b52 | Junio C Hamano | 29 January 2009, 07:41:28 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: avoid 31-bit truncation in write_loose_object | 29 January 2009, 07:41:28 UTC |
| 915308b | Jeff King | 29 January 2009, 05:56:34 UTC | avoid 31-bit truncation in write_loose_object The size of the content we are adding may be larger than 2.1G (i.e., "git add gigantic-file"). Most of the code-path to do so uses size_t or unsigned long to record the size, but write_loose_object uses a signed int. On platforms where "int" is 32-bits (which includes x86_64 Linux platforms), we end up passing malloc a negative size. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2009, 07:40:53 UTC |
| 02322e1 | Junio C Hamano | 28 January 2009, 04:21:31 UTC | send-pack: do not send unknown object name from ".have" to pack-objects v1.6.1 introduced ".have" extension to the protocol to allow the receiving side to advertise objects that are reachable from refs in the repositories it borrows from. This was meant to be used by the sending side to avoid sending such objects; they are already available through the alternates mechanism. The client side implementation in v1.6.1, which was introduced with 40c155f (push: prepare sender to receive extended ref information from the receiver, 2008-09-09) aka v1.6.1-rc1~203^2~1, were faulty in that it did not consider the possiblity that the repository receiver borrows from might have objects it does not know about. This fixes it by refraining from passing missing commits to underlying pack-objects. Revision machinery may need to be tightened further to treat missing uninteresting objects as non-error events, but this is an obvious and safe fix for a maintenance release that is almost good enough. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 January 2009, 07:46:59 UTC |
| 899d8dc | Junio C Hamano | 27 January 2009, 23:23:46 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: test-path-utils: Fix off by one, found by valgrind get_sha1_basic(): fix invalid memory access, found by valgrind | 27 January 2009, 23:23:46 UTC |
| b8469ad | Johannes Schindelin | 27 January 2009, 23:07:36 UTC | test-path-utils: Fix off by one, found by valgrind When normalizing an absolute path, we might have to add a slash _and_ a NUL to the buffer, so the buffer was one too small. Let's just future proof the code and alloc PATH_MAX + 1 bytes. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2009, 23:16:41 UTC |
| f265458 | Johannes Schindelin | 27 January 2009, 23:07:46 UTC | get_sha1_basic(): fix invalid memory access, found by valgrind When get_sha1_basic() is passed a buffer of len 0, it should not check if buf[len-1] is a curly bracket. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2009, 23:16:31 UTC |
| 5c41531 | Junio C Hamano | 25 January 2009, 20:41:09 UTC | GIT 1.6.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 January 2009, 20:41:09 UTC |
| 692be9f | Junio C Hamano | 24 January 2009, 03:06:38 UTC | Merge branch 'cb/maint-unpack-trees-absense' into maint * cb/maint-unpack-trees-absense: unpack-trees: remove redundant path search in verify_absent unpack-trees: fix path search bug in verify_absent unpack-trees: handle failure in verify_absent | 24 January 2009, 03:06:38 UTC |
| f630171 | Junio C Hamano | 24 January 2009, 03:04:48 UTC | Merge branch 'tr/maint-no-index-fixes' into maint * tr/maint-no-index-fixes: diff --no-index -q: fix endless loop diff --no-index: test for pager after option parsing diff: accept -- when using --no-index | 24 January 2009, 03:04:48 UTC |
| 46cdcc6 | Junio C Hamano | 24 January 2009, 03:03:50 UTC | Merge branch 'rs/maint-shortlog-foldline' into maint * rs/maint-shortlog-foldline: shortlog: handle multi-line subjects like log --pretty=oneline et. al. do | 24 January 2009, 03:03:50 UTC |
| 67b175b | Junio C Hamano | 24 January 2009, 03:02:58 UTC | Merge branch 'pj/maint-ldflags' into maint * pj/maint-ldflags: configure clobbers LDFLAGS | 24 January 2009, 03:02:58 UTC |
| e5bde19 | Junio C Hamano | 24 January 2009, 03:02:41 UTC | Merge branch 'pb/maint-git-pm-false-dir' into maint * pb/maint-git-pm-false-dir: Git.pm: correctly handle directory name that evaluates to "false" | 24 January 2009, 03:02:41 UTC |
| e2355a3 | Junio C Hamano | 24 January 2009, 03:01:32 UTC | Merge branch 'js/maint-bisect-gitk' into maint * js/maint-bisect-gitk: bisect view: call gitk if Cygwin's SESSIONNAME variable is set | 24 January 2009, 03:01:32 UTC |
| 9e3248e | Junio C Hamano | 24 January 2009, 03:00:43 UTC | Merge branch 'js/add-not-submodule' into maint * js/add-not-submodule: git add: do not add files from a submodule | 24 January 2009, 03:00:43 UTC |
| 5cb0f27 | Junio C Hamano | 24 January 2009, 02:59:59 UTC | Merge branch 'jc/maint-format-patch' into maint * jc/maint-format-patch: format-patch: show patch text for the root commit | 24 January 2009, 02:59:59 UTC |
| d4029d3 | Junio C Hamano | 24 January 2009, 02:59:26 UTC | Merge branch 'am/maint-push-doc' into maint * am/maint-push-doc: Documentation: avoid using undefined parameters Documentation: mention branches rather than heads Documentation: remove a redundant elaboration Documentation: git push repository can also be a remote | 24 January 2009, 02:59:26 UTC |
| b619715 | Junio C Hamano | 24 January 2009, 02:48:14 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: Fix Documentation for git-describe | 24 January 2009, 02:48:14 UTC |
| b938f62 | Boyd Stephen Smith Jr | 22 January 2009, 18:26:25 UTC | Fix Documentation for git-describe The documentation for git-describe says the default abbreviation is 8 hexadecimal digits while cache.c clearly shows DEFAULT_ABBREV set to 7. This patch corrects the documentation. Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2009, 08:17:04 UTC |
| 950db87 | Johannes Schindelin | 20 January 2009, 21:08:33 UTC | Rename diff.suppress-blank-empty to diff.suppressBlankEmpty All the other config variables use CamelCase. This config variable should not be an exception. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2009, 08:17:40 UTC |
| 885c716 | Björn Steinbrink | 20 January 2009, 15:59:57 UTC | Rename detection: Avoid repeated filespec population In diffcore_rename, we assume that the blob contents in the filespec aren't required anymore after estimate_similarity has been called and thus we free it. But estimate_similarity might return early when the file sizes differ too much. In that case, cnt_data is never set and the next call to estimate_similarity will populate the filespec again, eventually rereading the same blob over and over again. To fix that, we first get the blob sizes and only when the blob contents are actually required, and when cnt_data will be set, the full filespec is populated, once. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2009, 08:14:12 UTC |
| 674a1d2 | Lars Noschinski | 19 January 2009, 17:06:43 UTC | shell: Document that 'cvs server' is a valid command git-shell's man page explicitly lists all allowed commands, but 'cvs server' was missing. Add it. Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 January 2009, 01:07:23 UTC |
| 69274b6 | Anders Melchiorsen | 18 January 2009, 14:36:58 UTC | Documentation: avoid using undefined parameters The <ref> parameter has not been introduced, so rewrite to avoid it. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 22:29:37 UTC |
| 89edd5a | Anders Melchiorsen | 18 January 2009, 14:36:57 UTC | Documentation: mention branches rather than heads The "matching refs" semantics works only on matching branches these days. Instead of using "heads" which traditionally has been used more or less interchangeably with "refs", say "branch" explicitly here. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 22:27:52 UTC |
| 391d186 | Anders Melchiorsen | 18 January 2009, 14:36:56 UTC | Documentation: remove a redundant elaboration The comment in parentheses is wrong, as one has to leave out both the colon and <dst>. This situation is covered by the section a few lines down: A parameter <ref> without a colon pushes the <ref> from the source repository to the destination repository under the same name. So, just remove the parentheses. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 22:27:03 UTC |
| 98347fe | Anders Melchiorsen | 18 January 2009, 14:36:55 UTC | Documentation: git push repository can also be a remote This is copied from pull-fetch-param.txt and helps the reader to not get stuck in the URL section. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 22:27:02 UTC |
| 9d3043c | Junio C Hamano | 18 January 2009, 07:04:35 UTC | Update draft release notes for 1.6.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 07:04:35 UTC |
| 78f111e | Junio C Hamano | 18 January 2009, 06:39:49 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: builtin-fsck: fix off by one head count Documentation: let asciidoc align related options githooks.txt: add missing word builtin-commit.c: do not remove COMMIT_EDITMSG | 18 January 2009, 06:39:49 UTC |
| 3aed2fd | Christian Couder | 18 January 2009, 03:46:09 UTC | builtin-fsck: fix off by one head count According to the man page, if "git fsck" is passed one or more heads, it should verify connectivity and validity of only objects reachable from the heads it is passed. However, since 5ac0a20 (Make builtin-fsck.c use parse_options., 2007-10-15) the command behaved as if no heads were passed, when given only one argument. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 06:37:41 UTC |
| 8ee09ac | Johannes Schindelin | 17 January 2009, 15:41:41 UTC | t5540: clarify that http-push does not handle packed-refs on the remote Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 02:20:00 UTC |
| 466ddf9 | Johannes Schindelin | 17 January 2009, 15:11:51 UTC | http-push: when making directories, have a trailing slash in the path name The function lock_remote() sends MKCOL requests to make leading directories; However, if it does not put a forward slash '/' at the end of the path, the server sends a 301 redirect. By leaving the '/' in place, we can avoid this additional step. Incidentally, at least one version of Curl (7.16.3) does not resend credentials when it follows a 301 redirect, so this commit also fixes a bug. Original patch by Tay Ray Chuan <rctay89@gmail.com>. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 02:19:46 UTC |
| 2064280 | Johannes Schindelin | 17 January 2009, 15:36:26 UTC | http-push: fix off-by-path_len When getting the result of remote_ls(), we were advancing the variable "path" to the relative path inside the repository. However, then we went on to malloc a bogus amount of memory: we were subtracting the prefix length _again_, quite possibly getting something negative, which xmalloc() interprets as really, really much. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 02:19:35 UTC |
| bf474e2 | Markus Heidelberg | 16 January 2009, 21:42:33 UTC | Documentation: let asciidoc align related options Command line options can share the same paragraph of description, if they are related or synonymous. In these cases they should be written among each other, so that asciidoc can format them itself. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 02:01:46 UTC |
| 9968696 | Stephan Beyer | 16 January 2009, 20:36:06 UTC | githooks.txt: add missing word Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 01:57:41 UTC |
| 2454ac7 | Stephan Beyer | 16 January 2009, 19:40:05 UTC | builtin-commit.c: do not remove COMMIT_EDITMSG git-commit tries to remove the file ./COMMIT_EDITMSG instead of $GIT_DIR/COMMIT_EDITMSG after commit preparation (e.g. running hooks, launching editor). This behavior exists since f5bbc3225c4b07 "Port git commit to C". Some test cases (e.g. t/t7502-commit.sh) rely on the existence of $GIT_DIR/COMMIT_EDITMSG after committing and, I guess, many people are used to it. So it is best not to remove it. This patch just removes the removal of COMMIT_EDITMSG. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 01:57:35 UTC |
| ebb7bbf | Junio C Hamano | 15 January 2009, 22:33:54 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: t3404: Add test case for auto-amending only edited commits after "edit" t3404: Add test case for aborted --continue after "edit" t3501: check that commits are actually done | 15 January 2009, 22:33:54 UTC |
| f8aa1b6 | Stephan Beyer | 15 January 2009, 12:56:16 UTC | t3404: Add test case for auto-amending only edited commits after "edit" Add a test case for the bugfix introduced by commit c14c3c82d "git-rebase--interactive: auto amend only edited commit". Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2009, 22:22:53 UTC |
| dc7f55c | Stephan Beyer | 15 January 2009, 12:56:15 UTC | t3404: Add test case for aborted --continue after "edit" Add a test case for the bugfix introduced by commit 8beb1f33d "git-rebase-interactive: do not squash commits on abort". Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2009, 22:22:42 UTC |
| 944019c | Stephan Beyer | 15 January 2009, 13:03:17 UTC | t3501: check that commits are actually done The basic idea of t3501 is to check whether revert and cherry-pick works on renamed files. But as there is no pure cherry-pick/revert test, it is good to also check if commits are actually done in that scenario. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2009, 22:22:12 UTC |
| eb475bf | Junio C Hamano | 15 January 2009, 06:43:04 UTC | Update draft release notes to 1.6.1.1 | 15 January 2009, 06:43:04 UTC |
| 914186a | Junio C Hamano | 15 January 2009, 06:34:05 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: fix handling of multiple untracked files for git mv -k add test cases for "git mv -k" | 15 January 2009, 06:34:05 UTC |
| 8dca683 | Miklos Vajna | 15 January 2009, 00:33:19 UTC | Make t3411 executable Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2009, 01:00:00 UTC |
| be17262 | Michael J Gruber | 14 January 2009, 17:03:22 UTC | fix handling of multiple untracked files for git mv -k The "-k" option to "git mv" should allow specifying multiple untracked files. Currently, multiple untracked files raise an assertion if they appear consecutively as arguments. Fix this by decrementing the loop index after removing one entry from the array of arguments. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2009, 17:34:22 UTC |
| 3772923 | Michael J Gruber | 14 January 2009, 17:03:21 UTC | add test cases for "git mv -k" Add test cases for ignoring nonexisting and untracked files using the -k option to "git mv". There is one known breakage related to multiple untracked files specfied as consecutive arguments. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2009, 17:29:24 UTC |
| 4f8b899 | Junio C Hamano | 14 January 2009, 07:10:50 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: fast-import: Cleanup mode setting. Git.pm: call Error::Simple() properly | 14 January 2009, 07:10:50 UTC |
| 3d1d81e | Felipe Contreras | 14 January 2009, 01:37:07 UTC | fast-import: Cleanup mode setting. "S_IFREG | mode" makes only sense for 0644 and 0755. Even though doing (S_IFREG | mode) may not hurt when mode is any other supported value, that is only true because S_IFREG mode bit happens to be already on for S_IFLNK or S_IFGITLINK. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2009, 06:57:12 UTC |
| 8faea4f | Jay Soffian | 13 January 2009, 22:41:35 UTC | Git.pm: call Error::Simple() properly The error message to Error::Simple() must be passed as a single argument. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2009, 06:52:35 UTC |
| 885a1ff | Junio C Hamano | 13 January 2009, 09:15:49 UTC | Merge branch 'kk/maint-http-push' into maint * kk/maint-http-push: http-push: support full URI in handle_remote_ls_ctx() | 13 January 2009, 09:15:49 UTC |
| 94468bc | Junio C Hamano | 13 January 2009, 09:15:19 UTC | Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint * js/maint-merge-recursive-r-d-conflict: merge-recursive: mark rename/delete conflict as unmerged | 13 January 2009, 09:15:19 UTC |
| 9e8f6e7 | Junio C Hamano | 13 January 2009, 09:13:56 UTC | Merge branch 'cb/maint-merge-recursive-fix' into maint * cb/maint-merge-recursive-fix: merge-recursive: do not clobber untracked working tree garbage modify/delete conflict resolution overwrites untracked file Conflicts: builtin-merge-recursive.c | 13 January 2009, 09:13:56 UTC |
| ae5a97f | Junio C Hamano | 13 January 2009, 08:56:40 UTC | Merge branch 'ap/maint-apply-modefix' into maint * ap/maint-apply-modefix: builtin-apply: prevent non-explicit permission changes | 13 January 2009, 08:56:40 UTC |
| 1cbe69f | Junio C Hamano | 13 January 2009, 08:40:19 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: Avoid spurious error messages on error mistakes. contrib/examples/README: give an explanation of the status of these files | 13 January 2009, 08:40:19 UTC |
| 12dd111 | Pierre Habouzit | 12 January 2009, 23:09:36 UTC | Avoid spurious error messages on error mistakes. Prior to that, if the user chose "squash" as a first action, the stderr looked like: grep: /home/madcoder/dev/scm/git/.git/rebase-merge/done: No such file or directory Cannot 'squash' without a previous commit Now the first line is gone. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2009, 08:21:31 UTC |
| 47a845b | jidanni@jidanni.org | 13 January 2009, 01:19:42 UTC | contrib/examples/README: give an explanation of the status of these files We attempt to give an explanation of the status of the files in this directory. Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2009, 01:47:36 UTC |
| 9800a75 | Junio C Hamano | 12 January 2009, 23:18:02 UTC | Teach format-patch to handle output directory relative to cwd Without any explicit -o parameter, we correctly avoided putting the resulting patch output to the toplevel. We should do the same when the user gave a relative pathname to be consistent with this case. Noticed by Cesar Eduardo Barros. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2009, 01:00:54 UTC |
| 9279bf3 | Junio C Hamano | 12 January 2009, 07:27:29 UTC | Merge branch 'mh/maint-sendmail-cc-doc' into maint * mh/maint-sendmail-cc-doc: doc/git-send-email: mention sendemail.cc config variable | 12 January 2009, 07:27:29 UTC |
| 687004b | Junio C Hamano | 12 January 2009, 07:24:42 UTC | Merge branch 'jc/maint-do-not-switch-to-non-commit' into maint * jc/maint-do-not-switch-to-non-commit: git checkout: do not allow switching to a tree-ish that is not a commit | 12 January 2009, 07:24:42 UTC |
| 4fc988e | jidanni@jidanni.org | 12 January 2009, 03:05:54 UTC | Documentation/git-push.txt: minor: compress one option Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2009, 05:47:26 UTC |
| 68c2ec7 | Junio C Hamano | 10 January 2009, 20:41:33 UTC | format-patch: show patch text for the root commit Even without --root specified, if the range given on the command line happens to include a root commit, we should include its patch text in the output. This fix deliberately ignores log.showroot configuration variable because "format-patch" and "log -p" can and should behave differently in this case, as the former is about exporting a part of your history in a form that is replayable elsewhere and just giving the commit log message without the patch text does not make any sense for that purpose. Noticed and fix originally attempted by Nathan W. Panike; credit goes to Alexander Potashev for injecting sanity to my initial (broken) fix that used the value from log.showroot configuration, which was misguided. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2009, 01:40:57 UTC |
| 38920dd | Markus Heidelberg | 08 January 2009, 18:53:05 UTC | git-status -v: color diff output when color.ui is set When using "git status -v", the diff output wasn't colored, even though color.ui was set. Only when setting color.diff it worked. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2009, 01:32:19 UTC |
| 3f4b609 | Markus Heidelberg | 08 January 2009, 18:53:01 UTC | git-commit: color status output when color.ui is set When using "git commit" and there was nothing to commit (the editor wasn't launched), the status output wasn't colored, even though color.ui was set. Only when setting color.status it worked. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2009, 01:30:43 UTC |
| a324fc4 | Thomas Rast | 07 January 2009, 11:15:30 UTC | diff --no-index -q: fix endless loop We forgot to move to the next argument when parsing -q, getting stuck in an endless loop. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2009, 20:04:38 UTC |
| c6dbca0 | Thomas Rast | 06 January 2009, 23:56:03 UTC | diff --no-index: test for pager after option parsing We need to parse options before we can see if --exit-code was provided. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2009, 07:40:02 UTC |
| e423ffd | Thomas Rast | 06 January 2009, 18:53:32 UTC | diff: accept -- when using --no-index Accept -- as an "end of options" marker even when using --no-index. Previously, the -- triggered a "normal" index/tree diff and subsequently failed because of the unrecognized (in that mode) --no-index. Note that the second loop can treat '--' as a normal option, because the preceding checks ensure it is the third-to-last argument. While at it, fix the parsing of "-q" option in --no-index mode as well. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2009, 07:18:20 UTC |
| 152d70f | Junio C Hamano | 07 January 2009, 06:12:35 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: README: tutorial.txt is now called gittutorial.txt | 07 January 2009, 06:12:35 UTC |
| 141201d | Junio C Hamano | 07 January 2009, 06:12:30 UTC | Merge branch 'maint-1.5.6' into maint-1.6.0 * maint-1.5.6: README: tutorial.txt is now called gittutorial.txt | 07 January 2009, 06:12:30 UTC |
| 8a124b8 | Joey Hess | 07 January 2009, 04:23:37 UTC | README: tutorial.txt is now called gittutorial.txt Signed-off-by: Joey Hess <joey@gnu.kitenet.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2009, 06:12:07 UTC |
| cec0871 | René Scharfe | 06 January 2009, 20:41:06 UTC | shortlog: handle multi-line subjects like log --pretty=oneline et. al. do The commit message parser of git shortlog used to treat only the first non-empty line of the commit message as the subject. Other log commands (e.g. --pretty=oneline) show the whole first paragraph instead (unwrapped into a single line). For consistency, this patch borrows format_subject() from pretty.c to make shortlog do the same. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2009, 06:06:07 UTC |
| 50a4b35 | Paul Jarc | 05 January 2009, 02:27:41 UTC | configure clobbers LDFLAGS In a couple of tests, configure clobbers the LDFLAGS value set by the caller. This patch fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2009, 03:46:19 UTC |
| 7b9e3ce | Clemens Buchacher | 01 January 2009, 20:54:33 UTC | unpack-trees: remove redundant path search in verify_absent Since the only caller, verify_absent, relies on the fact that o->pos points to the next index entry anyways, there is no need to recompute its position. Furthermore, if a nondirectory entry were found, this would return too early, because there could still be an untracked directory in the way. This is currently not a problem, because verify_absent is only called if the index does not have this entry. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 20:48:43 UTC |
| 837e5fe | Clemens Buchacher | 01 January 2009, 20:54:32 UTC | unpack-trees: fix path search bug in verify_absent Commit 0cf73755 (unpack-trees.c: assume submodules are clean during check-out) changed an argument to verify_absent from 'path' to 'ce', which is however shadowed by a local variable of the same name. The bug triggers if verify_absent is used on a tree entry, for which the index contains one or more subsequent directories of the same length. The affected subdirectories are removed from the index. The testcase included in this commit bisects to 55218834 (checkout: do not lose staged removal), which reveals the bug in this case, but is otherwise unrelated. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 20:46:35 UTC |
| 6b9315d | Clemens Buchacher | 01 January 2009, 20:54:31 UTC | unpack-trees: handle failure in verify_absent Commit 203a2fe1 (Allow callers of unpack_trees() to handle failure) changed the "die on error" behavior to "return failure code". verify_absent did not handle errors returned by verify_clean_subdirectory, however. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 20:45:38 UTC |
| 0ddd93b | Henrik Austad | 05 January 2009, 15:25:37 UTC | Be consistent in switch usage for tar tar handles switches with and witout preceding '-', but the documentation should be consistent nonetheless. Signed-off-by: Henrik Austad <henrik@austad.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 20:04:23 UTC |
| c7719fb | Henrik Austad | 05 January 2009, 15:25:36 UTC | Use capitalized names where appropriate The Linux kernel and Emacs are both spelled capitalized Signed-off-by: Henrik Austad <henrik@austad.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 20:04:02 UTC |
| dd6c136 | Marcel M. Cary | 30 December 2008, 15:10:24 UTC | git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X On Mac OS X and possibly BSDs, /bin/pwd reads PWD from the environment if available and shows the logical path by default rather than the physical one. Unset PWD before running /bin/pwd in both cd_to_toplevel and its test. Still use the external /bin/pwd because in my Bash on Linux, the builtin pwd prints the same result whether or not PWD is set. Signed-off-by: Marcel M. Cary <marcel@oak.homeunix.org> Tested-by: Wincent Colaiuta <win@wincent.com> (on Mac OS X 10.5.5) Tested-by: Marcel Koeppen <git-dev@marzelpan.de> (on Mac OS X 10.5.6) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 19:46:58 UTC |
| 2ce53f9 | Johannes Schindelin | 02 January 2009, 18:08:40 UTC | git add: do not add files from a submodule It comes quite as a surprise to an unsuspecting Git user that calling "git add submodule/file" (which is a mistake, alright) _removes_ the submodule in the index, and adds the file. Instead, complain loudly. While at it, be nice when the user said "git add submodule/" which is most likely the consequence of tab-completion, and stage the submodule, instead of trying to add the contents of that directory. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2009, 18:48:32 UTC |
| 22b3ddd | Johannes Schindelin | 02 January 2009, 18:08:00 UTC | bisect view: call gitk if Cygwin's SESSIONNAME variable is set It seems that Cygwin sets the variable SESSIONNAME when an interactive desktop session is running, and does not set it when you log in via ssh. So we can use this variable to determine whether to run gitk or git log in git bisect view. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2009, 22:25:27 UTC |
| dcfdbdf | Miklos Vajna | 03 January 2009, 03:59:12 UTC | fast-export: print usage when no options specified Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2009, 22:24:15 UTC |
| 3442ea4 | Junio C Hamano | 03 January 2009, 12:07:32 UTC | git checkout: do not allow switching to a tree-ish that is not a commit "git checkout -b newbranch $commit^{tree}" mistakenly created a new branch rooted at the current HEAD, because in that case, the two structure fields used to see if the command was invoked without any argument (hence it needs to default to checking out the HEAD) were populated incorrectly. Upon seeing a command line argument that we took as a rev, we should store that string in new.name, even if that does not name a commit. This will correctly trigger the existing safety logic. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Daniel Barkalow <barkalow@iabervon.org> | 03 January 2009, 21:34:19 UTC |
| 1f7903a | Junio C Hamano | 02 January 2009, 10:55:37 UTC | builtin-apply: prevent non-explicit permission changes A git patch that does not change the executable bit records the mode bits on its "index" line. "git apply" used to interpret this mode exactly the same way as it interprets the mode recorded on "new mode" line, as the wish by the patch submitter to set the mode to the one recorded on the line. The reason the mode does not agree between the submitter and the receiver in the first place is because there is _another_ commit that only appears on one side but not the other since their histories diverged, and that commit changes the mode. The patch has "index" line but not "new mode" line because its change is about updating the contents without affecting the mode. The application of such a patch is an explicit wish by the submitter to only cherry-pick the commit that updates the contents without cherry-picking the commit that modifies the mode. Viewed this way, the current behaviour is problematic, even though the command does warn when the mode of the path being patched does not match this mode, and a careful user could detect this inconsistencies between the patch submitter and the patch receiver. This changes the semantics of the mode recorded on the "index" line; instead of interpreting it as the submitter's wish to set the mode to the recorded value, it merely informs what the mode submitter happened to have, and the presense of the "index" line is taken as submitter's wish to keep whatever the mode is on the receiving end. This is based on the patch originally done by Alexander Potashev with a minor fix; the tests are mine. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2009, 21:24:12 UTC |
| 11b8a41 | Philippe Bruhat (BooK) | 29 December 2008, 00:25:00 UTC | Git.pm: correctly handle directory name that evaluates to "false" The repository constructor mistakenly rewrote a Directory parameter that Perl happens to evaluate to false (e.g. "0") to ".". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2009, 14:34:58 UTC |
| d99bf51 | jidanni@jidanni.org | 27 December 2008, 19:49:03 UTC | Documentation/git-tag.txt: minor typo and grammar fix Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2009, 13:33:35 UTC |
| 8e8daf3 | Nicolas Pitre | 30 December 2008, 19:45:11 UTC | objects to be pruned immediately don't have to be loosened When there is no grace period before pruning unreferenced objects, it is pointless to push those objects in their loose form just to delete them right away. Also be more explicit about the possibility of using "now" in the gc.pruneexpire config variable (needed for the above behavior to happen). Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2009, 12:51:51 UTC |
| e1a5977 | Nanako Shiraishi | 31 December 2008, 10:00:50 UTC | Document git-ls-tree --full-tree Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2009, 12:43:23 UTC |
| 936b705 | Junio C Hamano | 29 December 2008, 09:17:34 UTC | Prepare for v1.6.1.1 maintenance release Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2008, 09:17:34 UTC |
| a9e67c8 | jidanni@jidanni.org | 29 December 2008, 07:03:17 UTC | Documentation/diff-options.txt: unify options Instead of listing short option (e.g. "-U<n>") as a shorthand for its longer counterpart (e.g. "--unified=<n>"), list the synonyms together. It saves one indirection to find what the reader wants. Signed-off-by: jidanni <jidanni@jidanni.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2008, 09:08:02 UTC |
| bd7c6e7 | Markus Heidelberg | 28 December 2008, 23:37:25 UTC | doc/git-send-email: mention sendemail.cc config variable This variable was added in 5f8b9fc (git-send-email: add a new sendemail.cc configuration variable, 2008-04-27), but is not yet refered to by the documentation. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2008, 09:06:11 UTC |
| fb3bb3d | Devin Doucette | 27 December 2008, 09:39:31 UTC | gitweb: Fix export check in git_get_projects_list When $filter was empty, the path passed to check_export_ok would contain an extra '/', which some implementations of export_auth_hook are sensitive to. It makes more sense to fix this here than to handle the special case in each implementation of export_auth_hook. Signed-off-by: Devin Doucette <devin@doucette.cc> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2008, 06:34:03 UTC |
| 57d4346 | Nguyễn Thái Ngọc Duy | 27 December 2008, 08:21:03 UTC | grep: grep cache entries if they are "assume unchanged" "Assume unchanged" bit means "please pretend that I have never touched this file", so if user removes the file, we should not care. This patch teaches "git grep" to use cache version in such situations. External grep case has not been fixed yet. But given that on the platform that CE_VALID bit may be used like Windows, external grep is not available anyway, I would wait for people to raise their hands before touching it. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 22:30:46 UTC |
| e70b9a8 | Nguyễn Thái Ngọc Duy | 27 December 2008, 08:21:04 UTC | grep: support --no-ext-grep to test builtin grep Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2008, 22:30:41 UTC |
| a9012e3 | Junio C Hamano | 27 December 2008, 22:22:37 UTC | Merge branch 'rs/maint-tformat-foldline' into maint * rs/maint-tformat-foldline: pretty: support multiline subjects with format: pretty: factor out format_subject() pretty: factor out skip_empty_lines() | 27 December 2008, 22:22:37 UTC |
| f611c8c | Junio C Hamano | 27 December 2008, 22:21:24 UTC | Merge branch 'rs/maint-retval-fix' into maint * rs/maint-retval-fix: merge-file: handle freopen() failure daemon: cleanup: factor out xstrdup_tolower() daemon: cleanup: replace loop with if daemon: handle freopen() failure | 27 December 2008, 22:21:24 UTC |
| fcd3549 | Junio C Hamano | 27 December 2008, 22:21:15 UTC | Merge branch 'sp/maint-describe-all-tag-warning' into maint * sp/maint-describe-all-tag-warning: describe: Avoid unnecessary warning when using --all | 27 December 2008, 22:21:15 UTC |
