| b59122f | Junio C Hamano | 07 February 2009, 08:51:47 UTC | GIT 1.6.1.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 February 2009, 08:51:47 UTC |
| 919ab64 | Junio C Hamano | 06 February 2009, 03:38:58 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: Fixed broken git help -w when installing from RPM | 06 February 2009, 03:38:58 UTC |
| c789350 | Junio C Hamano | 06 February 2009, 02:06:11 UTC | Merge branch 'jc/maint-apply-fix' into maint * jc/maint-apply-fix: builtin-apply.c: do not set bogus mode in check_preimage() for deleted path | 06 February 2009, 02:06:11 UTC |
| 7b26171 | Junio C Hamano | 06 February 2009, 02:06:03 UTC | Merge branch 'am/maint-push-doc' into maint * am/maint-push-doc: Documentation: rework src/dst description in git push Documentation: more git push examples Documentation: simplify refspec format description | 06 February 2009, 02:06:03 UTC |
| f20408d | Junio C Hamano | 06 February 2009, 02:05:43 UTC | Merge branch 'sg/maint-gitdir-in-subdir' into maint * sg/maint-gitdir-in-subdir: Fix gitdir detection when in subdir of gitdir | 06 February 2009, 02:05:43 UTC |
| 141b6b8 | Junio C Hamano | 06 February 2009, 02:01:00 UTC | Merge branch 'lt/maint-wrap-zlib' into maint * lt/maint-wrap-zlib: Wrap inflate and other zlib routines for better error reporting Conflicts: http-push.c http-walker.c sha1_file.c | 06 February 2009, 02:01:00 UTC |
| cc91e1b | Junio C Hamano | 06 February 2009, 01:54:17 UTC | Merge branch 'jc/maint-split-diff-metainfo' into maint * jc/maint-split-diff-metainfo: diff.c: output correct index lines for a split diff | 06 February 2009, 01:54:17 UTC |
| 8abc618 | Junio C Hamano | 06 February 2009, 01:54:12 UTC | Merge branch 'js/maint-all-implies-HEAD' into maint * js/maint-all-implies-HEAD: bundle: allow the same ref to be given more than once revision walker: include a detached HEAD in --all | 06 February 2009, 01:54:12 UTC |
| 8c4c286 | Junio C Hamano | 06 February 2009, 01:52:22 UTC | Merge branch 'kc/maint-diff-bwi-fix' into maint * kc/maint-diff-bwi-fix: Fix combined use of whitespace ignore options to diff test more combinations of ignore-whitespace options to diff | 06 February 2009, 01:52:22 UTC |
| ab2fdb3 | David J. Mellor | 05 February 2009, 04:14:29 UTC | Fixed broken git help -w when installing from RPM After the git-core package was renamed to git, git help -w was still looking for files in /usr/share/doc/git-core-$VERSION instead of /usr/share/doc/git-$VERSION. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2009, 06:00:49 UTC |
| f26b5dc | Stefan Naewe | 04 February 2009, 20:49:35 UTC | urls.txt: document optional port specification in git URLS Signed-off-by: Stefan Naewe <stefan.naewe+git@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 21:06:06 UTC |
| 745bc77 | Junio C Hamano | 04 February 2009, 19:49:07 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: builtin-mv.c: check for unversionned files before looking at the destination. Add a testcase for "git mv -f" on untracked files. Missing && in t/t7001.sh. | 04 February 2009, 19:49:07 UTC |
| 5aed3c6 | Matthieu Moy | 04 February 2009, 09:32:08 UTC | builtin-mv.c: check for unversionned files before looking at the destination. The previous code was failing in the case where one moves an unversionned file to an existing destination, with mv -f: the "existing destination" was checked first, and the error was cancelled by the force flag. We now check the unrecoverable error first, which fixes the bug. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 19:07:42 UTC |
| c8ba6b1 | Matthieu Moy | 04 February 2009, 09:32:07 UTC | Add a testcase for "git mv -f" on untracked files. This currently fails with: git: builtin-mv.c:217: cmd_mv: Assertion `pos >= 0' failed. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 19:04:56 UTC |
| 720ec6b | Matthieu Moy | 04 February 2009, 09:32:06 UTC | Missing && in t/t7001.sh. Without this, the exit status is only the one of the last line. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 19:04:44 UTC |
| f081731 | Junio C Hamano | 04 February 2009, 07:50:09 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: User-manual: "git stash <comment>" form is long gone add test-dump-cache-tree in Makefile fix typo in Documentation apply: fix access to an uninitialized mode variable, found by valgrind | 04 February 2009, 07:50:09 UTC |
| 7a85f6a | William Pursell | 03 February 2009, 22:41:14 UTC | User-manual: "git stash <comment>" form is long gone These days you must explicitly say "git stash save <comment>". Signed-off-by: William Pursell <bill.pursell@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:13:47 UTC |
| 37fc57a | Guanqun Lu | 04 February 2009, 21:00:41 UTC | add test-dump-cache-tree in Makefile 5c5ba73 (Makefile: Use generic rule to build test programs, 2007-05-31) tried to use generic rule to build test programs, but it misses the file 'dump-cache-tree.c', since its name is not prefixed by 'test-'. This commit solves this little problem by renaming this file instead of carrying out an explicit rule in Makefile. Signed-off-by: Guanqun Lu <guanqun.lu@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:11:44 UTC |
| c9a8abc | Guanqun Lu | 04 February 2009, 21:00:40 UTC | fix typo in Documentation Signed-off-by: Guanqun Lu <guanqun.lu@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:09:03 UTC |
| e1e4389 | Johannes Schindelin | 04 February 2009, 01:50:15 UTC | apply: fix access to an uninitialized mode variable, found by valgrind When 'tpatch' was initialized successfully, st_mode was already taken from the previous diff. We should not try to override it with data from an lstat() that was never called. This is a companion patch to 7a07841(git-apply: handle a patch that touches the same path more than once better). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2009, 06:04:31 UTC |
| 2819075 | Junio C Hamano | 03 February 2009, 08:32:29 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: grep: pass -I (ignore binary) down to external grep | 03 February 2009, 08:32:29 UTC |
| bc39564 | Junio C Hamano | 02 February 2009, 18:58:20 UTC | grep: pass -I (ignore binary) down to external grep We forgot to pass this option to the external grep process. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2009, 18:58:20 UTC |
| 6ac9229 | Junio C Hamano | 01 February 2009, 01:42:17 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: merge: fix out-of-bounds memory access | 01 February 2009, 01:42:17 UTC |
| c7cddc1 | René Scharfe | 31 January 2009, 14:39:10 UTC | merge: fix out-of-bounds memory access The parameter n of unpack_callback() can have a value of up to MAX_UNPACK_TREES. The check at the top of unpack_trees() (its only (indirect) caller) makes sure it cannot exceed this limit. unpack_callback() passes it and the array src to unpack_nondirectories(), which has this loop: for (i = 0; i < n; i++) { /* ... */ src[i + o->merge] = o->df_conflict_entry; o->merge can be 0 or 1, so unpack_nondirectories() potentially accesses the array src at index MAX_UNPACK_TREES. This patch makes it big enough. Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2009, 18:39:55 UTC |
| 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 |
| a15080e | Junio C Hamano | 26 January 2009, 07:41:26 UTC | builtin-apply.c: do not set bogus mode in check_preimage() for deleted path If it is deleted, it is deleted. Do not set the current mode to it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2009, 00:28:15 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 |
| 90b23e5 | Junio C Hamano | 27 January 2009, 09:08:02 UTC | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-metainfo This is an evil merge, as a test added since 1.6.0 expects an incorrect behaviour the merged commit fixes. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2009, 09:08:02 UTC |
| b67b961 | Junio C Hamano | 26 January 2009, 08:08:24 UTC | diff.c: output correct index lines for a split diff A patch that changes the filetype (e.g. regular file to symlink) of a path must be split into a deletion event followed by a creation event, which means that we need to have two independent metainfo lines for each. However, the code reused the single set of metainfo lines. As the blob object names recorded on the index lines are usually not used nor validated on the receiving end, this is not an issue with normal use of the resulting patch. However, when accepting a binary patch to delete a blob, git-apply verified that the postimage blob object name on the index line is 0{40}, hence a patch that deletes a regular file blob that records binary contents to create a blob with different filetype (e.g. a symbolic link) failed to apply. "git am -3" also uses the blob object names recorded on the index line, so it would also misbehave when synthesizing a preimage tree. This moves the code to generate metainfo lines around, so that two independent sets of metainfo lines are used for the split halves. Additional tests by Jeff King. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2009, 08:48:00 UTC |
| 8039184 | Anders Melchiorsen | 25 January 2009, 23:45:33 UTC | Documentation: rework src/dst description in git push This tries to make the description of ref matching in git push easier to read. Beauty is in the eye of the beholder, though. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2009, 06:26:43 UTC |
| 1750783 | Anders Melchiorsen | 25 January 2009, 23:45:32 UTC | Documentation: more git push examples Include examples of using HEAD. The order of examples introduces new concepts one by one. This pushes the example of deleting a ref to the end of the list. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2009, 06:25:44 UTC |
| 7a0d911 | Junio C Hamano | 26 January 2009, 06:25:20 UTC | Documentation: simplify refspec format description The refspec format description was a mix of regexp and BNF, making it very difficult to read. The format was also wrong: it did not show that each part of a refspec is optional in different situations. Rather than having a confusing grammar, just present the format in informal prose. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2009, 06:25:20 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 |
| 6d12ace | Keith Cascio | 19 January 2009, 18:03:04 UTC | Fix combined use of whitespace ignore options to diff The code used to misbehave when options to ignore certain whitespaces (-w -b and --ignore-at-eol) were combined. Signed-off-by: Keith Cascio <keith@cs.ucla.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 January 2009, 05:21:58 UTC |
| 537a071 | Keith Cascio | 15 January 2009, 00:48:24 UTC | test more combinations of ignore-whitespace options to diff There are three flags involved (-w -b and --ignore-space-at-eol) which makes 8 combinations possible in total, but only 3 cases are tested (none, -w alone and -b alone). This adds the other 5 cases. Signed-off-by: Keith Cascio <keith@cs.ucla.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 January 2009, 05:17:38 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 |
| b2a6d1c | Junio C Hamano | 18 January 2009, 06:27:08 UTC | bundle: allow the same ref to be given more than once "git bundle create x master master" used to create a bundle that lists the same branch (master) twice. Cloning from such a bundle resulted in a needless warning "warning: Duplicated ref: refs/remotes/origin/master". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 07:00:31 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 |
| f0298cf | Johannes Schindelin | 16 January 2009, 12:52:53 UTC | revision walker: include a detached HEAD in --all When HEAD is detached, --all should list it, too, logically, as a detached HEAD is by definition a temporary, unnamed branch. It is especially necessary to list it when garbage collecting, as the detached HEAD would be trashed. Noticed by Thomas Rast. Note that this affects creating bundles with --all; I contend that it is a good change to add the HEAD, so that cloning from such a bundle will give you a current branch. However, I had to fix t5701 as it assumed that --all does not imply HEAD. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 06:01:37 UTC |
| 72183cb | SZEDER Gábor | 16 January 2009, 15:37:33 UTC | Fix gitdir detection when in subdir of gitdir If the current working directory is a subdirectory of the gitdir (e.g. <repo>/.git/refs/), then setup_git_directory_gently() will climb its parent directories until it finds itself in a gitdir. However, no matter how many parent directories it climbs, it sets 'GIT_DIR_ENVIRONMENT' to ".", which is obviously wrong. This behaviour affected at least 'git rev-parse --git-dir' and hence caused some errors in bash completion (e.g. customized command prompt when on a detached head and completion of refs). To fix this, we set the absolute path of the found gitdir instead. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2009, 05:46:50 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 |
