| 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 |
| 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 |
| 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 |
| bdfd739 | John Tapsell | 04 March 2009, 15:00:44 UTC | Make the 'lock file' exists error more informative It looks like someone did 90% of the work, then forgot to actually use the function in one place. Also the helper function did not use the correct variable. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2009, 04:35:19 UTC |
| f243319 | Junio C Hamano | 04 March 2009, 08:37:50 UTC | Beginning of 1.6.2 maintenance track Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2009, 08:37:50 UTC |
| a95148d | Junio C Hamano | 04 March 2009, 07:02:16 UTC | GIT 1.6.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2009, 07:37:19 UTC |
| db75ada | Michael J Gruber | 03 March 2009, 15:08:21 UTC | git submodule: Fix adding of submodules at paths with ./, .. and // Make 'git submodule add' normalize the submodule path in the same way as 'git ls-files' does, so that 'git submodule init' looks up the information in .gitmodules with the same key under which 'git submodule add' stores it. This fixes 4 known breakages. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2009, 05:46:09 UTC |
| ac8463d | Michael J Gruber | 03 March 2009, 15:08:20 UTC | git submodule: Add test cases for git submodule add Add simple test cases for adding and initialising submodules. The init step is necessary in order to verify the added information. The second test exposes a known breakage due to './' in the path: git ls-files simplifies the path but git add does not, which leads to git init looking for different lines in .gitmodules than git add adds. The other tests add test cases for '//' and '..' in the path which currently fail for the same reason. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2009, 05:46:09 UTC |
| a1070d4 | Mike Ralphson | 03 March 2009, 19:29:22 UTC | Documentation: Typo / spelling / formatting fixes Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2009, 05:43:19 UTC |
| 5a4aaaf | Mike Ralphson | 03 March 2009, 19:29:21 UTC | Documentation: Expand a couple of abbreviations These may not be obvious to non-native English speakers Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2009, 05:42:44 UTC |
| c0bc2ee | Mike Ralphson | 03 March 2009, 19:29:20 UTC | Documentation: Typos / spelling fixes in RelNotes Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2009, 05:40:36 UTC |
| 8d1b9d2 | Roy Lee | 03 March 2009, 16:49:29 UTC | Documentation/git-archive.txt: Note attributes Signed-off-by: Roy Lee <roylee17@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2009, 04:16:49 UTC |
| 3e0c4ff | Thomas Rast | 01 March 2009, 22:45:41 UTC | send-email: respect in-reply-to regardless of threading git-send-email supports the --in-reply-to option even with --no-thread. However, the code that adds the relevant mail headers was guarded by a test for --thread. Remove the test, so that the user's choice is respected. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2009, 07:15:47 UTC |
| 56384e6 | René Scharfe | 02 March 2009, 23:19:30 UTC | optimize compat/ memmem() When memmem() was imported from glibc 2.2 into compat/, an optimization was dropped in the process, in order to make the code smaller and simpler. It was OK because memmem() wasn't used in performance-critical code. Now the situation has changed and we can benefit from this optimization. The trick is to avoid calling memcmp() if the first character of the needle already doesn't match. Checking one character directly is much cheaper than the function call overhead. We keep the first character of the needle in the variable named point and the rest in the one named tail. The following commands were run in a Linux kernel repository and timed, the best of five results is shown: $ STRING='Ensure that the real time constraints are schedulable.' $ git log -S"$STRING" HEAD -- kernel/sched.c >/dev/null On Windows Vista x64, before: real 0m8.470s user 0m0.000s sys 0m0.000s And after the patch: real 0m1.887s user 0m0.000s sys 0m0.000s Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2009, 02:28:06 UTC |
| ce163c7 | René Scharfe | 02 March 2009, 23:00:55 UTC | diffcore-pickaxe: use memmem() Use memmem() instead of open-coding it. The system libraries usually have a much faster version than the memcmp()-loop here. Even our own fall-back in compat/, which is used on Windows, is slightly faster. The following commands were run in a Linux kernel repository and timed, the best of five results is shown: $ STRING='Ensure that the real time constraints are schedulable.' $ git log -S"$STRING" HEAD -- kernel/sched.c >/dev/null On Ubuntu 8.10 x64, before (v1.6.2-rc2): 8.09user 0.04system 0:08.14elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+30952minor)pagefaults 0swaps And with the patch: 1.50user 0.04system 0:01.54elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+30645minor)pagefaults 0swaps On Fedora 10 x64, before: 8.34user 0.05system 0:08.39elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+29268minor)pagefaults 0swaps And with the patch: 1.15user 0.05system 0:01.20elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+32253minor)pagefaults 0swaps On Windows Vista x64, before: real 0m9.204s user 0m0.000s sys 0m0.000s And with the patch: real 0m8.470s user 0m0.000s sys 0m0.000s Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2009, 02:28:03 UTC |
| 1d035f8 | David J. Mellor | 02 March 2009, 06:42:44 UTC | Documentation: minor grammatical fixes. The final hunk in this patch corrects what appears to be a typo: of --> or Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2009, 20:34:56 UTC |
| a7d64b5 | David J. Mellor | 02 March 2009, 06:38:36 UTC | Documentation: minor grammatical fixes. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2009, 20:34:54 UTC |
| 07f5746 | David J. Mellor | 02 March 2009, 06:37:41 UTC | Documentation: minor grammatical fixes. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2009, 20:34:53 UTC |
| 2559bff | Johannes Sixt | 01 March 2009, 10:20:03 UTC | t3400-rebase: Move detached HEAD check earlier Short story: There is a section in t3400 that tests fundamental rebase properties. 3ec7371f (Add two extra tests for git rebase, 2009-02-09) added a check that rebase works on a detached HEAD, but the test was put near the end of the file. This moves it to a more suitable place. Long story: The test that preceded the one in question tests that a rebased commit degrades from a content change with mode change to a mere mode change. But on Windows, where we have core.filemode=false, the original commit did not record the mode change, and so the rebase operation did not rebase anything. This caused the subsequent detached HEAD test to fail. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2009, 07:58:41 UTC |
| f8c6288 | Junio C Hamano | 02 March 2009, 06:20:52 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix possible infinite loop and display corruption | 02 March 2009, 06:20:52 UTC |
| 52b8ea9 | Paul Mackerras | 01 March 2009, 22:38:17 UTC | gitk: Fix possible infinite loop and display corruption This fixes an issue reported by Johannes Sixt on the git mailing list: > This recipe sends gitk into an endless loop. In git.git do: > > cd t > # remove chmod a+x A near the end of the file > sed -i 's/chmod/: chmod/' t3400-rebase.sh > sh t3400-rebase.sh --debug > cd trash\ directory.t3400-rebase/ > gitk master modechange modechange@{1} > > > I briefly see the history chart, but the dot that should be modechange@{1} > is missing. One automatically selected commit is shown in the diff section > below. But then the commit list is cleared and gitk goes into an infinite > loop. > > Things work alright if either modechange@{1} is dropped, or the 'chmod' > line is left unchanged, which is a bit strange. > > This is with git version 1.6.1.2.390.gba743 There were actually two problems. This recipe created a situation where git log would output a child commit after its parent. This meant that we called fix_reversal which called splitvarc, which should call modify_arc to note the fact that it has modified the arc that it has just split. It wasn't, which meant that displayorder and other variables got into an inconsistent state (a commit appearing twice in displayorder). This then meant that the targetrow/targetid logic in drawvisible thought it need to redraw each time. That, together with the fact that drawvisible called drawcommits which called drawvisible if a redraw was needed, led to the infinite loop. In fact drawvisible is now the only caller of drawcommits. Thus, the start and end row arguments to drawcommits always encompass the whole visible area, so drawcommits doesn't need to call drawvisible to redraw; it just needs to clear the screen and draw what it's been asked to. This fixes these two problems by adding a call to modify_arc in splitvarc and by taking out the call to drawvisible in drawcommits. It also removes an unrelated left-over debugging puts in external_blame. Signed-off-by: Paul Mackerras <paulus@samba.org> | 01 March 2009, 22:38:17 UTC |
| f474c52 | Junio C Hamano | 01 March 2009, 00:31:02 UTC | Merge branch 'jc/maint-1.6.0-pack-directory' * jc/maint-1.6.0-pack-directory: Fix odb_mkstemp() on AIX | 01 March 2009, 00:31:02 UTC |
| 12ef3d8 | Junio C Hamano | 28 February 2009, 22:39:56 UTC | Merge branch 'maint' * maint: Documentation: minor grammatical fixes. added missing backtick in git-apply.txt | 28 February 2009, 22:39:56 UTC |
| dcc901b | David J. Mellor | 28 February 2009, 21:12:59 UTC | Documentation: minor grammatical fixes. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2009, 22:39:33 UTC |
| 272459a | Elijah Newren | 28 February 2009, 19:56:49 UTC | Ensure proper setup of git_dir for git-hash-object Call setup_git_directory() before git_config() to make sure git_dir is set to the proper value. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2009, 22:09:46 UTC |
| 325e9bc | Junio C Hamano | 28 February 2009, 22:05:09 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: added missing backtick in git-apply.txt | 28 February 2009, 22:05:09 UTC |
| eb006cc | Danijel Tasov | 28 February 2009, 20:03:54 UTC | added missing backtick in git-apply.txt Signed-off-by: Danijel Tasov <dt@korn.shell.la> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2009, 21:10:16 UTC |
| 749485f | Todd Zullinger | 28 February 2009, 18:42:02 UTC | git-rebase: Update --whitespace documentation The parameters accepted by the --whitespace option of "git apply" have changed over time, and the documentation for "git rebase" was out of sync. Remove the specific parameter list from the "git rebase" documentation and simply point to the "git apply" documentation for details, as is already done in the "git am" documentation. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2009, 19:47:25 UTC |
| 736e619 | Ben Walton | 28 February 2009, 03:11:45 UTC | git-svn - return original format_svn_date semantics When %z was removed from the strftime call and subsituted with a local gmt offset calculation, time() was no longer the default for all time functions as it was with the previous localtime(shift). This is now corrected so that format_svn_time behaves as it used to. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2009, 05:53:43 UTC |
| 48679e5 | Eric Wong | 28 February 2009, 03:40:16 UTC | git-svn: disable broken symlink workaround by default Even though this will break things for some extremely rare repositories used by broken Windows clients, it's probably not worth enabling this by default as it has negatively affected many more users than it has helped from what we've seen so far. The extremely rare repositories that have broken symlinks in them will be silently corrupted in import; but users can still reenable this option and restart the import. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2009, 05:53:09 UTC |
| 48fce93 | Junio C Hamano | 28 February 2009, 00:00:33 UTC | Merge branch 'cc/maint-1.6.0-bisect-fix' * cc/maint-1.6.0-bisect-fix: bisect: fix another instance of eval'ed string Conflicts: git-bisect.sh | 28 February 2009, 00:00:33 UTC |
| cce074a | Christian Couder | 27 February 2009, 06:31:22 UTC | bisect: fix another instance of eval'ed string When there is nothing to be skipped, the output from rev-list --bisect-vars was eval'ed without first being strung together with &&; this is probably not a problem as it is much less likely to be a bad input than the list handcrafted by the filter_skip function, but it still is a good discipline. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2009, 22:30:34 UTC |
| 0c34735 | Junio C Hamano | 27 February 2009, 09:03:21 UTC | Merge branch 'cc/maint-1.6.0-bisect-fix' * cc/maint-1.6.0-bisect-fix: bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped Conflicts: git-bisect.sh | 27 February 2009, 09:03:21 UTC |
| 1b249ff | Christian Couder | 27 February 2009, 06:31:22 UTC | bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped When the "bad" commit was also "skip"ped and when more than one commit was skipped, the "filter_skipped" function would have printed something like: bisect_rev=<hash1>|<hash2> (where <hash1> and <hash2> are hexadecimal sha1 hashes) and this would have been evaled later as piping "bisect_rev=<hash1>" into "<hash2>", which would have failed. So this patch makes the "filter_skipped" function properly quote what it outputs, so that it will print something like: bisect_rev='<hash1>|<hash2>' which will be properly evaled later. The caller was not stopping properly because the scriptlet this function returned to be evaled was not strung together with && and because of this, an error in an earlier part of the output was simply ignored. A test case is added to the test suite. And while at it, we also initialize the VARS, FOUND and TRIED variables, so that we protect ourselves from environment variables the user may have with these names. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2009, 08:57:28 UTC |
| 2d56a13 | Junio C Hamano | 26 February 2009, 19:24:29 UTC | git-am: make --abort less dangerous When you are in the middle of "git rebase", "git am --abort" by mistake would have referred to nonexistent ORIG_HEAD and barfed, or worse yet, used a stale ORIG_HEAD and taken you to an unexpected commit. Also the option parsing did not reject "git am --abort --skip". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2009, 07:06:38 UTC |
| c767184 | Michael J Gruber | 26 February 2009, 09:52:53 UTC | git-am: Keep index in case of abort with dirty index git am --abort resets the index unconditionally. But in case a previous git am exited due to a dirty index it is preferable to keep that index. Make it so. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2009, 07:06:27 UTC |
| 2591838 | Jay Soffian | 26 February 2009, 23:44:40 UTC | t5540-http-push.sh: avoid non-portable grep -P OS X's GNU grep does not support -P/--perl-regexp. We use a basic RE instead, and simplify the pattern slightly by replacing '+' with '*' so it can be more easily expressed using a basic RE. The important part of pattern, checking for a SHA-1 has suffix in the successful PUT/MOVE operations, remains the same. Also, a-z instead of a-f was an obvious mistake in the original RE. Here are samples of what we want to match: 127.0.0.1 - - [26/Feb/2009:22:38:13 +0000] "PUT /test_repo.git/objects/3e/a4fbb9e18a401a6463c595d08118fcb9fb7426_fab55116904c665a95438bcc78521444a7db6096 HTTP/1.1" 201 277 127.0.0.1 - - [26/Feb/2009:22:38:13 +0000] "MOVE /test_repo.git/objects/3e/a4fbb9e18a401a6463c595d08118fcb9fb7426_fab55116904c665a95438bcc78521444a7db6096 HTTP/1.1" 201 277 Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2009, 00:20:58 UTC |
| 2c626e5 | Mike Ralphson | 26 February 2009, 15:31:52 UTC | Fix odb_mkstemp() on AIX The AIX mkstemp() modifies its template parameter to an empty string if the call fails. The existing code had already recomputed the template, but too late to be good. See also 6ff6af62, which fixed this problem in a different spot. Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 February 2009, 16:40:27 UTC |
| 661763a | Junio C Hamano | 25 February 2009, 22:50:52 UTC | GIT 1.6.2-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 22:50:52 UTC |
| bb0cebd | Junio C Hamano | 25 February 2009, 22:48:30 UTC | Merge branch 'jc/maint-1.6.0-pack-directory' * jc/maint-1.6.0-pack-directory: Make sure objects/pack exists before creating a new pack | 25 February 2009, 22:50:05 UTC |
| 6e180cd | Junio C Hamano | 25 February 2009, 07:11:29 UTC | Make sure objects/pack exists before creating a new pack In a repository created with git older than f49fb35 (git-init-db: create "pack" subdirectory under objects, 2005-06-27), objects/pack/ directory is not created upon initialization. It was Ok because subdirectories are created as needed inside directories init-db creates, and back then, packfiles were recent invention. After the said commit, new codepaths started relying on the presense of objects/pack/ directory in the repository. This was exacerbated with 8b4eb6b (Do not perform cross-directory renames when creating packs, 2008-09-22) that moved the location temporary pack files are created from objects/ directory to objects/pack/ directory, because moving temporary to the final location was done carefully with lazy leading directory creation. Many packfile related operations in such an old repository can fail mysteriously because of this. This commit introduces two helper functions to make things work better. - odb_mkstemp() is a specialized version of mkstemp() to refactor the code and teach it to create leading directories as needed; - odb_pack_keep() refactors the code to create a ".keep" file while create leading directories as needed. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 22:39:42 UTC |
| 69707d6 | Jay Soffian | 25 February 2009, 08:28:15 UTC | Allow HTTP tests to run on Darwin This patch allows the HTTP tests to run on OS X 10.5. It is not sufficient to be able to pass in LIB_HTTPD_PATH and LIB_HTTPD_MODULE_PATH alone, as the apache.conf also needs a couple tweaks. These changes are put into an <IfDefine> to keep them Darwin specific, but this means lib-httpd.sh needs to be modified to pass -DDarwin to apache when running on Darwin. As long as we're making this change to lib-httpd.sh, we may as well set LIB_HTTPD_PATH and LIB_HTTPD_MODULE_PATH to appropriate default values for the platform. Note that we now pass HTTPD_PARA to apache at shutdown as well. Otherwise apache will emit a harmless, but noisy warning that LogFormat is an unknown directive. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 21:58:57 UTC |
| 3dbe116 | Michael J Gruber | 25 February 2009, 14:05:17 UTC | Fix typo in contrib/examples/git-svnimport.txt Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 16:33:14 UTC |
| 3f74c8e | Johannes Sixt | 25 February 2009, 07:54:42 UTC | gitattributes.txt: Path matching rules are explained in gitignore.txt The rules how the patterns are matched against path names are the same for .gitattribute and .gitignore files. This also replace the notion "glob pattern" by "pattern" because gitignore.txt talks about "glob" only in some contexts where the pattern is mentioned. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:54 UTC |
| a9d98a1 | Felipe Contreras | 24 February 2009, 21:59:05 UTC | sha1_file.c: fix typo it's != its Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:54 UTC |
| 9ccb3bc | Felipe Contreras | 24 February 2009, 21:59:03 UTC | git add: trivial codestyle cleanup Global static variables don't need to be initialized to 0/NULL. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:54 UTC |
| aa98eb3 | Christian Couder | 24 February 2009, 20:16:37 UTC | README: fix path to "gitcvs-migration.txt" and be more consistent README suggested to look at "Documentation/gittutorial.txt" for the tutorial and to use "man git-commandname" for documentation of each command. This was not consistent because the tutorial can also be available with "man gittutorial" once git is installed, and the documentation for each command can be available at "Documentation/git-commandname.txt" before installing git. This patch tries to make the description more consistent. It also fixes the path to the cvs-migration documentation that changed from "Documentation/cvs-migration.txt" to "Documentation/gitcvs-migration.txt". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:54 UTC |
| a8fdab0 | Allan Caffee | 25 February 2009, 01:22:20 UTC | trace: Fixed a minor typo in an error message. Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:53 UTC |
| 149f6dd | Marc Branchaud | 19 February 2009, 17:39:47 UTC | Docs: Expand explanation of the use of + in git push refspecs. Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:53 UTC |
| 6ab149e | Gerrit Pape | 24 February 2009, 09:00:06 UTC | git-quiltimport: preserve standard input to be able to read user input When run without --author and it fails to determine an author, git quiltimport tries `read patch_author` to get user input, but standard input has been redirected to the patch series file. This commit lets quiltimport read the series file through file descriptor 3 so that the standard input is preserved. Reported by Uwe Kleine-König through http://bugs.debian.org/515910 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:13 UTC |
| 10edf37 | Jeff King | 24 February 2009, 05:42:16 UTC | never fallback relative times to absolute Previously, for dates older than 12 months we fell back to just giving the absolute time. This can be a bit jarring when reading a list of times. Instead, let's switch to "Y years, M months" for five years, and then just "Y years" after that. No particular reason on the 5 year cutoff except that it seemed reasonable to me. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:44:43 UTC |
| 6a0861a | Gerrit Pape | 24 February 2009, 08:58:16 UTC | Install builtins with the user and group of the installing personality If 'make install' was run with sufficient privileges, then the installed builtins in gitexecdir, which are either hardlinked, symlinked, or copied, would receive the user and group of whoever built git. With this commit the initial hardlink or copy is done from the installation tree and not the build tree to fix this. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 05:46:31 UTC |
| 48b6026 | Junio C Hamano | 25 February 2009, 05:13:32 UTC | Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git-svn fix to avoid using strftime %z | 25 February 2009, 05:13:32 UTC |
| 3ca9364 | Abhijit Menon-Sen | 25 February 2009, 03:03:14 UTC | Convert git-* invocations to "git *" in the svnimport example. After these changes, git-svnimport worked fine for me. Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 05:10:57 UTC |
| e871784 | Ben Walton | 24 February 2009, 19:44:49 UTC | git-svn fix to avoid using strftime %z %z isn't available on all platforms in the date formatting routines. Provide a workalike capability that should be more portable. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Acked-by: Eric Wong <normalperson@yhbt.net> | 24 February 2009, 21:45:36 UTC |
| afe756c | Jay Soffian | 23 February 2009, 18:51:37 UTC | send-email: don't create temporary compose file until it is needed Commit eed6ca7 caused a minor regression when it switched to using tempfile() to generate the temporary compose file. Since tempfile() creates the file at the time it generates the filename, zero-length temporary files are being left behind unless --compose is used (in which case the file is cleaned up). This patch fixes the regression by not calling tempfile() to generate the compose filename unless --compose is in use. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2009, 06:03:50 UTC |
| d43c07b | Junio C Hamano | 24 February 2009, 03:14:13 UTC | Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git-svn: read the dcommit url from the config file on a per remote basis git-svn: fix delete+add branch tracking with empty files git-svn: Create leading directories in create-ignore | 24 February 2009, 03:14:13 UTC |
| b4b0ba0 | Pete Wyckoff | 18 February 2009, 18:12:14 UTC | git-p4: avoid syncing duplicate changes When a particular changeset affects multiple depot paths, it will appear multiple times in the output of "p4 changes". Filter out the duplicates to avoid the extra empty commits that this otherwise would create. Signed-off-by: Pete Wyckoff <pw@padd.com> Acked-by: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2009, 23:24:08 UTC |
