| 0065343 | Junio C Hamano | 18 January 2012, 23:46:31 UTC | Git 1.7.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2012, 23:46:31 UTC |
| 5c8eeb8 | Nguyen Thai Ngoc Duy | 15 January 2012, 10:03:27 UTC | diff-index: enable recursive pathspec matching in unpack_trees The pathspec structure has a few bits of data to drive various operation modes after we unified the pathspec matching logic in various codepaths. For example, max_depth field is there so that "git grep" can limit the output for files found in limited depth of tree traversal. Also in order to show just the surface level differences in "git diff-tree", recursive field stops us from descending into deeper level of the tree structure when it is set to false, and this also affects pathspec matching when we have wildcards in the pathspec. The diff-index has always wanted the recursive behaviour, and wanted to match pathspecs without any depth limit. But we forgot to do so when we updated tree_entry_interesting() logic to unify the pathspec matching logic. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2012, 23:44:02 UTC |
| 8f83acf | Junio C Hamano | 13 January 2012, 07:31:41 UTC | Update draft release notes to 1.7.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 07:31:41 UTC |
| 901c907 | Junio C Hamano | 13 January 2012, 07:31:05 UTC | Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base | 13 January 2012, 07:31:05 UTC |
| 04f6785 | Junio C Hamano | 13 January 2012, 07:30:53 UTC | Update draft release notes to 1.7.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 07:30:53 UTC |
| 15f07e0 | Jeff King | 12 January 2012, 22:32:34 UTC | thin-pack: try harder to use preferred base objects as base When creating a pack using objects that reside in existing packs, we try to avoid recomputing futile delta between an object (trg) and a candidate for its base object (src) if they are stored in the same packfile, and trg is not recorded as a delta already. This heuristics makes sense because it is likely that we tried to express trg as a delta based on src but it did not produce a good delta when we created the existing pack. As the pack heuristics prefer producing delta to remove data, and Linus's law dictates that the size of a file grows over time, we tend to record the newest version of the file as inflated, and older ones as delta against it. When creating a thin-pack to transfer recent history, it is likely that we will try to send an object that is recorded in full, as it is newer. But the heuristics to avoid recomputing futile delta effectively forbids us from attempting to express such an object as a delta based on another object. Sending an object in full is often more expensive than sending a suboptimal delta based on other objects, and it is even more so if we could use an object we know the receiving end already has (i.e. preferred base object) as the delta base. Tweak the recomputation avoidance logic, so that we do not punt on computing delta against a preferred base object. The effect of this change can be seen on two simulated upload-pack workloads. The first is based on 44 reflog entries from my git.git origin/master reflog, and represents the packs that kernel.org sent me git updates for the past month or two. The second workload represents much larger fetches, going from git's v1.0.0 tag to v1.1.0, then v1.1.0 to v1.2.0, and so on. The table below shows the average generated pack size and the average CPU time consumed for each dataset, both before and after the patch: dataset | reflog | tags --------------------------------- before | 53358 | 2750977 size after | 32398 | 2668479 change | -39% | -3% --------------------------------- before | 0.18 | 1.12 CPU after | 0.18 | 1.15 change | +0% | +3% This patch makes a much bigger difference for packs with a shorter slice of history (since its effect is seen at the boundaries of the pack) though it has some benefit even for larger packs. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 07:06:20 UTC |
| afb6b56 | Junio C Hamano | 12 January 2012, 03:11:00 UTC | Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: attr: fix leak in free_attr_elem t2203: fix wrong commit command | 12 January 2012, 03:11:00 UTC |
| 37475f9 | Jeff King | 12 January 2012, 03:05:03 UTC | attr: fix leak in free_attr_elem This function frees the individual "struct match_attr"s we have allocated, but forgot to free the array holding their pointers, leading to a minor memory leak (but it can add up after checking attributes for paths in many directories). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2012, 03:07:23 UTC |
| 592ed56 | Nguyễn Thái Ngọc Duy | 11 January 2012, 03:21:38 UTC | t2203: fix wrong commit command Add commit message to avoid commit's aborting due to the lack of commit message, not because there are INTENT_TO_ADD entries in index. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2012, 08:09:36 UTC |
| 804e97f | Junio C Hamano | 10 January 2012, 22:16:49 UTC | Prepare for 1.7.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 22:16:49 UTC |
| 6c65b5e | Junio C Hamano | 10 January 2012, 22:14:26 UTC | Merge the attributes fix in from maint-1.6.6 branch Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 22:14:26 UTC |
| f14f980 | Junio C Hamano | 10 January 2012, 21:11:03 UTC | Prepare for 1.7.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 21:11:03 UTC |
| b6fb7fe | Junio C Hamano | 10 January 2012, 14:57:27 UTC | Documentation: rerere's rr-cache auto-creation and rerere.enabled The description of rerere.enabled left the user in the dark as to who might create an rr-cache directory. Add a note that simply invoking rerere does this. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 20:59:31 UTC |
| c432ef9 | Junio C Hamano | 10 January 2012, 20:28:38 UTC | attr.c: clarify the logic to pop attr_stack Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 20:28:38 UTC |
| 909ca7b | Junio C Hamano | 10 January 2012, 20:27:37 UTC | attr.c: make bootstrap_attr_stack() leave early Thas would de-dent the body of a function that has grown rather large over time, making it a bit easier to read. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 20:27:37 UTC |
| 77f7f82 | Jeff King | 10 January 2012, 19:32:06 UTC | attr: drop misguided defensive coding In prepare_attr_stack, we pop the old elements of the stack (which were left from a previous lookup and may or may not be useful to us). Our loop to do so checks that we never reach the top of the stack. However, the code immediately afterwards will segfault if we did actually reach the top of the stack. Fortunately, this is not an actual bug, since we will never pop all of the stack elements (we will always keep the root gitattributes, as well as the builtin ones). So the extra check in the loop condition simply clutters the code and makes the intent less clear. Let's get rid of it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 19:55:27 UTC |
| 1afca44 | Jeff King | 10 January 2012, 18:08:21 UTC | attr: don't confuse prefixes with leading directories When we prepare the attribute stack for a lookup on a path, we start with the cached stack from the previous lookup (because it is common to do several lookups in the same directory hierarchy). So the first thing we must do in preparing the stack is to pop any entries that point to directories we are no longer interested in. For example, if our stack contains gitattributes for: foo/bar/baz foo/bar foo but we want to do a lookup in "foo/bar/bleep", then we want to pop the top element, but retain the others. To do this we walk down the stack from the top, popping elements that do not match our lookup directory. However, the test do this simply checked strncmp, meaning we would mistake "foo/bar/baz" as a leading directory of "foo/bar/baz_plus". We must also check that the character after our match is '/', meaning we matched the whole path component. There are two special cases to consider: 1. The top of our attr stack has the empty path. So we must not check for '/', but rather special-case the empty path, which always matches. 2. Typically when matching paths in this way, you would also need to check for a full string match (i.e., the character after is '\0'). We don't need to do so in this case, though, because our path string is actually just the directory component of the path to a file (i.e., we know that it terminates with "/", because the filename comes after that). Helped-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 19:25:40 UTC |
| 8769e93 | Junio C Hamano | 06 January 2012, 20:35:05 UTC | Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: Documentation: rerere.enabled is the primary way to configure rerere | 06 January 2012, 20:35:05 UTC |
| 07b88a0 | Thomas Rast | 06 January 2012, 13:08:02 UTC | Documentation: rerere.enabled is the primary way to configure rerere The wording seems to suggest that creating the directory is needed and the setting of rerere.enabled is only for disabling the feature by setting it to 'false'. But the configuration is meant to be the primary control and setting it to 'true' will enable it; the rr-cache directory will be created as necessary and the user does not have to create it. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2012, 20:27:59 UTC |
| c07aa5b | Junio C Hamano | 03 January 2012, 21:47:15 UTC | Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore | 03 January 2012, 21:47:15 UTC |
| 9e6ed47 | Jens Lehmann | 01 January 2012, 15:13:16 UTC | docs: describe behavior of relative submodule URLs Since the relative submodule URLs have been introduced in f31a522a2d, they do not conform to the rules for resolving relative URIs but rather to those of relative directories. Document that behavior. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 20:47:58 UTC |
| 5c951ef | Clemens Buchacher | 31 December 2011, 11:50:56 UTC | Documentation: read-tree --prefix works with existing subtrees Since 34110cd4 (Make 'unpack_trees()' have a separate source and destination index) it is no longer true that a subdirectory with the same prefix must not exist. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2012, 09:18:53 UTC |
| 0eddcbf | Jack Nagel | 29 December 2011, 04:42:05 UTC | Add MYMETA.json to perl/.gitignore ExtUtils::MakeMaker generates MYMETA.json in addition to MYMETA.yml since version 6.57_07. As it suggests, it is just meta information about the build and is cleaned up with 'make clean', so it should be ignored. Signed-off-by: Jack Nagel <jacknagel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2011, 21:08:47 UTC |
| 66c11f0 | Junio C Hamano | 14 December 2011, 05:55:31 UTC | Git 1.7.7.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2011, 05:55:31 UTC |
| c0eb9cc | Junio C Hamano | 14 December 2011, 05:47:51 UTC | Merge branch 'ab/clang-lints' into maint-1.7.7 * ab/clang-lints: cast variable in call to free() in builtin/diff.c and submodule.c apply: get rid of useless x < 0 comparison on a size_t type | 14 December 2011, 05:47:51 UTC |
| 3b42565 | Junio C Hamano | 14 December 2011, 05:47:08 UTC | Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7 * nd/maint-ignore-exclude: checkout,merge: loosen overwriting untracked file check based on info/exclude | 14 December 2011, 05:47:08 UTC |
| 7857e32 | Junio C Hamano | 14 December 2011, 05:44:56 UTC | Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: Git 1.7.6.5 blame: don't overflow time buffer fetch: create status table using strbuf Conflicts: Documentation/git.txt GIT-VERSION-GEN RelNotes | 14 December 2011, 05:44:56 UTC |
| 15b7898 | Junio C Hamano | 14 December 2011, 05:30:40 UTC | Git 1.7.6.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2011, 05:32:30 UTC |
| 52b195f | Junio C Hamano | 14 December 2011, 05:21:30 UTC | Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6 * jk/maint-fetch-status-table: fetch: create status table using strbuf | 14 December 2011, 05:21:30 UTC |
| 43176d1 | Junio C Hamano | 14 December 2011, 05:12:34 UTC | Merge branch 'jc/maint-name-rev-all' into maint-1.7.6 * jc/maint-name-rev-all: name-rev --all: do not even attempt to describe non-commit object | 14 December 2011, 05:12:34 UTC |
| 6d1cdad | Junio C Hamano | 14 December 2011, 05:12:14 UTC | Merge branch 'ml/mailmap' into maint-1.7.6 * ml/mailmap: mailmap: xcalloc mailmap_info Conflicts: mailmap.c | 14 December 2011, 05:12:14 UTC |
| c3ea051 | Jeff King | 08 December 2011, 10:25:54 UTC | blame: don't overflow time buffer When showing the raw timestamp, we format the numeric seconds-since-epoch into a buffer, followed by the timezone string. This string has come straight from the commit object. A well-formed object should have a timezone string of only a few bytes, but we could be operating on data pushed by a malicious user. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2011, 05:09:06 UTC |
| 5914f2d | Jeff King | 08 December 2011, 08:43:19 UTC | fetch: create status table using strbuf When we fetch from a remote, we print a status table like: From url * [new branch] foo -> origin/foo We create this table in a static buffer using sprintf. If the remote refnames are long, they can overflow this buffer and smash the stack. Instead, let's use a strbuf to build the string. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2011, 07:17:00 UTC |
| 7919704 | Martin von Zweigbergk | 09 December 2011, 07:30:45 UTC | am: don't persist keepcr flag The keepcr flag is only used in the split_patches function, which is only called before a patch application has to stopped for user input, not after resuming. It is therefore unnecessary to persist the flag. This seems to have been the case since it was introduced in ad2c928 (git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit, 2010-02-27). Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2011, 18:49:43 UTC |
| 956d86d | Erik Faye-Lund | 08 December 2011, 19:39:57 UTC | mingw: give waitpid the correct signature POSIX says that last parameter to waitpid should be 'int', so let's make it so. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2011, 18:46:52 UTC |
| a8d05d7 | Michael Haggerty | 07 December 2011, 15:20:16 UTC | git symbolic-ref: documentation fix The old "git symbolic-ref" manpage seemed to imply in one place that symlinks are still the default way to represent symbolic references and in another that symlinks are deprecated. Fix the text and shorten the justification for the change of implementation. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 December 2011, 19:10:12 UTC |
| c34ba99 | Junio C Hamano | 05 December 2011, 23:07:49 UTC | Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: stripspace: fix outdated comment Add MYMETA.yml to perl/.gitignore | 05 December 2011, 23:07:49 UTC |
| c2857fb | Jeff King | 05 December 2011, 22:29:15 UTC | stripspace: fix outdated comment The comment on top of stripspace() claims that the buffer will no longer be NUL-terminated. However, this has not been the case at least since the move to using strbuf in 2007. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2011, 23:04:38 UTC |
| 332de7a | Sebastian Morr | 02 December 2011, 22:55:28 UTC | Add MYMETA.yml to perl/.gitignore This file is auto-generated by newer versions of ExtUtils::MakeMaker (presumably starting with the version shipping with Perl 5.14). It just contains extra information about the environment and arguments to the Makefile-building process, and should be ignored. Signed-off-by: Sebastian Morr <sebastian@morr.cc> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2011, 22:42:40 UTC |
| fc001b5 | Nguyễn Thái Ngọc Duy | 27 November 2011, 10:15:32 UTC | checkout,merge: loosen overwriting untracked file check based on info/exclude Back in 1127148 (Loosen "working file will be lost" check in Porcelain-ish - 2006-12-04), git-checkout.sh learned to quietly overwrite ignored files. Howver the code only took .gitignore files into account. Standard ignored files include all specified in .gitignore files in working directory _and_ $GIT_DIR/info/exclude. This patch makes sure ignored files in info/exclude can also be overwritten automatically in the spirit of the original patch. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2011, 18:37:50 UTC |
| 1e501a7 | Thomas Hochstein | 14 November 2011, 22:55:52 UTC | documentation fix: git difftool uses diff tools, not merge tools. Let the documentation for -t list valid *diff* tools, not valid *merge* tools. Signed-off-by: Thomas Hochstein <thh@inter.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2011, 17:14:34 UTC |
| bd5bce7 | Junio C Hamano | 18 November 2011, 19:28:05 UTC | Git 1.7.7.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 November 2011, 19:28:05 UTC |
| c9de921 | Junio C Hamano | 18 November 2011, 19:14:16 UTC | Merge branch 'jc/maint-name-rev-all' into maint * jc/maint-name-rev-all: name-rev --all: do not even attempt to describe non-commit object | 18 November 2011, 19:14:16 UTC |
| 79cfe0c | Junio C Hamano | 18 November 2011, 19:14:00 UTC | Merge branch 'ml/mailmap' into maint * ml/mailmap: mailmap: xcalloc mailmap_info Conflicts: mailmap.c | 18 November 2011, 19:14:00 UTC |
| 01e0f16 | Junio C Hamano | 18 November 2011, 19:11:50 UTC | Merge branch 'jn/maint-notes-avoid-va-args' into maint * jn/maint-notes-avoid-va-args: notes merge: eliminate OUTPUT macro Conflicts: notes-merge.c | 18 November 2011, 19:11:50 UTC |
| 487da9c | Jonathan Nieder | 18 November 2011, 10:02:02 UTC | Makefile: add missing header file dependencies When the streaming filter API was introduced in v1.7.7-rc0~60^2~7 (2011-05-20), we forgot to add its header to LIB_H. Most translation units depend on streaming.h via cache.h. v1.7.5-rc0~48 (Fix sparse warnings, 2011-03-22) introduced undeclared dependencies by url.o on url.h and thread-utils.o on thread-utils.h. Noticed by make CHECK_HEADER_DEPENDENCIES=1. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 November 2011, 18:45:33 UTC |
| 5f9f8d1 | Jonathan Nieder | 18 November 2011, 01:27:46 UTC | notes merge: eliminate OUTPUT macro The macro is variadic, which breaks support for pre-C99 compilers, and it hides an "if", which can make code hard to understand on first reading if some arguments have side-effects. The OUTPUT macro seems to have been inspired by the "output" function from merge-recursive. But that function in merge-recursive exists to indent output based on the level of recursion and there is no similar justification for such a function in "notes merge". Noticed with 'make CC="gcc -std=c89 -pedantic"': notes-merge.c:24:22: warning: anonymous variadic macros were introduced in C99 [-Wvariadic-macros] Encouraged-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 November 2011, 07:35:22 UTC |
| 74b531f | Marc-André Lureau | 17 November 2011, 01:25:06 UTC | mailmap: xcalloc mailmap_info This is to avoid reaching free of uninitialized members. With an invalid .mailmap (and perhaps in other cases), it can reach free(mi->name) with garbage for example. Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 November 2011, 02:00:56 UTC |
| e8b14d7 | Junio C Hamano | 15 November 2011, 23:51:05 UTC | name-rev --all: do not even attempt to describe non-commit object This even dates back to the very beginning of "git name-rev"; it does not make much sense to dump all objects in the repository and label non-commits as "undefined". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 November 2011, 23:51:05 UTC |
| d4d5ab4 | Junio C Hamano | 09 November 2011, 00:37:00 UTC | Git 1.7.7.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 November 2011, 00:37:00 UTC |
| 916034b | Junio C Hamano | 09 November 2011, 00:35:53 UTC | Merge branch 'jc/maint-remove-renamed-ref' into maint * jc/maint-remove-renamed-ref: branch -m/-M: remove undocumented RENAMED-REF Conflicts: refs.c | 09 November 2011, 00:35:53 UTC |
| 1a61a9d | Junio C Hamano | 09 November 2011, 00:26:50 UTC | Merge branch 'jm/maint-gitweb-filter-forks-fix' into maint * jm/maint-gitweb-filter-forks-fix: gitweb: fix regression when filtering out forks | 09 November 2011, 00:26:50 UTC |
| 992499d | Junio C Hamano | 09 November 2011, 00:26:45 UTC | Merge branch 'dm/pack-objects-update' into maint * dm/pack-objects-update: pack-objects: don't traverse objects unnecessarily pack-objects: rewrite add_descendants_to_write_order() iteratively pack-objects: use unsigned int for counter and offset values pack-objects: mark add_to_write_order() as inline | 09 November 2011, 00:26:45 UTC |
| fcbebfd | Junio C Hamano | 08 November 2011, 18:17:40 UTC | docs: Update install-doc-quick The preformatted documentation pages live in their own repositories these days. Adjust the installation procedure to the updated layout. Tested-by: Stefan Naewe <stefan.naewe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 November 2011, 21:37:10 UTC |
| 939ca96 | Jeff King | 08 November 2011, 21:29:30 UTC | docs: don't mention --quiet or --exit-code in git-log(1) These are diff-options, but they don't actually make sense in the context of log. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 November 2011, 21:37:02 UTC |
| 83838d5 | Ævar Arnfjörð Bjarmason | 06 November 2011, 12:06:23 UTC | cast variable in call to free() in builtin/diff.c and submodule.c Both of these free() calls are freeing a "const unsigned char (*)[20]" type while free() expects a "void *". This results in the following warning under clang 2.9: builtin/diff.c:185:7: warning: passing 'const unsigned char (*)[20]' to parameter of type 'void *' discards qualifiers free(parent); ^~~~~~ submodule.c:394:7: warning: passing 'const unsigned char (*)[20]' to parameter of type 'void *' discards qualifiers free(parents); ^~~~~~~ This free()-ing without a cast was added by Jim Meyering to builtin/diff.c in v1.7.6-rc3~4 and later by Fredrik Gustafsson in submodule.c in v1.7.7-rc1~25^2. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 November 2011, 18:43:18 UTC |
| 473f4c9 | Ævar Arnfjörð Bjarmason | 06 November 2011, 12:06:22 UTC | apply: get rid of useless x < 0 comparison on a size_t type According to the C standard size_t is always unsigned, therefore the comparison "n1 < 0 || n2 < 0" when n1 and n2 are size_t will always be false. This was raised by clang 2.9 which throws this warning when compiling apply.c: builtin/apply.c:253:9: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare] if (n1 < 0 || n2 < 0) ~~ ^ ~ builtin/apply.c:253:19: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare] if (n1 < 0 || n2 < 0) ~~ ^ ~ This check was originally added in v1.6.5-rc0~53^2 by Giuseppe Bilotta while adding an option to git-apply to ignore whitespace differences. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 November 2011, 18:36:59 UTC |
| 8d19b44 | Junio C Hamano | 01 November 2011, 23:16:36 UTC | Git 1.7.7.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 November 2011, 23:41:57 UTC |
| 60a31ec | Junio C Hamano | 01 November 2011, 23:41:41 UTC | Merge branch 'rs/maint-estimate-cache-size' into maint * rs/maint-estimate-cache-size: t7511: avoid use of reserved filename on Windows. | 01 November 2011, 23:41:41 UTC |
| ac7acaa | Junio C Hamano | 01 November 2011, 23:12:19 UTC | Merge branch 'md/smtp-tls-hello-again' into maint * md/smtp-tls-hello-again: send-email: Honour SMTP domain when using TLS | 01 November 2011, 23:12:19 UTC |
| 0814d6e | Junio C Hamano | 01 November 2011, 23:11:00 UTC | Merge branch 'jk/pull-rebase-with-work-tree' into maint * jk/pull-rebase-with-work-tree: pull,rebase: handle GIT_WORK_TREE better Conflicts: git-pull.sh | 01 November 2011, 23:11:00 UTC |
| eee947f | Junio C Hamano | 01 November 2011, 23:10:56 UTC | Merge branch 'jc/maint-diffstat-numstat-context' into maint * jc/maint-diffstat-numstat-context: diff: teach --stat/--numstat to honor -U$num | 01 November 2011, 23:10:56 UTC |
| dddc411 | Junio C Hamano | 01 November 2011, 23:03:35 UTC | Merge branch 'js/bisect-no-checkout' into maint * js/bisect-no-checkout: bisect: fix exiting when checkout failed in bisect_start() | 01 November 2011, 23:03:35 UTC |
| a4fdd79 | Junio C Hamano | 01 November 2011, 22:54:45 UTC | Merge branch 'bc/attr-ignore-case' into maint * bc/attr-ignore-case: attr.c: respect core.ignorecase when matching attribute patterns attr: read core.attributesfile from git_default_core_config builtin/mv.c: plug miniscule memory leak cleanup: use internal memory allocation wrapper functions everywhere attr.c: avoid inappropriate access to strbuf "buf" member Conflicts: remote.c | 01 November 2011, 22:54:46 UTC |
| ffa4c36 | Junio C Hamano | 01 November 2011, 22:51:01 UTC | Merge branch 'cn/fetch-prune' into maint * cn/fetch-prune: fetch: treat --tags like refs/tags/*:refs/tags/* when pruning fetch: honor the user-provided refspecs when pruning refs remote: separate out the remote_find_tracking logic into query_refspecs t5510: add tests for fetch --prune fetch: free all the additional refspecs | 01 November 2011, 22:51:01 UTC |
| 7fa6c90 | Junio C Hamano | 01 November 2011, 22:45:16 UTC | Merge branch 'sp/smart-http-failure' into maint * sp/smart-http-failure: remote-curl: Fix warning after HTTP failure | 01 November 2011, 22:45:16 UTC |
| 5b5d92a | Junio C Hamano | 01 November 2011, 22:42:25 UTC | Merge jn/maint-http-error-message * commit 'be22d92eac809ad2bfa2b7c83ad7cad5a15f1c43': http: avoid empty error messages for some curl errors http: remove extra newline in error message | 01 November 2011, 22:42:25 UTC |
| b323c64 | Pat Thoyts | 31 October 2011, 14:07:27 UTC | t7511: avoid use of reserved filename on Windows. PRN is a special filename on Windows to send data to the printer. As this is generated during test 3 substitute an alternate prefix to avoid this. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2011, 19:31:42 UTC |
| a76a326 | Junio C Hamano | 27 October 2011, 19:03:16 UTC | Merge branch 'rs/maint-estimate-cache-size' into maint * rs/maint-estimate-cache-size: read-cache.c: fix index memory allocation | 27 October 2011, 19:03:16 UTC |
| 8debf69 | Richard Hartmann | 27 October 2011, 16:46:53 UTC | clone: Quote user supplied path in a single quote pair Without this patch, $ git clone foo . results in this: Cloning into .... done. With it: Cloning into '.'... done. Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2011, 19:02:02 UTC |
| 25f745f | Junio C Hamano | 26 October 2011, 23:13:31 UTC | Merge branch 'jn/gitweb-highlite-sanitise' into maint * jn/gitweb-highlite-sanitise: gitweb: Strip non-printable characters from syntax highlighter output | 26 October 2011, 23:13:31 UTC |
| 60f60b4 | Junio C Hamano | 26 October 2011, 23:13:31 UTC | Merge branch 'jk/argv-array' into maint * jk/argv-array: run_hook: use argv_array API checkout: use argv_array API bisect: use argv_array API quote: provide sq_dequote_to_argv_array refactor argv_array into generic code quote.h: fix bogus comment add sha1_array API docs | 26 October 2011, 23:13:31 UTC |
| 7bb07f6 | Junio C Hamano | 26 October 2011, 23:13:31 UTC | Merge branch 'jc/run-receive-hook-cleanup' into maint * jc/run-receive-hook-cleanup: refactor run_receive_hook() | 26 October 2011, 23:13:31 UTC |
| a5ad8d1 | Junio C Hamano | 26 October 2011, 23:13:31 UTC | Merge branch 'cn/eradicate-working-copy' into maint * cn/eradicate-working-copy: Remove 'working copy' from the documentation and C code | 26 October 2011, 23:13:31 UTC |
| f0911b9 | Junio C Hamano | 26 October 2011, 23:13:27 UTC | Merge branch 'maint-1.7.6' into maint * maint-1.7.6: notes_merge_commit(): do not pass temporary buffer to other function gitweb: Fix links to lines in blobs when javascript-actions are enabled mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files t9159-*.sh: skip for mergeinfo test for svn <= 1.4 date.c: Support iso8601 timezone formats remote: only update remote-tracking branch if updating refspec remote rename: warn when refspec was not updated remote: "rename o foo" should not rename ref "origin/bar" remote: write correct fetch spec when renaming remote 'remote' | 26 October 2011, 23:13:27 UTC |
| 8280baf | Junio C Hamano | 26 October 2011, 23:12:48 UTC | Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6 * mh/maint-notes-merge-pathbuf-fix: notes_merge_commit(): do not pass temporary buffer to other function | 26 October 2011, 23:12:48 UTC |
| 58f75bc | Junio C Hamano | 26 October 2011, 23:12:35 UTC | Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6 * ps/gitweb-js-with-lineno: gitweb: Fix links to lines in blobs when javascript-actions are enabled | 26 October 2011, 23:12:35 UTC |
| 87d99c6 | Junio C Hamano | 26 October 2011, 23:12:25 UTC | Merge branch 'jm/mergetool-pathspec' into maint-1.7.6 * jm/mergetool-pathspec: mergetool: no longer need to save standard input mergetool: Use args as pathspec to unmerged files | 26 October 2011, 23:12:25 UTC |
| 716b64a | Junio C Hamano | 26 October 2011, 23:12:19 UTC | Merge branch 'mz/remote-rename' into maint-1.7.6 * mz/remote-rename: remote: only update remote-tracking branch if updating refspec remote rename: warn when refspec was not updated remote: "rename o foo" should not rename ref "origin/bar" remote: write correct fetch spec when renaming remote 'remote' | 26 October 2011, 23:12:19 UTC |
| 8371e91 | Junio C Hamano | 26 October 2011, 23:12:13 UTC | Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6 * rj/maint-t9159-svn-rev-notation: t9159-*.sh: skip for mergeinfo test for svn <= 1.4 | 26 October 2011, 23:12:13 UTC |
| 1f7a2ab | Junio C Hamano | 26 October 2011, 23:11:28 UTC | Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6 * hl/iso8601-more-zone-formats: date.c: Support iso8601 timezone formats | 26 October 2011, 23:11:28 UTC |
| 411e6cf | Junio C Hamano | 26 October 2011, 23:09:28 UTC | Merge branch 'maint-1.7.6' into maint * maint-1.7.6: make the sample pre-commit hook script reject names with newlines, too git-read-tree.txt: update sparse checkout examples git-read-tree.txt: correct sparse-checkout and skip-worktree description git-read-tree.txt: language and typography fixes unpack-trees: print "Aborting" to stderr Documentation/git-update-index: refer to 'ls-files' Documentation: basic configuration of notes.rewriteRef | 26 October 2011, 23:09:28 UTC |
| 588150b | Junio C Hamano | 26 October 2011, 23:09:04 UTC | Merge branch 'tr/doc-note-rewrite' into maint-1.7.6 * tr/doc-note-rewrite: Documentation: basic configuration of notes.rewriteRef | 26 October 2011, 23:09:04 UTC |
| 139088b | Junio C Hamano | 26 October 2011, 23:09:04 UTC | Merge branch 'nd/sparse-doc' into maint-1.7.6 * nd/sparse-doc: git-read-tree.txt: update sparse checkout examples | 26 October 2011, 23:09:04 UTC |
| df9701e | Junio C Hamano | 26 October 2011, 23:09:03 UTC | Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6 * mg/maint-doc-sparse-checkout: git-read-tree.txt: correct sparse-checkout and skip-worktree description git-read-tree.txt: language and typography fixes unpack-trees: print "Aborting" to stderr | 26 October 2011, 23:09:03 UTC |
| a574c04 | Junio C Hamano | 26 October 2011, 23:08:19 UTC | Merge branch 'maint-1.7.5' into maint-1.7.6 * maint-1.7.5: make the sample pre-commit hook script reject names with newlines, too Reindent closing bracket using tab instead of spaces Documentation/git-update-index: refer to 'ls-files' | 26 October 2011, 23:08:19 UTC |
| 69d61da | Junio C Hamano | 26 October 2011, 23:08:14 UTC | Merge branch 'maint-1.7.4' into maint-1.7.5 * maint-1.7.4: make the sample pre-commit hook script reject names with newlines, too Reindent closing bracket using tab instead of spaces Documentation/git-update-index: refer to 'ls-files' | 26 October 2011, 23:08:14 UTC |
| ed36a48 | Junio C Hamano | 26 October 2011, 23:08:08 UTC | Merge branch 'maint-1.7.3' into maint-1.7.4 * maint-1.7.3: make the sample pre-commit hook script reject names with newlines, too Reindent closing bracket using tab instead of spaces Documentation/git-update-index: refer to 'ls-files' | 26 October 2011, 23:08:08 UTC |
| eb4e672 | Junio C Hamano | 26 October 2011, 23:08:00 UTC | Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3 * sn/doc-update-index-assume-unchanged: Documentation/git-update-index: refer to 'ls-files' | 26 October 2011, 23:08:00 UTC |
| 8f41c07 | René Scharfe | 24 October 2011, 01:01:27 UTC | read-cache.c: fix index memory allocation estimate_cache_size() tries to guess how much memory is needed for the in-memory representation of an index file. It does that by using the file size, the number of entries and the difference of the sizes of the on-disk and in-memory structs -- without having to check the length of the name of each entry, which varies for each entry, but their sums are the same no matter the representation. Except there can be a difference. First of all, the size is really calculated by ce_size and ondisk_ce_size based on offsetof(..., name), not sizeof, which can be different. And entries are padded with 1 to 8 NULs at the end (after the variable name) to make their total length a multiple of eight. So in order to allocate enough memory to hold the index, change the delta calculation to be based on offsetof(..., name) and round up to the next multiple of eight. On a 32-bit Linux, this delta was used before: sizeof(struct cache_entry) == 72 sizeof(struct ondisk_cache_entry) == 64 --- 8 The actual difference for an entry with a filename length of one was, however (find the definitions are in cache.h): offsetof(struct cache_entry, name) == 72 offsetof(struct ondisk_cache_entry, name) == 62 ce_size == (72 + 1 + 8) & ~7 == 80 ondisk_ce_size == (62 + 1 + 8) & ~7 == 64 --- 16 So eight bytes less had been allocated for such entries. The new formula yields the correct delta: (72 - 62 + 7) & ~7 == 16 Reported-by: John Hsing <tsyj2007@gmail.com> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 21:35:16 UTC |
| c14daa4 | Jim Meyering | 22 October 2011, 17:44:40 UTC | make the sample pre-commit hook script reject names with newlines, too The sample pre-commit hook script would fail to reject a file name like "a\nb" because of the way newlines are handled in "$(...)". Adjust the test to count filtered bytes and require there be 0. Also print all diagnostics to standard error, not stdout, so they will actually be seen. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 21:31:14 UTC |
| 982d1dc | Junio C Hamano | 24 October 2011, 06:55:22 UTC | Merge branch 'maint-1.7.3' into maint * maint-1.7.3: Reindent closing bracket using tab instead of spaces | 24 October 2011, 06:55:22 UTC |
| c4c42f2 | Nguyễn Thái Ngọc Duy | 24 October 2011, 04:24:51 UTC | Reindent closing bracket using tab instead of spaces Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 October 2011, 06:54:58 UTC |
| f7d958d | Junio C Hamano | 24 October 2011, 04:48:06 UTC | Git 1.7.7.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 October 2011, 04:48:06 UTC |
| 7fe74f5 | Jonathan Nieder | 22 October 2011, 11:11:07 UTC | RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting The change was actually about "git init -s" which sets the setgid bit on SysV-style systems to allow shared access to a repository, and can provoke errors on BSD-style systems, depending on how permissive the filesystem in use wants to be. More to the point, the patch was just taking a fix that arrived for FreeBSD in v1.5.5 days and making it also apply to machines using an (obscure) GNU userland/FreeBSD kernel mixture. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 October 2011, 04:16:31 UTC |
| 53c632f | Julien Muchembled | 21 October 2011, 19:04:21 UTC | gitweb: fix regression when filtering out forks This fixes a condition in filter_forks_from_projects_list that failed if process directory was different from project root: in such case, the subroutine was a no-op and forks were not detected. Signed-off-by: Julien Muchembled <jm@jmuchemb.eu> Tested-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 October 2011, 21:46:38 UTC |
| 8742218 | Junio C Hamano | 21 October 2011, 18:01:07 UTC | Almost ready for 1.7.7.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 October 2011, 18:01:07 UTC |
| d25a265 | Junio C Hamano | 21 October 2011, 17:49:26 UTC | Merge branch 'nd/maint-autofix-tag-in-head' into maint * nd/maint-autofix-tag-in-head: Accept tags in HEAD or MERGE_HEAD merge: remove global variable head[] merge: use return value of resolve_ref() to determine if HEAD is invalid merge: keep stash[] a local variable Conflicts: builtin/merge.c | 21 October 2011, 17:49:26 UTC |
| e63f87a | Junio C Hamano | 21 October 2011, 17:49:26 UTC | Merge branch 'jc/apply-blank-at-eof-fix' into maint * jc/apply-blank-at-eof-fix: apply --whitespace=error: correctly report new blank lines at end | 21 October 2011, 17:49:26 UTC |
| 6e89b37 | Junio C Hamano | 21 October 2011, 17:49:25 UTC | Merge branch 'jn/no-g-plus-s-on-bsd' into maint * jn/no-g-plus-s-on-bsd: Makefile: do not set setgid bit on directories on GNU/kFreeBSD | 21 October 2011, 17:49:25 UTC |
