| 6c4ab27 | Junio C Hamano | 15 August 2014, 22:09:12 UTC | Git 2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2014, 22:09:12 UTC |
| 41ca19b | Johannes Sixt | 13 August 2014, 19:30:11 UTC | tests: fix negated test_i18ngrep calls The helper function test_i18ngrep pretends that it found the expected results when it is running under GETTEXT_POISON. For this reason, it must not be used negated like so ! test_i18ngrep foo bar because the test case would fail under GETTEXT_POISON. The function offers a special syntax to test that a pattern is *not* found: test_i18ngrep ! foo bar Convert incorrect uses to this syntax. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 August 2014, 20:12:06 UTC |
| 67de23d | Junio C Hamano | 10 August 2014, 18:03:03 UTC | Merge branch 'master' of git://ozlabs.org/~paulus/gitk * 'master' of git://ozlabs.org/~paulus/gitk: gitk: Updated Bulgarian translation (302t,0f,0u) gitk: Add keybinding to switch to parent commit | 10 August 2014, 18:03:03 UTC |
| f82887f | Junio C Hamano | 08 August 2014, 20:52:16 UTC | Git 2.1-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 August 2014, 20:52:16 UTC |
| 09898e7 | Alexander Shopov | 03 August 2014, 12:36:43 UTC | gitk: Updated Bulgarian translation (302t,0f,0u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 08 August 2014, 06:39:30 UTC |
| d4ec30b | Max Kirillov | 08 July 2014, 20:45:35 UTC | gitk: Add keybinding to switch to parent commit Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Paul Mackerras <paulus@samba.org> | 08 August 2014, 06:39:02 UTC |
| 764c739 | Junio C Hamano | 07 August 2014, 16:44:17 UTC | Merge branch 'mb/relnotes-2.1' * mb/relnotes-2.1: Release notes: grammatical fixes RelNotes: no more check_ref_format micro-optimization | 07 August 2014, 16:44:17 UTC |
| 5261ec5 | Marc Branchaud | 05 August 2014, 16:50:45 UTC | Release notes: grammatical fixes Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 August 2014, 16:44:05 UTC |
| 663d096 | Stefan Beller | 07 August 2014, 14:27:12 UTC | various contrib: Fix links in man pages Inspired by 2147fa7e (2014-07-31 git-push: fix link in man page), I grepped through the whole tree searching for 'gitlink:' occurrences. Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 August 2014, 16:43:21 UTC |
| f54d3c6 | Junio C Hamano | 05 August 2014, 18:44:23 UTC | RelNotes: no more check_ref_format micro-optimization Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 August 2014, 18:45:09 UTC |
| 7b69fcb | Junio C Hamano | 04 August 2014, 21:05:06 UTC | Git 2.1.0-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 August 2014, 21:05:06 UTC |
| b16665e | Junio C Hamano | 04 August 2014, 21:03:45 UTC | Merge branch 'tf/maint-doc-push' * tf/maint-doc-push: git-push: fix link in man page | 04 August 2014, 21:03:45 UTC |
| 18bd789 | Junio C Hamano | 04 August 2014, 21:03:25 UTC | Merge branch 'ta/doc-config' * ta/doc-config: add documentation for writing config files | 04 August 2014, 21:03:25 UTC |
| 2147fa7 | Tony Finch | 31 July 2014, 15:06:28 UTC | git-push: fix link in man page Signed-off-by: Tony Finch <dot@dotat.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 July 2014, 17:17:37 UTC |
| aa544bf | Junio C Hamano | 30 July 2014, 21:25:46 UTC | Sync with 2.0.4 * maint: Git 2.0.4 commit --amend: test specifies authorship but forgets to check | 30 July 2014, 21:25:46 UTC |
| aa0ba07 | Junio C Hamano | 30 July 2014, 21:25:14 UTC | Update draft release notes to 2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2014, 21:25:14 UTC |
| 0d9cb2d | Junio C Hamano | 30 July 2014, 21:21:13 UTC | Merge branch 'jk/more-push-completion' * jk/more-push-completion: completion: complete `git push --force-with-lease=` completion: add some missing options to `git push` completion: complete "unstuck" `git push --recurse-submodules` | 30 July 2014, 21:21:14 UTC |
| c372e7b | Junio C Hamano | 30 July 2014, 21:21:12 UTC | Merge branch 'sk/mingw-tests-workaround' Make tests pass on msysgit by mostly disabling ones that are infeasible on that platform. * sk/mingw-tests-workaround: t800[12]: work around MSys limitation t9902: mingw-specific fix for gitfile link files t4210: skip command-line encoding tests on mingw MinGW: disable legacy encoding tests t0110/MinGW: skip tests that pass arbitrary bytes on the command line MinGW: Skip test redirecting to fd 4 | 30 July 2014, 21:21:12 UTC |
| 385e171 | Junio C Hamano | 30 July 2014, 21:21:09 UTC | Merge branch 'sk/mingw-uni-fix-more' Most of these are battle-tested in msysgit and are needed to complete what has been merged to 'master' already. * sk/mingw-uni-fix-more: Win32: enable color output in Windows cmd.exe Win32: patch Windows environment on startup Win32: keep the environment sorted Win32: use low-level memory allocation during initialization Win32: reduce environment array reallocations Win32: don't copy the environment twice when spawning child processes Win32: factor out environment block creation Win32: unify environment function names Win32: unify environment case-sensitivity Win32: fix environment memory leaks Win32: Unicode environment (incoming) Win32: Unicode environment (outgoing) Revert "Windows: teach getenv to do a case-sensitive search" tests: do not pass iso8859-1 encoded parameter | 30 July 2014, 21:21:09 UTC |
| 4b0c0e3 | Junio C Hamano | 30 July 2014, 21:21:05 UTC | Merge branch 'ep/avoid-test-a-o' * ep/avoid-test-a-o: t9814: fix misconversion from test $a -o $b to test $a || test $b | 30 July 2014, 21:21:05 UTC |
| 32f5660 | Junio C Hamano | 30 July 2014, 21:19:53 UTC | Git 2.0.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2014, 21:19:53 UTC |
| 97d6e79 | Tanay Abhra | 28 July 2014, 10:42:26 UTC | add documentation for writing config files Replace TODO introduced in commit 9c3c22 with documentation explaining Git config API functions for writing configuration files. Signed-off-by: Tanay Abhra <tanayabh@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2014, 19:16:07 UTC |
| d8b396e | Fabian Ruch | 30 July 2014, 09:45:11 UTC | commit --amend: test specifies authorship but forgets to check The test case "--amend option copies authorship" specifies that the git-commit option `--amend` uses the authorship of the replaced commit for the new commit. Add the omitted check that this property actually holds. Signed-off-by: Fabian Ruch <bafain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2014, 18:32:12 UTC |
| 583b61c | Junio C Hamano | 28 July 2014, 18:31:46 UTC | Merge branch 'maint' * maint: t4013: test diff-tree's --stdin commit formatting diff-tree: avoid lookup_unknown_object object_as_type: set commit index alloc: factor out commit index add object_as_type helper for casting objects parse_object_buffer: do not set object type move setting of object->type to alloc_* functions alloc: write out allocator definitions alloc.c: remove the alloc_raw_commit_node() function | 28 July 2014, 18:31:46 UTC |
| d299e9e | Jeff King | 28 July 2014, 18:01:57 UTC | t4013: test diff-tree's --stdin commit formatting Once upon a time, git-log was just "rev-list | diff-tree", and we did not bother to test it separately. These days git-log is implemented internally, but we want to make sure that the rev-list to diff-tree pipeline continues to function. Let's add a basic sanity test. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2014, 18:31:32 UTC |
| ad524f8 | Junio C Hamano | 28 July 2014, 18:30:41 UTC | Merge branch 'jk/misc-fixes-maint' * jk/misc-fixes-maint: apply: avoid possible bogus pointer fix memory leak parsing core.commentchar transport: fix leaks in refs_from_alternate_cb free ref string returned by dwim_ref receive-pack: don't copy "dir" parameter | 28 July 2014, 18:30:41 UTC |
| 919eb8a | Jeff King | 28 July 2014, 15:48:11 UTC | t1402: check for refs ending with a dot This has been illegal since cbdffe4 (check_ref_format(): tighten refname rules, 2009-03-21), but we never tested it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2014, 17:42:39 UTC |
| 5e65022 | Junio C Hamano | 28 July 2014, 17:41:53 UTC | Revert "Merge branch 'dt/refs-check-refname-component-sse'" This reverts commit 6f92e5ff3cdc813de8ef5327fd4bad492fb7d6c9, reversing changes made to a02ad882a17b9d45f63ea448391ac5e9f7948222. | 28 July 2014, 17:41:53 UTC |
| dad2e7f | Junio C Hamano | 28 July 2014, 17:41:16 UTC | Revert "Merge branch 'dt/refs-check-refname-component-sse-fix'" This reverts commit 779c99fd68dcdaff7d996a1985914154a36a272c, reversing changes made to df4d7d56461c19361a6f32b633e850c7ba6e55e6. | 28 July 2014, 17:41:16 UTC |
| 5d7c37a | Junio C Hamano | 28 July 2014, 17:35:35 UTC | Merge branch 'jk/alloc-commit-id-maint' into maint * jk/alloc-commit-id-maint: diff-tree: avoid lookup_unknown_object object_as_type: set commit index alloc: factor out commit index add object_as_type helper for casting objects parse_object_buffer: do not set object type move setting of object->type to alloc_* functions alloc: write out allocator definitions alloc.c: remove the alloc_raw_commit_node() function | 28 July 2014, 17:35:35 UTC |
| b794ebe | Jeff King | 13 July 2014, 06:42:17 UTC | diff-tree: avoid lookup_unknown_object We generally want to avoid lookup_unknown_object, because it results in allocating more memory for the object than may be strictly necessary. In this case, it is used to check whether we have an already-parsed object before calling parse_object, to save us from reading the object from disk. Using lookup_object would be fine for that purpose, but we can take it a step further. Since this code was written, parse_object already learned the "check lookup_object" optimization, so we can simply call parse_object directly. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2014, 17:14:34 UTC |
| 34dfe19 | Jeff King | 13 July 2014, 06:42:12 UTC | object_as_type: set commit index The point of the "index" field of struct commit is that every allocated commit would have one. It is supposed to be an invariant that whenever object->type is set to OBJ_COMMIT, we have a unique index. Commit 969eba6 (commit: push commit_index update into alloc_commit_node, 2014-06-10) covered this case for newly-allocated commits. However, we may also allocate an "unknown" object via lookup_unknown_object, and only later convert it to a commit. We must make sure that we set the commit index when we switch the type field. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2014, 17:14:34 UTC |
| 5de7f50 | Jeff King | 13 July 2014, 06:42:08 UTC | alloc: factor out commit index We keep a static counter to set the commit index on newly allocated objects. However, since we also need to set the index on any_objects which are converted to commits, let's make the counter available as a public function. While we're moving it, let's make sure the counter is allocated as an unsigned integer to match the index field in "struct commit". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2014, 17:14:33 UTC |
| c4ad00f | Jeff King | 13 July 2014, 06:42:03 UTC | add object_as_type helper for casting objects When we call lookup_commit, lookup_tree, etc, the logic goes something like: 1. Look for an existing object struct. If we don't have one, allocate and return a new one. 2. Double check that any object we have is the expected type (and complain and return NULL otherwise). 3. Convert an object with type OBJ_NONE (from a prior call to lookup_unknown_object) to the expected type. We can encapsulate steps 2 and 3 in a helper function which checks whether we have the expected object type, converts OBJ_NONE as appropriate, and returns the object. Not only does this shorten the code, but it also provides one central location for converting OBJ_NONE objects into objects of other types. Future patches will use that to enforce type-specific invariants. Since this is a refactoring, we would want it to behave exactly as the current code. It takes a little reasoning to see that this is the case: - for lookup_{commit,tree,etc} functions, we are just pulling steps 2 and 3 into a function that does the same thing. - for the call in peel_object, we currently only do step 3 (but we want to consolidate it with the others, as mentioned above). However, step 2 is a noop here, as the surrounding conditional makes sure we have OBJ_NONE (which we want to keep to avoid an extraneous call to sha1_object_info). - for the call in lookup_commit_reference_gently, we are currently doing step 2 but not step 3. However, step 3 is a noop here. The object we got will have just come from deref_tag, which must have figured out the type for each object in order to know when to stop peeling. Therefore the type will never be OBJ_NONE. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2014, 17:14:33 UTC |
| fe0444b | Jeff King | 13 July 2014, 06:42:00 UTC | parse_object_buffer: do not set object type The only way that "obj" can be non-NULL is if it came from one of the lookup_* functions. These functions always ensure that the object has the expected type (and return NULL otherwise), so there is no need for us to set the type. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2014, 17:14:33 UTC |
| fe24d39 | Jeff King | 13 July 2014, 06:41:55 UTC | move setting of object->type to alloc_* functions The "struct object" type implements basic object polymorphism. Individual instances are allocated as concrete types (or as a union type that can store any object), and a "struct object *" can be cast into its real type after examining its "type" enum. This means it is dangerous to have a type field that does not match the allocation (e.g., setting the type field of a "struct blob" to "OBJ_COMMIT" would mean that a reader might read past the allocated memory). In most of the current code this is not a problem; the first thing we do after allocating an object is usually to set its type field by passing it to create_object. However, the virtual commits we create in merge-recursive.c do not ever get their type set. This does not seem to have caused problems in practice, though (presumably because we always pass around a "struct commit" pointer and never even look at the type). We can fix this oversight and also make it harder for future code to get it wrong by setting the type directly in the object allocation functions. This will also make it easier to fix problems with commit index allocation, as we know that any object allocated by alloc_commit_node will meet the invariant that an object with an OBJ_COMMIT type field will have a unique index number. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2014, 17:14:33 UTC |
| 52604d7 | Jeff King | 13 July 2014, 06:41:51 UTC | alloc: write out allocator definitions Because the allocator functions for tree, blobs, etc are all very similar, we originally used a macro to avoid repeating ourselves. Since the prior commit, though, the heavy lifting is done by an inline helper function. The macro does still save us a few lines, but at some readability cost. It obfuscates the function definitions (and makes them hard to find via grep). Much worse, though, is the fact that it isn't used consistently for all allocators. Somebody coming later may be tempted to modify DEFINE_ALLOCATOR, but they would miss alloc_commit_node, which is treated specially. Let's just drop the macro and write everything out explicitly. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2014, 17:14:33 UTC |
| 8c3f3f2 | Ramsay Jones | 13 July 2014, 06:41:41 UTC | alloc.c: remove the alloc_raw_commit_node() function In order to encapsulate the setting of the unique commit index, commit 969eba63 ("commit: push commit_index update into alloc_commit_node", 10-06-2014) introduced a (logically private) intermediary allocator function. However, this function (alloc_raw_commit_node()) was declared as a public function, which undermines its entire purpose. Introduce an inline function, alloc_node(), which implements the main logic of the allocator used by DEFINE_ALLOCATOR, and redefine the macro in terms of the new function. In addition, use the new function in the implementation of the alloc_commit_node() allocator, rather than the intermediary allocator, which can now be removed. Noticed by sparse ("symbol 'alloc_raw_commit_node' was not declared. Should it be static?"). Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2014, 17:14:33 UTC |
| 49f1cb9 | Junio C Hamano | 27 July 2014, 22:22:22 UTC | Git 2.1.0-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 July 2014, 22:22:22 UTC |
| 3dcacd7 | Junio C Hamano | 27 July 2014, 22:14:21 UTC | Merge branch 'jk/rebase-am-fork-point' "git rebase --fork-point" did not filter out patch-identical commits correctly. * jk/rebase-am-fork-point: rebase: omit patch-identical commits with --fork-point rebase--am: use --cherry-pick instead of --ignore-if-in-upstream | 27 July 2014, 22:14:21 UTC |
| 1673744 | Junio C Hamano | 27 July 2014, 22:14:18 UTC | Merge branch 'cc/replace-graft' "git replace" learned a "--graft" option to rewrite parents of a commit. * cc/replace-graft: replace: add test for --graft with a mergetag replace: check mergetags when using --graft replace: add test for --graft with signed commit replace: remove signature when using --graft contrib: add convert-grafts-to-replace-refs.sh Documentation: replace: add --graft option replace: add test for --graft replace: add --graft option replace: cleanup redirection style in tests | 27 July 2014, 22:14:18 UTC |
| 4799593 | Junio C Hamano | 27 July 2014, 22:14:14 UTC | Merge branch 'jk/stable-prio-queue' * jk/stable-prio-queue: t5539: update a flaky test paint_down_to_common: use prio_queue prio-queue: make output stable with respect to insertion prio-queue: factor out compare and swap operations | 27 July 2014, 22:14:15 UTC |
| e832f73 | Junio C Hamano | 25 July 2014, 19:44:18 UTC | t9814: fix misconversion from test $a -o $b to test $a || test $b Spotted-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 July 2014, 19:44:22 UTC |
| 31bb6d3 | Jeff King | 24 July 2014, 04:43:23 UTC | apply: avoid possible bogus pointer When parsing "index" lines from a git-diff, we look for a space followed by the mode. If we don't have a space, then we set our pointer to the end-of-line. However, we don't double-check that our end-of-line pointer is valid (e.g., if we got a truncated diff input), which could lead to some wrap-around pointer arithmetic. In most cases this would probably get caught by our "40 < len" check later in the function, but to be on the safe side, let's just use strchrnul to treat end-of-string the same as end-of-line. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 July 2014, 20:57:50 UTC |
| 649409b | Jeff King | 24 July 2014, 04:42:39 UTC | fix memory leak parsing core.commentchar When we see the core.commentchar config option, we extract the string with git_config_string, which does two things: 1. It complains via config_error_nonbool if there is no string value. 2. It makes a copy of the string. Since we immediately parse the string into its single-character value, we only care about (1). And in fact (2) is a detriment, as it means we leak the copy. Instead, let's just check the pointer value ourselves, and parse directly from the const string we already have. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 July 2014, 20:57:50 UTC |
| def0697 | Jeff King | 24 July 2014, 04:41:30 UTC | transport: fix leaks in refs_from_alternate_cb The function starts by creating a copy of the static buffer returned by real_path, but forgets to free it in the error code paths. We can solve this by jumping to the cleanup code that is already there. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 July 2014, 20:57:50 UTC |
| 28b3563 | Jeff King | 24 July 2014, 04:41:11 UTC | free ref string returned by dwim_ref A call to "dwim_ref(name, len, flags, &ref)" will allocate a new string in "ref" to return the exact ref we found. We do not consistently free it in all code paths, leading to small leaks. The worst is in get_sha1_basic, which may be called many times (e.g., by "cat-file --batch"), though it is relatively unlikely, as it only triggers on a bogus reflog specification. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 July 2014, 20:57:49 UTC |
| d51428b | Jeff King | 24 July 2014, 04:40:43 UTC | receive-pack: don't copy "dir" parameter We used to do this so could pass a mutable string to enter_repo. But since 1c64b48 (enter_repo: do not modify input, 2011-10-04), this is not necessary. The resulting code is simpler, and it fixes a minor leak. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 July 2014, 20:57:49 UTC |
| 996b0fd | Junio C Hamano | 23 July 2014, 18:36:40 UTC | Sync with v2.0.3 * maint: Git 2.0.3 .mailmap: combine Stefan Beller's emails git.1: switch homepage for stats | 23 July 2014, 18:36:40 UTC |
| 6da748a | Junio C Hamano | 23 July 2014, 18:35:59 UTC | Merge branch 'rs/fix-unlink-unix-socket' The unix-domain socket used by the sample credential cache daemon tried to unlink an existing stale one at a wrong path, if the path to the socket was given as an overlong path that does not fit in sun_path member of the sockaddr_un structure. * rs/fix-unlink-unix-socket: unix-socket: remove stale socket before calling chdir() | 23 July 2014, 18:36:00 UTC |
| 955d7be | Junio C Hamano | 23 July 2014, 18:35:54 UTC | Merge branch 'ta/string-list-init' * ta/string-list-init: replace memset with string-list initializers string-list: add string_list initializer helper function | 23 July 2014, 18:35:54 UTC |
| bc88def | Junio C Hamano | 23 July 2014, 18:35:49 UTC | Merge branch 'mb/local-clone-after-applying-insteadof' Apply the "if cloning from a local disk, physically copy repository using hardlinks, unless otherwise told not to with --no-local" optimization when url.*.insteadOf mechanism rewrites a "git clone $URL" that refers to a repository over the network to a clone from a local disk. * mb/local-clone-after-applying-insteadof: use local cloning if insteadOf makes a local URL | 23 July 2014, 18:35:49 UTC |
| c3d2bc7 | Junio C Hamano | 23 July 2014, 18:35:45 UTC | Merge branch 'jk/tag-sort' * jk/tag-sort: tag: support configuring --sort via .gitconfig tag: fix --sort tests to use cat<<-\EOF format | 23 July 2014, 18:35:45 UTC |
| 740c281 | Junio C Hamano | 23 July 2014, 18:33:16 UTC | Git 2.0.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 July 2014, 18:33:16 UTC |
| 98b12a4 | Stefan Beller | 23 July 2014, 12:32:10 UTC | .mailmap: combine Stefan Beller's emails Google mail has had the extension @googlemail.com for a long time in Germany as @gmail.de was already taken by a competitor. Nowadays the original gmail company isn't there anymore(?), hence Googlemail also introduced @gmail.com in Germany, which I switched to. This changed mail address of mine first appeared in 398dd4bd039680b (2014-07-10, .mailmap: map different names with the same email address together) ironically. Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 July 2014, 18:27:05 UTC |
| 405869d | Stefan Beller | 23 July 2014, 12:32:09 UTC | git.1: switch homepage for stats According to http://meta.ohloh.net/2014/07/black-duck-open-hub/ the site name of ohloh changed to openhub. Change the man page accordingly. Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 July 2014, 18:26:52 UTC |
| aaf7253 | John Keeping | 22 July 2014, 18:24:58 UTC | completion: complete `git push --force-with-lease=` Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2014, 20:30:30 UTC |
| 9e8a6a9 | John Keeping | 22 July 2014, 18:24:57 UTC | completion: add some missing options to `git push` Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2014, 20:23:39 UTC |
| 3a224ff | John Keeping | 22 July 2014, 18:24:56 UTC | completion: complete "unstuck" `git push --recurse-submodules` Since the argument to `--recurse-submodules` is mandatory, it does not need to be stuck to the option with `=`. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2014, 20:21:07 UTC |
| 247b4d5 | Junio C Hamano | 22 July 2014, 18:00:23 UTC | Sync with maint * maint: Documentation: fix missing text for rev-parse --verify | 22 July 2014, 18:00:23 UTC |
| 12621cb | Junio C Hamano | 22 July 2014, 17:59:36 UTC | Merge branch 'rs/code-cleaning' * rs/code-cleaning: remote-testsvn: use internal argv_array of struct child_process in cmd_import() bundle: use internal argv_array of struct child_process in create_bundle() fast-import: use hashcmp() for SHA1 hash comparison transport: simplify fetch_objs_via_rsync() using argv_array run-command: use internal argv_array of struct child_process in run_hook_ve() use commit_list_count() to count the members of commit_lists strbuf: use strbuf_addstr() for adding C strings | 22 July 2014, 17:59:37 UTC |
| 4328190 | Junio C Hamano | 22 July 2014, 17:59:31 UTC | Merge branch 'nd/path-max-must-go' * nd/path-max-must-go: prep_exclude: remove the artificial PATH_MAX limit dir.h: move struct exclude declaration to top level dir.c: coding style fix | 22 July 2014, 17:59:32 UTC |
| 10b944b | Junio C Hamano | 22 July 2014, 17:59:24 UTC | Merge branch 'jk/alloc-commit-id' Make sure all in-core commit objects are assigned a unique number so that they can be annotated using the commit-slab API. * jk/alloc-commit-id: diff-tree: avoid lookup_unknown_object object_as_type: set commit index alloc: factor out commit index add object_as_type helper for casting objects parse_object_buffer: do not set object type move setting of object->type to alloc_* functions alloc: write out allocator definitions alloc.c: remove the alloc_raw_commit_node() function | 22 July 2014, 17:59:25 UTC |
| 9f2de9c | Junio C Hamano | 22 July 2014, 17:59:18 UTC | Merge branch 'kb/perf-trace' * kb/perf-trace: api-trace.txt: add trace API documentation progress: simplify performance measurement by using getnanotime() wt-status: simplify performance measurement by using getnanotime() git: add performance tracing for git's main() function to debug scripts trace: add trace_performance facility to debug performance issues trace: add high resolution timer function to debug performance issues trace: add 'file:line' to all trace output trace: move code around, in preparation to file:line output trace: add current timestamp to all trace output trace: disable additional trace output for unit tests trace: add infrastructure to augment trace output with additional info sha1_file: change GIT_TRACE_PACK_ACCESS logging to use trace API Documentation/git.txt: improve documentation of 'GIT_TRACE*' variables trace: improve trace performance trace: remove redundant printf format attribute trace: consistently name the format parameter trace: move trace declarations from cache.h to new trace.h | 22 July 2014, 17:59:19 UTC |
| cd989a9 | Junio C Hamano | 22 July 2014, 17:29:07 UTC | Merge branch 'ah/fix-http-push' into maint * ah/fix-http-push: http-push.c: make CURLOPT_IOCTLDATA a usable pointer | 22 July 2014, 17:29:07 UTC |
| 0d854fc | Junio C Hamano | 22 July 2014, 17:28:59 UTC | Merge branch 'po/error-message-style' into maint * po/error-message-style: doc: give some guidelines for error messages | 22 July 2014, 17:28:59 UTC |
| a1991f1 | Junio C Hamano | 22 July 2014, 17:28:51 UTC | Merge branch 'zk/log-graph-showsig' into maint * zk/log-graph-showsig: log: fix indentation for --graph --show-signature | 22 July 2014, 17:28:51 UTC |
| 514dd21 | Junio C Hamano | 22 July 2014, 17:28:43 UTC | Merge branch 'mg/fix-log-mergetag-color' into maint * mg/fix-log-mergetag-color: log: correctly identify mergetag signature verification status | 22 July 2014, 17:28:43 UTC |
| 5796c5b | Junio C Hamano | 22 July 2014, 17:28:30 UTC | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint * cb/filter-branch-prune-empty-degenerate-merges: filter-branch: eliminate duplicate mapped parents | 22 July 2014, 17:28:30 UTC |
| 1a1f7b2 | Junio C Hamano | 22 July 2014, 17:28:02 UTC | Merge branch 'ye/doc-http-proto' into maint * ye/doc-http-proto: http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616 | 22 July 2014, 17:28:02 UTC |
| 0196a60 | Junio C Hamano | 22 July 2014, 17:26:52 UTC | Merge branch 'jm/api-strbuf-doc' into maint * jm/api-strbuf-doc: api-strbuf.txt minor typos | 22 July 2014, 17:26:52 UTC |
| 054e22c | Junio C Hamano | 22 July 2014, 17:26:45 UTC | Merge branch 'jm/dedup-test-config' into maint * jm/dedup-test-config: t/t7810-grep.sh: remove duplicate test_config() | 22 July 2014, 17:26:45 UTC |
| ef93714 | Junio C Hamano | 22 July 2014, 17:26:34 UTC | Merge branch 'sk/test-cmp-bin' into maint * sk/test-cmp-bin: t5000, t5003: do not use test_cmp to compare binary files | 22 July 2014, 17:26:34 UTC |
| 79e9dba | Junio C Hamano | 22 July 2014, 17:26:17 UTC | Merge branch 'jm/doc-wording-tweaks' into maint * jm/doc-wording-tweaks: Documentation: wording fixes in the user manual and glossary | 22 July 2014, 17:26:17 UTC |
| af3e5d1 | Junio C Hamano | 22 July 2014, 17:25:24 UTC | Merge branch 'jm/instaweb-apache-24' into maint * jm/instaweb-apache-24: git-instaweb: add support for Apache 2.4 | 22 July 2014, 17:25:24 UTC |
| cfececf | Junio C Hamano | 22 July 2014, 17:25:17 UTC | Merge branch 'bg/xcalloc-nmemb-then-size' into maint * bg/xcalloc-nmemb-then-size: transport-helper.c: rearrange xcalloc arguments remote.c: rearrange xcalloc arguments reflog-walk.c: rearrange xcalloc arguments pack-revindex.c: rearrange xcalloc arguments notes.c: rearrange xcalloc arguments imap-send.c: rearrange xcalloc arguments http-push.c: rearrange xcalloc arguments diff.c: rearrange xcalloc arguments config.c: rearrange xcalloc arguments commit.c: rearrange xcalloc arguments builtin/remote.c: rearrange xcalloc arguments builtin/ls-remote.c: rearrange xcalloc arguments | 22 July 2014, 17:25:17 UTC |
| 1fbc6e6 | Junio C Hamano | 22 July 2014, 17:25:02 UTC | Merge branch 'cb/byte-order' into maint * cb/byte-order: compat/bswap.h: fix endianness detection compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER | 22 July 2014, 17:25:02 UTC |
| 85dd379 | Junio C Hamano | 22 July 2014, 17:23:41 UTC | Merge branch 'lt/request-pull' into maint * lt/request-pull: fix brown paper bag breakage in t5150-request-pull.sh | 22 July 2014, 17:23:41 UTC |
| 63618af | Junio C Hamano | 22 July 2014, 17:22:57 UTC | Merge branch 'ep/shell-assign-and-export-vars' into maint * ep/shell-assign-and-export-vars: scripts: more "export VAR=VALUE" fixes scripts: "export VAR=VALUE" construct is not portable | 22 July 2014, 17:22:57 UTC |
| bba6acb | Junio C Hamano | 22 July 2014, 17:17:34 UTC | Merge branch 'maint-1.9' into maint * maint-1.9: Documentation: fix missing text for rev-parse --verify | 22 July 2014, 17:17:34 UTC |
| d31f3ad | Junio C Hamano | 22 July 2014, 17:16:50 UTC | Merge branch 'maint-1.8.5' into maint-1.9 * maint-1.8.5: Documentation: fix missing text for rev-parse --verify | 22 July 2014, 17:16:50 UTC |
| e6aaa39 | brian m. carlson | 21 July 2014, 23:00:35 UTC | Documentation: fix missing text for rev-parse --verify The caret (^) is used as a markup symbol in AsciiDoc. Due to the inability of AsciiDoc to parse a line containing an unmatched caret, it omitted the line from the output, resulting in the man page missing the end of a sentence. Escape this caret so that the man page ends up with the complete text. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2014, 17:10:57 UTC |
| 9ab0882 | Junio C Hamano | 21 July 2014, 19:35:39 UTC | Merge branch 'maint' * maint: use xmemdupz() to allocate copies of strings given by start and length use xcalloc() to allocate zero-initialized memory | 21 July 2014, 19:35:39 UTC |
| 0eff86e | Junio C Hamano | 21 July 2014, 19:13:03 UTC | Ninth batch for 2.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2014, 19:13:03 UTC |
| 3fa1025 | Christian Couder | 19 July 2014, 15:01:15 UTC | replace: add test for --graft with a mergetag Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2014, 19:07:04 UTC |
| 25a05a8 | Christian Couder | 19 July 2014, 15:01:14 UTC | replace: check mergetags when using --graft When using --graft, with a mergetag in the original commit, we should check that the commit pointed to by the mergetag is still a parent of then new commit we create, otherwise the mergetag could be misleading. If the commit pointed to by the mergetag is no more a parent of the new commit, we could remove the mergetag, but in this case there is a good chance that the title or other elements of the commit might also be misleading. So let's just error out and suggest to use --edit instead on the commit. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2014, 19:06:49 UTC |
| 60e2f5a | Christian Couder | 19 July 2014, 15:01:13 UTC | replace: add test for --graft with signed commit Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2014, 19:06:20 UTC |
| 0b05ab6 | Christian Couder | 19 July 2014, 15:01:12 UTC | replace: remove signature when using --graft It could be misleading to keep a signature in a replacement commit, so let's remove it. Note that there should probably be a way to sign the replacement commit created when using --graft, but this can be dealt with in another commit or patch series. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2014, 19:05:58 UTC |
| b0ab2b7 | Christian Couder | 19 July 2014, 15:01:11 UTC | contrib: add convert-grafts-to-replace-refs.sh This patch adds into contrib/ an example script to convert grafts from an existing grafts file into replace refs using the new --graft option of "git replace". While at it let's mention this new script in the "git replace" documentation for the --graft option. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2014, 19:05:53 UTC |
| 78024c4 | Christian Couder | 19 July 2014, 15:01:10 UTC | Documentation: replace: add --graft option Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2014, 19:05:47 UTC |
| adf8e54 | Christian Couder | 19 July 2014, 15:01:09 UTC | replace: add test for --graft Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2014, 19:04:40 UTC |
| 4228e8b | Christian Couder | 19 July 2014, 15:01:08 UTC | replace: add --graft option The usage string for this option is: git replace [-f] --graft <commit> [<parent>...] First we create a new commit that is the same as <commit> except that its parents are [<parents>...] Then we create a replace ref that replace <commit> with the commit we just created. With this new option, it should be straightforward to convert grafts to replace refs. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2014, 19:04:23 UTC |
| 528396a | Junio C Hamano | 21 July 2014, 18:18:57 UTC | Merge branch 'rs/unify-is-branch' * rs/unify-is-branch: refs.c: add a public is_branch function | 21 July 2014, 18:18:57 UTC |
| fb0166c | Junio C Hamano | 21 July 2014, 18:18:54 UTC | Merge branch 'kb/avoid-fchmod-for-now' Replaces the only two uses of fchmod() with chmod() because the former does not work on Windows port and because luckily we can. * kb/avoid-fchmod-for-now: config: use chmod() instead of fchmod() | 21 July 2014, 18:18:54 UTC |
| 80e8575 | Junio C Hamano | 21 July 2014, 18:18:50 UTC | Merge branch 'sk/mingw-uni-fix' * sk/mingw-uni-fix: Win32: Unicode file name support (dirent) Win32: Unicode file name support (except dirent) | 21 July 2014, 18:18:50 UTC |
| a8c565b | Junio C Hamano | 21 July 2014, 18:18:46 UTC | Merge branch 'ek/alt-odb-entry-fix' * ek/alt-odb-entry-fix: sha1_file: do not add own object directory as alternate | 21 July 2014, 18:18:46 UTC |
| 9b1c2a3 | Junio C Hamano | 21 July 2014, 18:18:44 UTC | Merge branch 'kb/hashmap-updates' * kb/hashmap-updates: hashmap: add string interning API hashmap: add simplified hashmap_get_from_hash() API hashmap: improve struct hashmap member documentation hashmap: factor out getting a hash code from a SHA1 | 21 July 2014, 18:18:44 UTC |
| 0ac7443 | Junio C Hamano | 21 July 2014, 18:18:40 UTC | Merge branch 'jk/remote-curl-squelch-extra-errors' * jk/remote-curl-squelch-extra-errors: remote-curl: mark helper-protocol errors more clearly remote-curl: use error instead of fprintf(stderr) remote-curl: do not complain on EOF from parent git | 21 July 2014, 18:18:41 UTC |
| 19a249b | Junio C Hamano | 21 July 2014, 18:18:37 UTC | Merge branch 'rs/ref-transaction-0' Early part of the "ref transaction" topic. * rs/ref-transaction-0: refs.c: change ref_transaction_update() to do error checking and return status refs.c: remove the onerr argument to ref_transaction_commit update-ref: use err argument to get error from ref_transaction_commit refs.c: make update_ref_write update a strbuf on failure refs.c: make ref_update_reject_duplicates take a strbuf argument for errors refs.c: log_ref_write should try to return meaningful errno refs.c: make resolve_ref_unsafe set errno to something meaningful on error refs.c: commit_packed_refs to return a meaningful errno on failure refs.c: make remove_empty_directories always set errno to something sane refs.c: verify_lock should set errno to something meaningful refs.c: make sure log_ref_setup returns a meaningful errno refs.c: add an err argument to repack_without_refs lockfile.c: make lock_file return a meaningful errno on failurei lockfile.c: add a new public function unable_to_lock_message refs.c: add a strbuf argument to ref_transaction_commit for error logging refs.c: allow passing NULL to ref_transaction_free refs.c: constify the sha arguments for ref_transaction_create|delete|update refs.c: ref_transaction_commit should not free the transaction refs.c: remove ref_transaction_rollback | 21 July 2014, 18:18:37 UTC |
| ad25da0 | Junio C Hamano | 21 July 2014, 18:18:30 UTC | Merge branch 'jl/submodule-tests' * jl/submodule-tests: revert: add t3513 for submodule updates stash: add t3906 for submodule updates am: add t4255 for submodule updates cherry-pick: add t3512 for submodule updates pull: add t5572 for submodule updates rebase: add t3426 for submodule updates merge: add t7613 for submodule updates bisect: add t6041 for submodule updates reset: add t7112 for submodule updates read-tree: add t1013 for submodule updates apply: add t4137 for submodule updates checkout: call the new submodule update test framework submodules: add the lib-submodule-update.sh test library test-lib: add test_dir_is_empty() | 21 July 2014, 18:18:31 UTC |
