Skip to main content

Browse the archive

swh:1:snp:87728f882295b5ba27035837248a04c5be121c53
sort by:
Revision Author Date Message Commit Date
e465796 Junio C Hamano 17 March 2016, 17:56:06 UTC Git 2.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 March 2016, 18:26:41 UTC
ce4d4e7 Junio C Hamano 17 March 2016, 18:26:18 UTC Merge branch 'maint-2.5' into maint-2.6 * maint-2.5: Git 2.5.5 Git 2.4.11 list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow 17 March 2016, 18:26:18 UTC
e568e56 Junio C Hamano 17 March 2016, 17:28:50 UTC Git 2.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 March 2016, 18:24:59 UTC
c638f3e Junio C Hamano 17 March 2016, 18:24:14 UTC Merge branch 'maint-2.4' into maint-2.5 * maint-2.4: Git 2.4.11 list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow 17 March 2016, 18:24:14 UTC
7654286 Junio C Hamano 17 March 2016, 17:00:44 UTC Git 2.4.11 Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 March 2016, 18:23:05 UTC
32c6dca Junio C Hamano 17 March 2016, 16:55:54 UTC Merge branch 'jk/path-name-safety-2.4' into maint-2.4 Bugfix patches were backported from the 'master' front to plug heap corruption holes, to catch integer overflow in the computation of pathname lengths, and to get rid of the name_path API. Both of these would have resulted in writing over an under-allocated buffer when formulating pathnames while tree traversal. * jk/path-name-safety-2.4: list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow 17 March 2016, 18:22:24 UTC
2824e18 Jeff King 11 February 2016, 22:28:36 UTC list-objects: pass full pathname to callbacks When we find a blob at "a/b/c", we currently pass this to our show_object_fn callbacks as two components: "a/b/" and "c". Callbacks which want the full value then call path_name(), which concatenates the two. But this is an inefficient interface; the path is a strbuf, and we could simply append "c" to it temporarily, then roll back the length, without creating a new copy. So we could improve this by teaching the callsites of path_name() this trick (and there are only 3). But we can also notice that no callback actually cares about the broken-down representation, and simply pass each callback the full path "a/b/c" as a string. The callback code becomes even simpler, then, as we do not have to worry about freeing an allocated buffer, nor rolling back our modification to the strbuf. This is theoretically less efficient, as some callbacks would not bother to format the final path component. But in practice this is not measurable. Since we use the same strbuf over and over, our work to grow it is amortized, and we really only pay to memcpy a few bytes. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 March 2016, 17:41:04 UTC
dc06dc8 Jeff King 11 February 2016, 22:26:44 UTC list-objects: drop name_path entirely In the previous commit, we left name_path as a thin wrapper around a strbuf. This patch drops it entirely. As a result, every show_object_fn callback needs to be adjusted. However, none of their code needs to be changed at all, because the only use was to pass it to path_name(), which now handles the bare strbuf. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 March 2016, 17:41:03 UTC
f3badae Jeff King 11 February 2016, 22:26:18 UTC list-objects: convert name_path to a strbuf The "struct name_path" data is examined in only two places: we generate it in process_tree(), and we convert it to a single string in path_name(). Everyone else just passes it through to those functions. We can further note that process_tree() already keeps a single strbuf with the leading tree path, for use with tree_entry_interesting(). Instead of building a separate name_path linked list, let's just use the one we already build in "base". This reduces the amount of code (especially tricky code in path_name() which did not check for integer overflows caused by deep or large pathnames). It is also more efficient in some instances. Any time we were using tree_entry_interesting, we were building up the strbuf anyway, so this is an immediate and obvious win there. In cases where we were not, we trade off storing "pathname/" in a strbuf on the heap for each level of the path, instead of two pointers and an int on the stack (with one pointer into the tree object). On a 64-bit system, the latter is 20 bytes; so if path components are less than that on average, this has lower peak memory usage. In practice it probably doesn't matter either way; we are already holding in memory all of the tree objects leading up to each pathname, and for normal-depth pathnames, we are only talking about hundreds of bytes. This patch leaves "struct name_path" as a thin wrapper around the strbuf, to avoid disrupting callbacks. We should fix them, but leaving it out makes this diff easier to view. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 March 2016, 17:41:03 UTC
8eee9f9 Jeff King 11 February 2016, 22:24:18 UTC show_object_with_name: simplify by using path_name() When "git rev-list" shows an object with its associated path name, it does so by walking the name_path linked list and printing each component (stopping at any embedded NULs or newlines). We'd like to eventually get rid of name_path entirely in favor of a single buffer, and dropping this custom printing code is part of that. As a first step, let's use path_name() to format the list into a single buffer, and print that. This is strictly less efficient than the original, but it's a temporary step in the refactoring; our end game will be to get the fully formatted name in the first place. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 March 2016, 17:41:03 UTC
c6bd2a1 Jeff King 11 February 2016, 22:23:48 UTC http-push: stop using name_path The graph traversal code here passes along a name_path to build up the pathname at which we find each blob. But we never actually do anything with the resulting names, making it a waste of code and memory. This usage came in aa1dbc9 (Update http-push functionality, 2006-03-07), and originally the result was passed to "add_object" (which stored it, but didn't really use it, either). But we stopped using that function in 1f1e895 (Add "named object array" concept, 2006-06-19) in favor of storing just the objects themselves. Moreover, the generation of the name in process_tree() is buggy. It sticks "name" onto the end of the name_path linked list, and then passes it down again as it recurses (instead of "entry.path"). So it's a good thing this was unused, as the resulting path for "a/b/c/d" would end up as "a/a/a/a". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 March 2016, 17:41:02 UTC
d770187 Jeff King 19 February 2016, 11:21:30 UTC tree-diff: catch integer overflow in combine_diff_path allocation A combine_diff_path struct has two "flex" members allocated alongside the struct: a string to hold the pathname, and an array of parent pointers. We use an "int" to compute this, meaning we may easily overflow it if the pathname is extremely long. We can fix this by using size_t, and checking for overflow with the st_add helper. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 March 2016, 17:41:02 UTC
935de81 Jeff King 19 February 2016, 11:21:19 UTC add helpers for detecting size_t overflow Performing computations on size_t variables that we feed to xmalloc and friends can be dangerous, as an integer overflow can cause us to allocate a much smaller chunk than we realized. We already have unsigned_add_overflows(), but let's add unsigned_mult_overflows() to that. Furthermore, rather than have each site manually check and die on overflow, we can provide some helpers that will: - promote the arguments to size_t, so that we know we are doing our computation in the same size of integer that will ultimately be fed to xmalloc - check and die on overflow - return the result so that computations can be done in the parameter list of xmalloc. These functions are a lot uglier to use than normal arithmetic operators (you have to do "st_add(foo, bar)" instead of "foo + bar"). To at least limit the damage, we also provide multi-valued versions. So rather than: st_add(st_add(a, b), st_add(c, d)); you can write: st_add4(a, b, c, d); This isn't nearly as elegant as a varargs function, but it's a lot harder to get it wrong. You don't have to remember to add a sentinel value at the end, and the compiler will complain if you get the number of arguments wrong. This patch adds only the numbered variants required to convert the current code base; we can easily add more later if needed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 March 2016, 17:41:02 UTC
833e482 Junio C Hamano 04 January 2016, 22:06:00 UTC Git 2.6.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 January 2016, 22:06:00 UTC
e3073cf Junio C Hamano 04 January 2016, 22:03:07 UTC Merge branch 'jk/pending-keep-tag-name' into maint History traversal with "git log --source" that starts with an annotated tag failed to report the tag as "source", due to an old regression in the command line parser back in v2.2 days. * jk/pending-keep-tag-name: revision.c: propagate tag names from pending array 04 January 2016, 22:03:08 UTC
e002527 Junio C Hamano 04 January 2016, 22:02:58 UTC Merge branch 'jk/symbolic-ref-maint' into maint "git symbolic-ref" forgot to report a failure with its exit status. * jk/symbolic-ref-maint: t1401: test reflog creation for git-symbolic-ref symbolic-ref: propagate error code from create_symref() 04 January 2016, 22:02:58 UTC
e54d0f5 Junio C Hamano 04 January 2016, 22:02:57 UTC Merge branch 'jk/ident-loosen-getpwuid' into maint When getpwuid() on the system returned NULL (e.g. the user is not in the /etc/passwd file or other uid-to-name mappings), the codepath to find who the user is to record it in the reflog barfed and died. Loosen the check in this codepath, which already accepts questionable ident string (e.g. host part of the e-mail address is obviously bogus), and in general when we operate fmt_ident() function in non-strict mode. * jk/ident-loosen-getpwuid: ident: loosen getpwuid error in non-strict mode ident: keep a flag for bogus default_email ident: make xgetpwuid_self() a static local helper 04 January 2016, 22:02:57 UTC
06b5c93 Junio C Hamano 04 January 2016, 22:02:55 UTC Merge branch 'jk/send-email-ssl-errors' into maint Improve error reporting when SMTP TLS fails. * jk/send-email-ssl-errors: send-email: enable SSL level 1 debug output 04 January 2016, 22:02:55 UTC
34872f0 Junio C Hamano 04 January 2016, 22:02:45 UTC Merge branch 'sg/completion-no-column' into maint The completion script (in contrib/) used to list "git column" (which is not an end-user facing command) as one of the choices * sg/completion-no-column: completion: remove 'git column' from porcelain commands 04 January 2016, 22:02:47 UTC
f91b273 Jeff King 20 December 2015, 07:27:23 UTC t1401: test reflog creation for git-symbolic-ref The current code writes a reflog entry whenever we update a symbolic ref, but we never test that this is so. Let's add a test to make sure upcoming refactoring doesn't cause a regression. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 December 2015, 20:06:31 UTC
3e4068e Jeff King 20 December 2015, 07:27:18 UTC symbolic-ref: propagate error code from create_symref() If create_symref() fails, git-symbolic-ref will still exit with code 0, and our caller has no idea that the command did nothing. This appears to have been broken since the beginning of time (e.g., it is not a regression where create_symref() stopped calling die() or something similar). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 December 2015, 20:03:03 UTC
728350b Jeff King 17 December 2015, 06:47:07 UTC revision.c: propagate tag names from pending array When we unwrap a tag to find its commit for a traversal, we do not propagate the "name" field of the tag in the pending array (i.e., the ref name the user gave us in the first place) to the commit (instead, we use an empty string). This means that "git log --source" will never show the tag-name for commits we reach through it. This was broken in 2073949 (traverse_commit_list: support pending blobs/trees with paths, 2014-10-15). That commit tried to be careful and avoid propagating the path information for a tag (which would be nonsensical) to trees and blobs. But it should not have cut off the "name" field, which should carry forward to children. Note that this does mean that the "name" field will carry forward to blobs and trees, too. Whereas prior to 2073949, we always gave them an empty string. This is the right thing to do, but in practice no callers probably use it (since now we have an explicit separate "path" field, which was the point of 2073949). We add tests here not only for the broken case, but also a basic sanity test of "log --source" in general, which did not have any coverage in the test suite. Reported-by: Raymundo <gypark@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 December 2015, 18:47:56 UTC
1ff8856 Junio C Hamano 16 December 2015, 18:27:22 UTC Merge branch 'sg/lock-file-commit-error' into maint * sg/lock-file-commit-error: credential-store: don't pass strerror to die_errno() 16 December 2015, 18:27:22 UTC
87d01c8 SZEDER Gábor 16 December 2015, 11:22:55 UTC credential-store: don't pass strerror to die_errno() Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 December 2015, 18:27:12 UTC
1aaf149 Junio C Hamano 15 December 2015, 17:43:01 UTC Update draft release notes to 2.6.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 December 2015, 17:44:54 UTC
a61fd3f Junio C Hamano 15 December 2015, 17:42:16 UTC Merge branch 'dt/fsck-verify-pack-error' into maint The exit code of git-fsck didnot reflect some types of errors found in packed objects, which has been corrected. * dt/fsck-verify-pack-error: verify_pack: do not ignore return value of verification function 15 December 2015, 17:42:20 UTC
de301c5 Junio C Hamano 15 December 2015, 17:42:01 UTC Merge branch 'ep/ident-with-getaddrinfo' into maint A fix-up for recent topic. * ep/ident-with-getaddrinfo: ident: fix undefined variable when NO_IPV6 is set ident.c: add support for IPv6 15 December 2015, 17:42:01 UTC
f97f2e5 Junio C Hamano 15 December 2015, 17:34:18 UTC Merge branch 'ls/p4-keep-empty-commits' into maint "git p4" used to import Perforce CLs that touch only paths outside the client spec as empty commits. It has been corrected to ignore them instead, with a new configuration git-p4.keepEmptyCommits as a backward compatibility knob. * ls/p4-keep-empty-commits: git-p4: add option to keep empty commits 15 December 2015, 17:34:19 UTC
3b65c24 Junio C Hamano 15 December 2015, 17:27:11 UTC Merge branch 'jk/prune-mtime' into maint The helper used to iterate over loose object directories to prune stale objects did not closedir() immediately when it is done with a directory--a callback such as the one used for "git prune" may want to do rmdir(), but it would fail on open directory on platforms such as WinXP. * jk/prune-mtime: prune: close directory earlier during loose-object directory traversal 15 December 2015, 17:27:12 UTC
58d29ec Jeff King 14 December 2015, 20:52:41 UTC ident: fix undefined variable when NO_IPV6 is set Commit 00bce77 (ident.c: add support for IPv6, 2015-11-27) moved the "gethostbyname" call out of "add_domainname" and into the helper function "canonical_name". But when moving the code, it forgot that the "buf" variable is passed as "host" in the helper. Reported-by: johan defries <johandefries@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 December 2015, 21:06:00 UTC
92bcbb9 Jeff King 10 December 2015, 21:41:29 UTC ident: loosen getpwuid error in non-strict mode If the user has not specified an identity and we have to turn to getpwuid() to find the username or gecos field, we die immediately when getpwuid fails (e.g., because the user does not exist). This is OK for making a commit, where we have set IDENT_STRICT and would want to bail on bogus input. But for something like a reflog, where the ident is "best effort", it can be pain. For instance, even running "git clone" with a UID that is not in /etc/passwd will result in git barfing, just because we can't find an ident to put in the reflog. Instead of dying in xgetpwuid_self, we can instead return a fallback value, and set a "bogus" flag. For the username in an email, we already have a "default_email_is_bogus" flag. For the name field, we introduce (and check) a matching "default_name_is_bogus" flag. As a bonus, this means you now get the usual "tell me who you are" advice instead of just a "no such user" error. No tests, as this is dependent on configuration outside of git's control. However, I did confirm that it behaves sensibly when I delete myself from the local /etc/passwd (reflogs get written, and commits complain). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 December 2015, 19:44:38 UTC
160fcdb SZEDER Gábor 11 December 2015, 12:05:00 UTC completion: remove 'git column' from porcelain commands 'git column' is an internal helper, so it should not be offered on 'git <TAB>' along with porcelain commands. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 December 2015, 20:43:16 UTC
49e863b Junio C Hamano 11 December 2015, 19:17:47 UTC Prepare for 2.6.5 This back-merges hopefully the last batch of trivially correct fixes to the 2.6.x maintenance track from the master branch. Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 December 2015, 19:17:47 UTC
58e3dd2 Junio C Hamano 11 December 2015, 19:14:38 UTC Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maint mark_tree_uninteresting() has code to handle the case where it gets passed a NULL pointer in its 'tree' parameter, but the function had 'object = &tree->object' assignment before checking if tree is NULL. This gives a compiler an excuse to declare that tree will never be NULL and apply a wrong optimization. Avoid it. * sn/null-pointer-arith-in-mark-tree-uninteresting: revision.c: fix possible null pointer arithmetic 11 December 2015, 19:14:38 UTC
abca668 Junio C Hamano 11 December 2015, 19:14:18 UTC Merge branch 'sg/lock-file-commit-error' into maint Cosmetic improvement to lock-file error messages. * sg/lock-file-commit-error: Make error message after failing commit_lock_file() less confusing 11 December 2015, 19:14:18 UTC
7605881 Junio C Hamano 11 December 2015, 19:14:18 UTC Merge branch 'cb/t3404-shellquote' into maint * cb/t3404-shellquote: t3404: fix quoting of redirect for some versions of bash 11 December 2015, 19:14:18 UTC
17e5bca Junio C Hamano 11 December 2015, 19:14:17 UTC Merge branch 'sb/doc-submodule-sync-recursive' into maint * sb/doc-submodule-sync-recursive: document submodule sync --recursive 11 December 2015, 19:14:17 UTC
63b3db7 Junio C Hamano 11 December 2015, 19:14:15 UTC Merge branch 'nd/doc-check-ref-format-typo' into maint * nd/doc-check-ref-format-typo: git-check-ref-format.txt: typo, s/avoids/avoid/ 11 December 2015, 19:14:15 UTC
288fe0c Junio C Hamano 11 December 2015, 19:14:13 UTC Merge branch 'rs/show-branch-argv-array' into maint Code simplification. * rs/show-branch-argv-array: show-branch: use argv_array for default arguments 11 December 2015, 19:14:14 UTC
0af22d6 Junio C Hamano 11 December 2015, 19:14:12 UTC Merge branch 'rs/pop-commit' into maint Code simplification. * rs/pop-commit: use pop_commit() for consuming the first entry of a struct commit_list 11 December 2015, 19:14:13 UTC
8c0a546 Junio C Hamano 11 December 2015, 19:14:11 UTC Merge branch 'as/subtree-with-spaces' into maint Update "git subtree" (in contrib/) so that it can take whitespaces in the pathnames, not only in the in-tree pathname but the name of the directory that the repository is in. * as/subtree-with-spaces: contrib/subtree: respect spaces in a repository path t7900-subtree: test the "space in a subdirectory name" case 11 December 2015, 19:14:11 UTC
4cb5488 Junio C Hamano 11 December 2015, 19:14:09 UTC Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint Because "test_when_finished" in our test framework queues the clean-up tasks to be done in a shell variable, it should not be used inside a subshell. Add a mechanism to allow 'bash' to catch such uses, and fix the ones that were found. * jk/test-lint-forbid-when-finished-in-subshell: test-lib-functions: detect test_when_finished in subshell t7800: don't use test_config in a subshell test-lib-functions: support "test_config -C <dir> ..." t5801: don't use test_when_finished in a subshell t7610: don't use test_config in a subshell 11 December 2015, 19:14:10 UTC
9d60524 John Keeping 03 December 2015, 21:47:18 UTC send-email: enable SSL level 1 debug output If a server's certificate isn't accepted by send-email, the output is: Unable to initialize SMTP properly. Check config and use --smtp-debug. but adding --smtp-debug=1 just produces the same output since we don't get as far as talking SMTP. Turning on SSL debug at level 1 gives: DEBUG: .../IO/Socket/SSL.pm:1796: SSL connect attempt failed error:14090086:SSL routines:ssl3_get_server_certificate:certificate verify failed DEBUG: .../IO/Socket/SSL.pm:673: fatal SSL error: SSL connect attempt failed error:14090086:SSL routines:ssl3_get_server_certificate:certificate verify failed DEBUG: .../IO/Socket/SSL.pm:1780: IO::Socket::IP configuration failed IO::Socket::SSL defines level 1 debug as "print out errors from IO::Socket::SSL and ciphers from Net::SSLeay". In fact, it aliases Net::SSLeay::trace which is defined to guarantee silence at level 0 and only emit error messages at level 1, so let's enable it by default. The modification of warnings is needed to avoid a warning about: Name "IO::Socket::SSL::DEBUG" used only once: possible typo Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 December 2015, 17:41:10 UTC
19ce497 Jeff King 10 December 2015, 21:35:36 UTC ident: keep a flag for bogus default_email If we have to deduce the user's email address and can't come up with something plausible for the hostname, we simply write "(none)" or ".(none)" in the hostname. Later, our strict-check is forced to use strstr to look for this magic string. This is probably not a problem in practice, but it's rather ugly. Let's keep an extra flag that tells us the email is bogus, and check that instead. We could get away with simply setting the global in add_domainname(); it only gets called to write into git_default_email. However, let's make the code a little more obvious to future readers by actually passing a pointer to our "bogus" flag down the call-chain. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 December 2015, 23:39:25 UTC
e850194 Jeff King 10 December 2015, 21:33:05 UTC ident: make xgetpwuid_self() a static local helper This function is defined in wrapper.c, but nobody besides ident.c uses it. And nobody is likely to in the future, either, as anything that cares about the user's name should be going through the ident code. Moving it here is a cleanup of the global namespace, but it will also enable further cleanups inside ident.c. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 December 2015, 23:38:59 UTC
bc49712 Christian Couder 25 November 2015, 09:30:02 UTC Documentation/git-update-index: add missing opts to synopsis Split index related options should appear in the 'SYNOPSIS' section. These options are already documented in the 'OPTIONS' section. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 December 2015, 20:21:26 UTC
4ae048e Lars Schneider 08 December 2015, 09:36:22 UTC git-p4: add option to keep empty commits A changelist that contains only excluded files due to a client spec was imported as an empty commit. Fix that issue by ignoring these commits. Add option "git-p4.keepEmptyCommits" to make the previous behavior available. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Helped-by: Pete Harlan Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 December 2015, 18:45:02 UTC
bdfc6b3 Junio C Hamano 08 December 2015, 22:07:30 UTC Git 2.6.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 December 2015, 22:12:45 UTC
4d0069f Junio C Hamano 08 December 2015, 22:11:32 UTC Merge branch 'rs/status-detached-head-memcmp' into maint Fix some string-matching corner cases when digging in the reflog for "git status". * rs/status-detached-head-memcmp: wt-status: correct and simplify check for detached HEAD 08 December 2015, 22:11:32 UTC
b5d2d8e Junio C Hamano 08 December 2015, 22:05:03 UTC Merge branch 'ad/sha1-update-chunked' into maint Apple's common crypto implementation of SHA1_Update() does not take more than 4GB at a time, and we now have a compile-time workaround for it. * ad/sha1-update-chunked: sha1: allow limiting the size of the data passed to SHA1_Update() sha1: provide another level of indirection for the SHA-1 functions 08 December 2015, 22:05:03 UTC
e6ed5a4 Junio C Hamano 08 December 2015, 22:05:02 UTC Merge branch 'sg/bash-prompt-dirty-orphan' into maint Produce correct "dirty" marker for shell prompts, even when we are on an orphan or an unborn branch. * sg/bash-prompt-dirty-orphan: bash prompt: indicate dirty index even on orphan branches bash prompt: remove a redundant 'git diff' option bash prompt: test dirty index and worktree while on an orphan branch 08 December 2015, 22:05:02 UTC
22386ad Junio C Hamano 08 December 2015, 22:05:02 UTC Merge branch 'jk/interpret-trailers-outside-a-repository' into maint Allow "git interpret-trailers" to run outside of a Git repository. * jk/interpret-trailers-outside-a-repository: interpret-trailers: allow running outside a repository 08 December 2015, 22:05:02 UTC
697bd28 Junio C Hamano 08 December 2015, 22:05:00 UTC Merge branch 'jk/rebase-no-autostash' into maint There was no way to defeat a configured rebase.autostash variable from the command line, as "git rebase --no-autostash" was missing. * jk/rebase-no-autostash: Documentation/git-rebase: fix --no-autostash formatting rebase: support --no-autostash 08 December 2015, 22:05:01 UTC
a2678df Stefan Naewe 05 December 2015, 15:27:24 UTC revision.c: fix possible null pointer arithmetic mark_tree_uninteresting() dereferences a tree pointer before checking if the pointer is valid. Fix that by doing the check first. Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 December 2015, 20:32:02 UTC
7966230 Charles Bailey 02 December 2015, 20:50:07 UTC t3404: fix quoting of redirect for some versions of bash As CodingGuidelines says, some versions of bash errors out when $variable substitution is used as the target for redirection without being quoted (even though POSIX may not require such a quote). Signed-off-by: Charles Bailey <cbailey32@bloomberg.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 December 2015, 22:05:18 UTC
56a8aea Nguyễn Thái Ngọc Duy 04 December 2015, 18:09:32 UTC git-check-ref-format.txt: typo, s/avoids/avoid/ Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 December 2015, 21:09:48 UTC
e7220c4 Stefan Beller 03 December 2015, 20:41:02 UTC document submodule sync --recursive The git-submodule(1) is inconsistent. In the synopsis, it says: git submodule [--quiet] sync [--recursive] [--] [<path>...] The description of the sync does not mention --recursive, and the description of --recursive says that it is only available for foreach, update and status. The option was introduced (82f49f294c, Teach --recursive to submodule sync, 2012-10-26) a while ago, so let's document it, too. Reported-by: Per Cederqvist <cederp@opera.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 December 2015, 21:08:05 UTC
9a8c740 Junio C Hamano 04 December 2015, 19:39:19 UTC Prepare for 2.6.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 December 2015, 19:39:19 UTC
aa0b4c3 Junio C Hamano 04 December 2015, 19:34:24 UTC Merge branch 'da/difftool' into maint The code to prepare the working tree side of temporary directory for the "dir-diff" feature forgot that symbolic links need not be copied (or symlinked) to the temporary area, as the code already special cases and overwrites them. Besides, it was wrong to try computing the object name of the target of symbolic link, which may not even exist or may be a directory. * da/difftool: difftool: ignore symbolic links in use_wt_file 04 December 2015, 19:34:24 UTC
b50ceab Junio C Hamano 04 December 2015, 19:33:07 UTC Merge branch 'dk/gc-idx-wo-pack' into maint Having a leftover .idx file without corresponding .pack file in the repository hurts performance; "git gc" learned to prune them. We may want to do the same for .bitmap (and notice but not prune .keep) without corresponding .pack, but that can be a separate topic. * dk/gc-idx-wo-pack: gc: remove garbage .idx files from pack dir t5304: test cleaning pack garbage prepare_packed_git(): refactor garbage reporting in pack directory 04 December 2015, 19:33:08 UTC
8c24d83 David Turner 30 November 2015, 22:47:42 UTC verify_pack: do not ignore return value of verification function In verify_pack, a caller-supplied verification function is called. The function returns an int. If that return value is non-zero, verify_pack should fail. The only caller of verify_pack is in builtin/fsck.c, whose verify_fn returns a meaningful error code (which was then ignored). Now, fsck might return a different error code (with more detail). This would happen in the unlikely event that a commit or tree that is a valid git object but not a valid instance of its type gets into a pack. Signed-off-by: David Turner <dturner@twopensource.com> Signed-off-by: Jeff King <peff@peff.net> 01 December 2015, 23:19:35 UTC
08a3651 SZEDER Gábor 30 November 2015, 11:40:53 UTC Make error message after failing commit_lock_file() less confusing The error message after a failing commit_lock_file() call sometimes looks like this, causing confusion: $ git remote add remote git@server.com/repo.git error: could not commit config file .git/config # Huh?! # I didn't want to commit anything, especially not my config file! While in the narrow context of the lockfile module using the verb 'commit' in the error message makes perfect sense, in the broader context of git the word 'commit' already has a very specific meaning, hence the confusion. Reword these error messages to say "could not write" instead of "could not commit". While at it, include strerror in the error messages after writing the config file or the credential store fails to provide some information about the cause of the failure, and update the style of the error message after writing the reflog fails to match surrounding error messages (i.e. no '' around the pathname and no () around the error description). Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> 01 December 2015, 23:17:23 UTC
908a6e4 Jeff King 01 December 2015, 22:24:20 UTC Merge branch 'eg/p4-submit-catch-failure' into maint Just like the working tree is cleaned up when the user cancelled submission in P4Submit.applyCommit(), clean up the mess if "p4 submit" fails. * eg/p4-submit-catch-failure: git-p4: clean up after p4 submit failure 01 December 2015, 22:24:21 UTC
35f2635 Jeff King 01 December 2015, 22:21:31 UTC Merge branch 'dk/check-ignore-docs' into maint Documentation clarification for "check-ignore" without "--verbose". * dk/check-ignore-docs: check-ignore: correct documentation about output 01 December 2015, 22:21:32 UTC
5b228f9 Jeff King 01 December 2015, 22:21:29 UTC Merge branch 'ld/p4-detached-head' into maint Make git-p4 work on a detached head. * ld/p4-detached-head: git-p4: work with a detached head git-p4: add option to system() to return subshell status git-p4: add failing test for submit from detached head 01 December 2015, 22:21:29 UTC
978b576 Jeff King 01 December 2015, 22:21:17 UTC Merge branch 'sg/filter-branch-dwim-ambiguity' into maint Fix for a corner case in filter-branch. * sg/filter-branch-dwim-ambiguity: filter-branch: deal with object name vs. pathname ambiguity in tree-filter 01 December 2015, 22:21:17 UTC
2cc3640 Jeff King 01 December 2015, 22:21:11 UTC Merge branch 'mg/doc-word-diff-example' into maint * mg/doc-word-diff-example: Documentation/diff: give --word-diff-regex=. example 01 December 2015, 22:21:11 UTC
712a12e Jeff King 01 December 2015, 22:21:01 UTC Merge branch 'cb/ssl-config-pathnames' into maint Allow tilde-expansion in some http config variables. * cb/ssl-config-pathnames: http: treat config options sslCAPath and sslCAInfo as paths 01 December 2015, 22:21:01 UTC
76fdb06 Jeff King 01 December 2015, 22:20:52 UTC Merge branch 'dk/t5813-unc-paths' into maint Test portability fix for a topic in v2.6.1. * dk/t5813-unc-paths: t5813: avoid creating urls that break on cygwin 01 December 2015, 22:20:52 UTC
3840d2d Jeff King 01 December 2015, 22:20:46 UTC Merge branch 'dk/rerere-train-quoting' into maint Fix shell quoting in contrib script. * dk/rerere-train-quoting: Escape Git's exec path in contrib/rerere-train.sh script 01 December 2015, 22:20:46 UTC
347acea Jeff King 01 December 2015, 22:19:52 UTC Merge branch 'cb/hook-sigpipe' into maint We now consistently allow all hooks to ignore their standard input, rather than having git complain of SIGPIPE. * cb/hook-sigpipe: allow hooks to ignore their standard input stream 01 December 2015, 22:19:52 UTC
45e330f Jeff King 01 December 2015, 22:19:37 UTC Merge branch 'fm/shell-path-whitespace' into maint Portability fix for Windows, which may rewrite $SHELL variable using non-POSIX paths. * fm/shell-path-whitespace: rebase-i-exec: Allow space in SHELL_PATH 01 December 2015, 22:19:37 UTC
2945adc Jeff King 01 December 2015, 22:19:33 UTC Merge branch 'ar/doc-env-variable-format' into maint Minor documentation fixup. * ar/doc-env-variable-format: Documentation: make environment variable formatting more consistent 01 December 2015, 22:19:33 UTC
92b9bf4 Jeff King 01 December 2015, 22:19:12 UTC Merge branch 'pt/http-socks-proxy' into maint Add support for talking http/https over socks proxy. * pt/http-socks-proxy: remote-http(s): support SOCKS proxies 01 December 2015, 22:19:12 UTC
cd76778 Jeff King 01 December 2015, 22:19:06 UTC Merge branch 'rc/configure-use-libs-when-checking-a-lib' into maint The "configure" script did not test for -lpthread correctly, which upset some linkers. * rc/configure-use-libs-when-checking-a-lib: configure.ac: use $LIBS not $CFLAGS when testing -lpthread 01 December 2015, 22:19:06 UTC
904de44 René Scharfe 25 November 2015, 14:10:18 UTC wt-status: correct and simplify check for detached HEAD If a branch name is longer than four characters then memcmp() reads over the end of the static string "HEAD". This causes the following test failures with AddressSanitizer: t3203-branch-output.sh (Wstat: 256 Tests: 18 Failed: 4) Failed tests: 12, 15-17 Non-zero exit status: 1 t3412-rebase-root.sh (Wstat: 256 Tests: 31 Failed: 3) Failed tests: 28-29, 31 Non-zero exit status: 1 t3507-cherry-pick-conflict.sh (Wstat: 256 Tests: 31 Failed: 4) Failed tests: 14, 29-31 Non-zero exit status: 1 t3510-cherry-pick-sequence.sh (Wstat: 256 Tests: 39 Failed: 14) Failed tests: 17, 22-26, 28-30, 34-35, 37-39 Non-zero exit status: 1 t3420-rebase-autostash.sh (Wstat: 256 Tests: 28 Failed: 4) Failed tests: 24-27 Non-zero exit status: 1 t3404-rebase-interactive.sh (Wstat: 256 Tests: 91 Failed: 57) Failed tests: 17, 19, 21-42, 44, 46-74, 77, 81-82 Non-zero exit status: 1 t3900-i18n-commit.sh (Wstat: 256 Tests: 34 Failed: 1) Failed test: 34 Non-zero exit status: 1 t5407-post-rewrite-hook.sh (Wstat: 256 Tests: 14 Failed: 6) Failed tests: 9-14 Non-zero exit status: 1 t7001-mv.sh (Wstat: 256 Tests: 46 Failed: 5) Failed tests: 39-43 Non-zero exit status: 1 t7509-commit.sh (Wstat: 256 Tests: 12 Failed: 2) Failed tests: 11-12 Non-zero exit status: 1 t7512-status-help.sh (Wstat: 256 Tests: 39 Failed: 35) Failed tests: 5-39 Non-zero exit status: 1 t6030-bisect-porcelain.sh (Wstat: 256 Tests: 70 Failed: 1) Failed test: 13 Non-zero exit status: 1 And if a branch is named "H", "HE", or "HEA" then the current if clause erroneously considers it as matching "HEAD" because it only compares up to the end of the branch name. Fix that by doing the comparison using strcmp() and only after the branch name is extracted. This way neither too less nor too many characters are checked. While at it call strchrnul() to find the end of the branch name instead of open-coding it. Helped-by: Jeff King <peff@peff.net> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> 28 November 2015, 17:30:18 UTC
00bce77 Elia Pinto 27 November 2015, 14:08:27 UTC ident.c: add support for IPv6 Add IPv6 support by implementing name resolution with the protocol agnostic getaddrinfo(3) API. The old gethostbyname(3) code is still available when git is compiled with NO_IPV6. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Helped-by: Jeff King <peff@peff.net> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Jeff King <peff@peff.net> 28 November 2015, 17:20:42 UTC
bf9acba Charles Bailey 23 November 2015, 12:02:40 UTC http: treat config options sslCAPath and sslCAInfo as paths This enables ~ and ~user expansion for these config options. Signed-off-by: Charles Bailey <cbailey32@bloomberg.net> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 23:51:00 UTC
2c15c00 Michael J Gruber 20 November 2015, 13:36:14 UTC Documentation/diff: give --word-diff-regex=. example It's just so useful. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 23:38:46 UTC
4d2a364 SZEDER Gábor 23 November 2015, 12:23:16 UTC filter-branch: deal with object name vs. pathname ambiguity in tree-filter 'git filter-branch' fails complaining about an ambiguous argument, if a tree-filter renames a path and the new pathname happens to match an existing object name. After the tree-filter has been applied, 'git filter-branch' looks for changed paths by running: git diff-index -r --name-only --ignore-submodules $commit which then, because of the lack of disambiguating double-dash, can't decide whether to treat '$commit' as revision or path and errors out. Add that disambiguating double-dash after 'git diff-index's revision argument to make sure that '$commit' is interpreted as a revision. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 23:37:50 UTC
219cbf0 Dennis Kaarsemaker 20 November 2015, 20:30:48 UTC check-ignore: correct documentation about output By default git check-ignore shows only the filenames that will be ignored, not the pattern that causes their exclusion. Instead of moving the partial exclude pattern precendence information to the -v option where it belongs, link to gitignore(5) which describes this more thoroughly. Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 22:13:36 UTC
5cb2e16 Christian Couder 24 November 2015, 11:55:07 UTC Documentation/git-update-index: add missing opts to synopsys Untracked cache related options should appear in the synopsis. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:44:40 UTC
b7638fe GIRARD Etienne 24 November 2015, 07:43:59 UTC git-p4: clean up after p4 submit failure When "p4 submit" command fails in P4Submit.applyCommit, the workspace is left with the changes. We already have code to revert the changes to the workspace when the user decides to cancel submission by aborting the editor that edits the change description, and we should treat the "p4 submit" failure the same way. Clean the workspace if p4_write_pipe raised SystemExit, so that the user don't have to do it themselves. Signed-off-by: GIRARD Etienne <egirard@murex.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:41:59 UTC
c26f70c SZEDER Gábor 21 November 2015, 11:30:09 UTC bash prompt: indicate dirty index even on orphan branches __git_ps1() doesn't indicate dirty index while on an orphan branch. To check the dirtiness of the index, __git_ps1() runs 'git diff-index --cached ... HEAD', which doesn't work on an orphan branch, because HEAD doesn't point to a valid commit. Run 'git diff ... --cached' instead, as it does the right thing both on valid and invalid HEAD, i.e. compares the index to the existing HEAD in the former case and to the empty tree in the latter. This fixes the two failing tests added in the first commit of this series. The dirtiness of the worktree is already checked with 'git diff' and is displayed correctly even on an orphan branch. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:27:01 UTC
0af9f7e SZEDER Gábor 21 November 2015, 14:46:40 UTC bash prompt: remove a redundant 'git diff' option To get the dirty state indicator __git_ps1() runs 'git diff' with '--quiet --exit-code' options. '--quiet' already implies '--exit-code', so the latter is unnecessary and can be removed. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:27:01 UTC
a30d11e SZEDER Gábor 21 November 2015, 11:30:07 UTC bash prompt: test dirty index and worktree while on an orphan branch There is only a single test exercising the dirty state indicator on an orphan branch, and in that test neither the index nor the worktree are dirty. Add two failing tests to check the dirty state indicator while either the index is dirty or while both the index and the worktree are dirty on an orphan branch, and to show that the dirtiness of the index is not displayed in these cases (the fourth combination, i.e. clean index and dirty worktree are impossible on an orphan branch). Update the existing dirty state indicator on clean orphan branch test to match the style of the two new tests, most importantly to use 'git checkout --orphan' instead of cd-ing into a repository that just happens to be empty and clean. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:27:01 UTC
00ad6e3 Luke Diamand 21 November 2015, 09:54:41 UTC git-p4: work with a detached head When submitting, git-p4 finds the current branch in order to know if it is allowed to submit (configuration "git-p4.allowSubmit"). On a detached head, detecting the branch would fail, and git-p4 would report a cryptic error. This change teaches git-p4 to recognise a detached head and submit successfully. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:20:15 UTC
cbff4b2 Luke Diamand 21 November 2015, 09:54:40 UTC git-p4: add option to system() to return subshell status Add an optional parameter ignore_error to the git-p4 system() function. If used, it will return the subshell exit status rather than throwing an exception. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:20:15 UTC
74b6fe9 Luke Diamand 21 November 2015, 09:54:39 UTC git-p4: add failing test for submit from detached head git-p4 can't submit from a detached head. This test case demonstrates the problem. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:20:15 UTC
6d7afe0 Pat Thoyts 26 October 2015, 13:15:07 UTC remote-http(s): support SOCKS proxies With this patch we properly support SOCKS proxies, configured e.g. like this: git config http.proxy socks5://192.168.67.1:32767 Without this patch, Git mistakenly tries to use SOCKS proxies as if they were HTTP proxies, resulting in a error message like: fatal: unable to access 'http://.../': Proxy CONNECT aborted This patch was required to work behind a faulty AP and scraped from http://stackoverflow.com/questions/15227130/#15228479 and guarded with an appropriate cURL version check by Johannes Schindelin. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 November 2015, 12:31:39 UTC
681390b Dennis Kaarsemaker 09 November 2015, 17:49:35 UTC t5813: avoid creating urls that break on cygwin When passed an ssh:// url, git strips ssh://host from the url but does not remove leading slashes from the path. So when this test used ssh://remote//path/to/pwd, the path accessed by our fake SSH is //path/to/pwd, which cygwin interprets as a UNC path, causing the test to fail. We may want to actually fix this in git itself, making it remove extra slashes from urls before feeding them to transports or helpers, but that's for another topic as it could cause regressions. Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net> Signed-off-by: Jeff King <peff@peff.net> 20 November 2015, 11:46:48 UTC
4573a68 Daniel Knittl-Frank 08 November 2015, 11:27:55 UTC Escape Git's exec path in contrib/rerere-train.sh script Whitespace can cause the source command to fail. This is usually not a problem on Unix systems, but on Windows Git is likely to be installed under "C:/Program Files/", thus rendering the script broken. Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> Signed-off-by: Jeff King <peff@peff.net> 20 November 2015, 11:43:00 UTC
af65f68 Clemens Buchacher 16 November 2015, 08:05:58 UTC allow hooks to ignore their standard input stream Since ec7dbd145 (receive-pack: allow hooks to ignore its standard input stream) the pre-receive and post-receive hooks ignore SIGPIPE. Do the same for the remaining hooks pre-push and post-rewrite, which read from standard input. The same arguments for ignoring SIGPIPE apply. Include test by Jeff King which checks that SIGPIPE does not cause pre-push hook failure. With the use of git update-ref --stdin it is fast enough to be enabled by default. Signed-off-by: Clemens Buchacher <clemens.buchacher@intel.com> Signed-off-by: Jeff King <peff@peff.net> 16 November 2015, 13:59:19 UTC
fe9394a Fredrik Medley 13 November 2015, 06:03:19 UTC rebase-i-exec: Allow space in SHELL_PATH On Windows, when Git is installed under "C:\Program Files\Git", SHELL_PATH will include a space. Fix "git rebase --interactive --exec" so that it works with spaces in SHELL_PATH. Signed-off-by: Fredrik Medley <fredrik.medley@gmail.com> Signed-off-by: Jeff King <peff@peff.net> 13 November 2015, 22:51:39 UTC
6dedd80 Андрей Рыбак 11 November 2015, 15:47:25 UTC Documentation: make environment variable formatting more consistent Documentation/git.txt is not consistent in the way it stylizes mentions of Environment Variables. Most of them are enclosed in single quotes, some are enclosed in backticks, some are not enclosed. Signed-off-by: Andrey Rybak <rybak.a.v@gmail.com> Signed-off-by: Jeff King <peff@peff.net> 11 November 2015, 21:46:34 UTC
bac2c5b Rainer M. Canavan 06 November 2015, 01:11:37 UTC configure.ac: use $LIBS not $CFLAGS when testing -lpthread Some linkers, namely the one on IRIX are rather strict concerning the order or arguments for symbol resolution, i.e. no libraries listed before objects or other libraries on the command line are considered for symbol resolution. Therefore, -lpthread can't work if it's put in CFLAGS, because it will not be considered for resolving pthread_key_create in conftest.o. Use $LIBS instead. Signed-off-by: Rainer Canavan <git@canavan.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 November 2015, 17:41:08 UTC
af40944 Junio C Hamano 05 November 2015, 20:20:34 UTC Git 2.6.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 November 2015, 20:20:34 UTC
b8f5242 Junio C Hamano 05 November 2015, 20:18:16 UTC Merge branch 'rs/daemon-plug-child-leak' into maint "git daemon" uses "run_command()" without "finish_command()", so it needs to release resources itself, which it forgot to do. * rs/daemon-plug-child-leak: daemon: plug memory leak run-command: factor out child_process_clear() 05 November 2015, 20:18:17 UTC
db43891 Junio C Hamano 05 November 2015, 20:18:15 UTC Merge branch 'rs/wt-status-detached-branch-fix' into maint "git status --branch --short" accessed beyond the constant string "HEAD", which has been corrected. * rs/wt-status-detached-branch-fix: wt-status: use skip_prefix() to get rid of magic string length constants wt-status: don't skip a magical number of characters blindly wt-status: avoid building bogus branch name with detached HEAD wt-status: exit early using goto in wt_shortstatus_print_tracking() t7060: add test for status --branch on a detached HEAD 05 November 2015, 20:18:15 UTC
f97aee1 Junio C Hamano 05 November 2015, 20:18:14 UTC Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maint We peek objects from submodule's object store by linking it to the list of alternate object databases, but the code to do so forgot to correctly initialize the list. * jk/initialization-fix-to-add-submodule-odb: add_submodule_odb: initialize alt_odb list earlier 05 November 2015, 20:18:14 UTC
back to top