| 2632c89 | Junio C Hamano | 19 August 2016, 22:39:33 UTC | Git 2.10-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 August 2016, 22:39:33 UTC |
| 83d9eb0 | Junio C Hamano | 19 August 2016, 22:34:16 UTC | Merge branch 'lt/gpg-show-long-key-in-signature-verification' "git log --show-signature" and other commands that display the verification status of PGP signature now shows the longer key-id, as 32-bit key-id is so last century. * lt/gpg-show-long-key-in-signature-verification: gpg-interface: prefer "long" key format output when verifying pgp signatures | 19 August 2016, 22:34:16 UTC |
| d05d0e9 | Junio C Hamano | 19 August 2016, 22:34:16 UTC | Merge branch 'ab/hooks' "git rev-parse --git-path hooks/<hook>" learned to take core.hooksPath configuration variable (introduced during 2.9 cycle) into account. * ab/hooks: rev-parse: respect core.hooksPath in --git-path | 19 August 2016, 22:34:16 UTC |
| 331f06d | Junio C Hamano | 19 August 2016, 22:34:15 UTC | Merge branch 'jk/difftool-command-not-found' "git difftool" by default ignores the error exit from the backend commands it spawns, because often they signal that they found differences by exiting with a non-zero status code just like "diff" does; the exit status codes 126 and above however are special in that they are used to signal that the command is not executable, does not exist, or killed by a signal. "git difftool" has been taught to notice these exit status codes. * jk/difftool-command-not-found: difftool: always honor fatal error exit codes | 19 August 2016, 22:34:15 UTC |
| e6dab9f | Junio C Hamano | 19 August 2016, 22:34:15 UTC | Merge branch 'sb/checkout-explit-detach-no-advice' "git checkout --detach <branch>" used to give the same advice message as that is issued when "git checkout <tag>" (or anything that is not a branch name) is given, but asking with "--detach" is an explicit enough sign that the user knows what is going on. The advice message has been squelched in this case. * sb/checkout-explit-detach-no-advice: checkout: do not mention detach advice for explicit --detach option | 19 August 2016, 22:34:15 UTC |
| 643b622 | Junio C Hamano | 19 August 2016, 22:34:14 UTC | Merge branch 'tb/t0027-raciness-fix' The t0027 test for CRLF conversion was timing dependent and flaky. * tb/t0027-raciness-fix: convert: Correct NNO tests and missing `LF will be replaced by CRLF` | 19 August 2016, 22:34:14 UTC |
| aeb1b7f | Junio C Hamano | 19 August 2016, 22:34:13 UTC | Merge branch 'rs/pull-signed-tag' When "git merge-recursive" works on history with many criss-cross merges in "verbose" mode, the names the command assigns to the virtual merge bases could have overwritten each other by unintended reuse of the same piece of memory. * rs/pull-signed-tag: commit: use FLEX_ARRAY in struct merge_remote_desc merge-recursive: fix verbose output for multiple base trees commit: factor out set_merge_remote_desc() commit: use xstrdup() in get_merge_parent() | 19 August 2016, 22:34:14 UTC |
| d63263a | Junio C Hamano | 17 August 2016, 21:09:17 UTC | RelNotes: final batch of topics before -rc1 | 17 August 2016, 21:09:17 UTC |
| 187c80b | Junio C Hamano | 17 August 2016, 21:07:48 UTC | Merge branch 'js/test-lint-pathname' The "t/" hierarchy is prone to get an unusual pathname; "make test" has been taught to make sure they do not contain paths that cannot be checked out on Windows (and the mechanism can be reusable to catch pathnames that are not portable to other platforms as need arises). * js/test-lint-pathname: t/Makefile: ensure that paths are valid on platforms we care | 17 August 2016, 21:07:48 UTC |
| 3f5ad0a | Junio C Hamano | 17 August 2016, 21:07:48 UTC | Merge branch 'sg/reflog-past-root' A small test clean-up for a topic introduced in v2.9.1 and later. * sg/reflog-past-root: t1410: remove superfluous 'git reflog' from the 'walk past root' test | 17 August 2016, 21:07:48 UTC |
| 4a78871 | Junio C Hamano | 17 August 2016, 21:07:47 UTC | Merge branch 'rs/mailinfo-lib' Small code clean-up. * rs/mailinfo-lib: mailinfo: recycle strbuf in check_header() | 17 August 2016, 21:07:47 UTC |
| 2f66456 | Junio C Hamano | 17 August 2016, 21:07:46 UTC | Merge branch 'jk/tighten-alloc' Small code and comment clean-up. * jk/tighten-alloc: receive-pack: use FLEX_ALLOC_MEM in queue_command() correct FLEXPTR_* example in comment | 17 August 2016, 21:07:46 UTC |
| a6711ed | Junio C Hamano | 17 August 2016, 21:07:45 UTC | Merge branch 'va/i18n' A handful of tests that were broken under gettext-poison build have been fixed. * va/i18n: t7411: become resilient to GETTEXT_POISON t5520: become resilient to GETTEXT_POISON t3404: become resilient to GETTEXT_POISON | 17 August 2016, 21:07:45 UTC |
| 7c55431 | Matthieu Moy | 17 August 2016, 06:41:16 UTC | git-multimail: update to release 1.4.0 Changes are described in CHANGES. Contributions-by: Matthieu Moy <Matthieu.Moy@imag.fr> Contributions-by: Irfan Adilovic <irfanadilovic@gmail.com> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 August 2016, 18:36:08 UTC |
| 07d1a42 | Junio C Hamano | 17 August 2016, 17:18:59 UTC | relnotes: redo the description of text=auto fix Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 August 2016, 18:31:40 UTC |
| af2b21e | Junio C Hamano | 16 August 2016, 22:04:13 UTC | Merge branch 'lt/gpg-show-long-key-in-signature-verification-maint' into lt/gpg-show-long-key-in-signature-verification Linus's original was rebased to apply to the maintenance track just in case binary distributors that are stuck in the past want to take it to their older codebase. Let's merge it up to more modern codebase that has Peff's gpg-interface clean-up topic that appeared after Git 2.9 was tagged. * lt/gpg-show-long-key-in-signature-verification-maint: gpg-interface: prefer "long" key format output when verifying pgp signatures | 16 August 2016, 22:04:13 UTC |
| b624a3e | Linus Torvalds | 16 August 2016, 20:10:24 UTC | gpg-interface: prefer "long" key format output when verifying pgp signatures Yes, gpg2 already uses the long format by default, but most distributions seem to still have "gpg" be the older 1.x version due to compatibility reasons. And older versions of gpg only show the 32-bit short ID, which is quite insecure. This doesn't actually matter for the _verification_ itself: if the verification passes, the pgp signature is good. But if you don't actually have the key yet, and want to fetch it, or you want to check exactly which key was used for verification and want to check it, we should specify the key with more precision. In fact, we should preferentially specify the whole key fingerprint, but gpg doesn't actually support that. Which is really quite sad. Showing the "long" format improves things to at least show 64 bits of the fingerprint. That's a lot better, even if it's not perfect. This change the log format for "git log --show-signature" from commit 2376d31787760af598db23bb3982a57419854e5c merged tag 'v2.9.3' gpg: Signature made Fri 12 Aug 2016 09:17:59 AM PDT using RSA key ID 96AFE6CB gpg: Good signature from "Junio C Hamano <gitster@pobox.com>" gpg: aka "Junio C Hamano <jch@google.com>" gpg: aka "Junio C Hamano <junio@pobox.com>" Merge: 2807cd7b25af e0c1ceafc5be Author: Junio C Hamano <gitster@pobox.com> Date: Fri Aug 12 10:02:18 2016 -0700 to commit 2376d31787760af598db23bb3982a57419854e5c merged tag 'v2.9.3' gpg: Signature made Fri 12 Aug 2016 09:17:59 AM PDT gpg: using RSA key B0B5E88696AFE6CB gpg: Good signature from "Junio C Hamano <gitster@pobox.com>" gpg: aka "Junio C Hamano <jch@google.com>" gpg: aka "Junio C Hamano <junio@pobox.com>" Merge: 2807cd7b25af e0c1ceafc5be Author: Junio C Hamano <gitster@pobox.com> Date: Fri Aug 12 10:02:18 2016 -0700 (note the longer key ID, but also the reflowing of the text) and also changes the format in the merge messages when merging a signed tag. If you already use gpg2 (either because it's installed by default, or because you have set your gpg_program configuration to point to gpg2), that already used the long format, you'll also see a change: it will now have the same formatting as gpg 1.x, and the verification string looks something like gpg: Signature made Sun 24 Jul 2016 12:24:02 PM PDT gpg: using RSA key 79BE3E4300411886 gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>" [ultimate] where it used to be on one line: gpg: Signature made Sun 24 Jul 2016 12:24:02 PM PDT using RSA key ID 79BE3E4300411886 gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>" [ultimate] so there is certainly a chance this could break some automated scripting. But the 32-bit key ID's really are broken. Also note that because of the differences between gpg-1.x and gpg-2.x, hopefully any scripted key ID parsing code (if such code exists) is already flexible enough to not care. This was triggered by the fact that the "evil32" project keys ended up leaking to the public key servers, so now there are 32-bit aliases for just about every open source developer that you can easily get by mistake if you use the 32-bit short ID format. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 August 2016, 22:02:22 UTC |
| 9445b49 | Johannes Schindelin | 16 August 2016, 13:14:27 UTC | rev-parse: respect core.hooksPath in --git-path The idea of the --git-path option is not only to avoid having to prefix paths with the output of --git-dir all the time, but also to respect overrides for specific common paths inside the .git directory (e.g. `git rev-parse --git-path objects` will report the value of the environment variable GIT_OBJECT_DIRECTORY, if set). When introducing the core.hooksPath setting, we forgot to adjust git_path() accordingly. This patch fixes that. While at it, revert the special-casing of core.hooksPath in run-command.c, as it is now no longer needed. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 August 2016, 19:03:26 UTC |
| c2cafd3 | Johannes Schindelin | 16 August 2016, 15:13:25 UTC | t/Makefile: ensure that paths are valid on platforms we care Some pathnames that are okay on ext4 and on HFS+ cannot be checked out on Windows. Tests that want to see operations on such paths on filesystems that support them must do so behind appropriate test prerequisites, and must not include them in the source tree (instead they should create them when they run). Otherwise, the source tree cannot even be checked out. Make sure that double-quotes, asterisk, colon, greater/less-than, question-mark, backslash, tab, vertical-bar, as well as any non-ASCII characters never appear in the pathnames with a new test-lint-* target as part of a `make test`. To that end, we call `git ls-files` (ensuring that the paths are quoted properly), relying on the fact that paths containing non-ASCII characters are quoted within double-quotes. In case that the source code does not actually live in a Git repository (e.g. when extracted from a .zip file), or that the `git` executable cannot be executed, we simply ignore the error for now; In that case, our trusty Continuous Integration will be the last line of defense and catch any problematic file name. Noticed when a topic wanted to add a pathname with '>' in it. A check like this will prevent a similar problems from happening in the future. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 August 2016, 18:56:42 UTC |
| 45a4f5d | John Keeping | 15 August 2016, 21:54:39 UTC | difftool: always honor fatal error exit codes At the moment difftool's "trust exit code" logic always suppresses the exit status of the diff utility we invoke. This is useful because we don't want to exit just because diff returned "1" because the files differ, but it's confusing if the shell returns an error because the selected diff utility is not found. POSIX specifies 127 as the exit status for "command not found", 126 for "command found but is not executable" and values greater than 128 if the command terminated because it received a signal [1] and at least bash and dash follow this specification, while diff utilities generally use "1" for the exit status we want to ignore. Handle any value of 126 or greater as a special value indicating that some form of fatal error occurred. [1] http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_08_02 Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2016, 22:24:05 UTC |
| 779b88a | Stefan Beller | 15 August 2016, 18:40:21 UTC | checkout: do not mention detach advice for explicit --detach option When a user asked for a detached HEAD specifically with `--detach`, we do not need to give advice on what a detached HEAD state entails as we can assume they know what they're getting into as they asked for it. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2016, 22:01:45 UTC |
| 07c9292 | Junio C Hamano | 15 August 2016, 17:20:38 UTC | Relnotes: decribe the updates to the "text=auto" attribute Helped-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2016, 20:15:49 UTC |
| 0eb75ce | SZEDER Gábor | 14 August 2016, 23:28:53 UTC | t1410: remove superfluous 'git reflog' from the 'walk past root' test The test added in 71abeb753fa8 (reflog: continue walking the reflog past root commits, 2016-06-03) contains an unnecessary 'git reflog' execution, which was part of my debug/tracing instrumentation that I somehow didn't manage to remove before submitting. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2016, 16:21:39 UTC |
| 726cc2b | Junio C Hamano | 14 August 2016, 21:48:06 UTC | Git 2.10-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 August 2016, 21:48:06 UTC |
| a0ad53c | Torsten Bögershausen | 13 August 2016, 21:29:27 UTC | convert: Correct NNO tests and missing `LF will be replaced by CRLF` When a non-reversible CRLF conversion is done in "git add", a warning is printed on stderr (or Git dies, depending on checksafe) The function commit_chk_wrnNNO() in t0027 was written to test this, but did the wrong thing: Instead of looking at the warning from "git add", it looked at the warning from "git commit". This is racy because "git commit" may not have to do CRLF conversion at all if it can use the sha1 value from the index (which depends on whether "add" and "commit" run in a single second). Correct t0027 and replace the commit for each and every file with a commit of all files in one go. The function commit_chk_wrnNNO() should be renamed in a separate commit. Now that t0027 does the right thing, it detects a bug in covert.c: This sequence should generate the warning `LF will be replaced by CRLF`, but does not: $ git init $ git config core.autocrlf false $ printf "Line\r\n" >file $ git add file $ git commit -m "commit with CRLF" $ git config core.autocrlf true $ printf "Line\n" >file $ git add file "git add" calls crlf_to_git() in convert.c, which calls check_safe_crlf(). When has_cr_in_index(path) is true, crlf_to_git() returns too early and check_safe_crlf() is not called at all. Factor out the code which determines if "git checkout" converts LF->CRLF into will_convert_lf_to_crlf(). Update the logic around check_safe_crlf() and "simulate" the possible LF->CRLF conversion at "git checkout" with help of will_convert_lf_to_crlf(). Thanks to Jeff King <peff@peff.net> for analyzing t0027. Reported-By: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 August 2016, 20:45:52 UTC |
| ddd0bfa | René Scharfe | 13 August 2016, 15:38:56 UTC | receive-pack: use FLEX_ALLOC_MEM in queue_command() Use the macro FLEX_ALLOC_MEM instead of open-coding it. This shortens and simplifies the code a bit. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 August 2016, 02:49:30 UTC |
| 5447a76 | René Scharfe | 13 August 2016, 12:21:27 UTC | commit: use FLEX_ARRAY in struct merge_remote_desc Convert the name member of struct merge_remote_desc to a FLEX_ARRAY and use FLEX_ALLOC_STR to build the struct. This halves the number of memory allocations, saves the storage for a pointer and avoids an indirection when reading the name. Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Rene Scharfe <l.s.r@web.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 August 2016, 02:48:07 UTC |
| a257165 | René Scharfe | 13 August 2016, 12:16:04 UTC | merge-recursive: fix verbose output for multiple base trees One of the indirect callers of make_virtual_commit() passes the result of oid_to_hex() as the name, i.e. a pointer to a static buffer. Since the function uses that string pointer directly in building a struct merge_remote_desc, multiple entries can end up sharing the same name inadvertently. Fix that by calling set_merge_remote_desc(), which creates a copy of the string, instead of building the struct by hand. Signed-off-by: Rene Scharfe <l.s.r@web.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 August 2016, 02:48:04 UTC |
| beb518c | René Scharfe | 13 August 2016, 12:11:27 UTC | commit: factor out set_merge_remote_desc() Export a helper function for allocating, populating and attaching a merge_remote_desc to a commit. Signed-off-by: Rene Scharfe <l.s.r@web.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 August 2016, 02:48:00 UTC |
| c089320 | René Scharfe | 13 August 2016, 12:09:49 UTC | commit: use xstrdup() in get_merge_parent() Handle allocation errors for the name member just like we already do for the struct merge_remote_desc itself. Signed-off-by: Rene Scharfe <l.s.r@web.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 August 2016, 02:47:49 UTC |
| ecf30b2 | René Scharfe | 13 August 2016, 09:05:42 UTC | mailinfo: recycle strbuf in check_header() handle_message_id() duplicates the contents of the strbuf that is passed to it. Its only caller proceeds to release the strbuf immediately after that. Reuse it instead and make that change of object ownership more obvious by inlining this short function. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 August 2016, 02:45:24 UTC |
| 0bb1519 | René Scharfe | 13 August 2016, 09:01:21 UTC | correct FLEXPTR_* example in comment This section is about "The FLEXPTR_* variants", so use FLEXPTR_ALLOC_STR in the example. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 August 2016, 02:44:03 UTC |
| 3126732 | Vasco Almeida | 12 August 2016, 11:59:02 UTC | t7411: become resilient to GETTEXT_POISON The concerned test greps the error message in git_parse_source() which contains "bad config line %d in submodule-blob %s". Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2016, 22:12:33 UTC |
| 0955ab4 | Vasco Almeida | 12 August 2016, 11:59:01 UTC | t5520: become resilient to GETTEXT_POISON Use test_i18ngrep function instead of grep for grepping strings. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2016, 22:12:33 UTC |
| 7ca79dc | Vasco Almeida | 12 August 2016, 11:59:00 UTC | t3404: become resilient to GETTEXT_POISON The concerned test greps the output of exit_with_patch() in git-rebase--interactive.sh script. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2016, 22:12:33 UTC |
| 2376d31 | Junio C Hamano | 12 August 2016, 17:02:18 UTC | Sync with 2.9.3 * tag 'v2.9.3': Git 2.9.3 | 12 August 2016, 17:02:18 UTC |
| 2807cd7 | Junio C Hamano | 12 August 2016, 17:01:42 UTC | Final batch before 2.10-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2016, 17:01:48 UTC |
| dd610ae | Junio C Hamano | 12 August 2016, 16:47:39 UTC | Merge branch 'kw/patch-ids-optim' When "git rebase" tries to compare set of changes on the updated upstream and our own branch, it computes patch-id for all of these changes and attempts to find matches. This has been optimized by lazily computing the full patch-id (which is expensive) to be compared only for changes that touch the same set of paths. * kw/patch-ids-optim: rebase: avoid computing unnecessary patch IDs patch-ids: add flag to create the diff patch id using header only data patch-ids: replace the seen indicator with a commit pointer patch-ids: stop using a hand-rolled hashmap implementation | 12 August 2016, 16:47:39 UTC |
| 3787e3c | Junio C Hamano | 12 August 2016, 16:47:38 UTC | Merge branch 'ew/http-backend-batch-headers' The http-backend (the server-side component of smart-http transport) used to trickle the HTTP header one at a time. Now these write(2)s are batched. * ew/http-backend-batch-headers: http-backend: buffer headers before sending | 12 August 2016, 16:47:38 UTC |
| 7575c12 | Junio C Hamano | 12 August 2016, 16:47:38 UTC | Merge branch 'va/i18n' * va/i18n: i18n: git-stash: mark messages for translation i18n: archive: mark errors for translation i18n: setup: mark error messages for translation | 12 August 2016, 16:47:38 UTC |
| e6b8f80 | Junio C Hamano | 12 August 2016, 16:47:37 UTC | Merge branch 'vs/typofix' * vs/typofix: Spelling fixes | 12 August 2016, 16:47:37 UTC |
| 2c44b7a | Junio C Hamano | 12 August 2016, 16:47:37 UTC | Merge branch 'js/mv-dir-to-new-directory' "git mv dir non-existing-dir/" did not work in some environments the same way as existing mainstream platforms. The code now moves "dir" to "non-existing-dir", without relying on rename("A", "B/") that strips the trailing slash of '/'. * js/mv-dir-to-new-directory: git mv: do not keep slash in `git mv dir non-existing-dir/` | 12 August 2016, 16:47:37 UTC |
| 0a315be | Junio C Hamano | 12 August 2016, 16:47:37 UTC | Merge branch 'rs/use-strbuf-add-unique-abbrev' A small code clean-up. * rs/use-strbuf-add-unique-abbrev: use strbuf_add_unique_abbrev() for adding short hashes | 12 August 2016, 16:47:37 UTC |
| 57734b4 | Junio C Hamano | 12 August 2016, 16:47:37 UTC | Merge branch 'jk/big-and-future-archive-tar' A small code clean-up. * jk/big-and-future-archive-tar: archive-tar: make write_extended_header() void | 12 August 2016, 16:47:37 UTC |
| 6d4960a | Junio C Hamano | 12 August 2016, 16:47:36 UTC | Merge branch 'jk/trace-fixup' Various small fixups to the "GIT_TRACE" facility. * jk/trace-fixup: trace: do not fall back to stderr write_or_die: drop write_or_whine_pipe() trace: disable key after write error trace: correct variable name in write() error message trace: cosmetic fixes for error messages trace: use warning() for printing trace errors trace: stop using write_or_whine_pipe() trace: handle NULL argument in trace_disable() | 12 August 2016, 16:47:36 UTC |
| 8a5ad2b | Junio C Hamano | 12 August 2016, 16:47:36 UTC | Merge branch 'rs/merge-recursive-string-list-init' A small code clean-up. * rs/merge-recursive-string-list-init: merge-recursive: use STRING_LIST_INIT_NODUP | 12 August 2016, 16:47:36 UTC |
| b32d7c5 | Junio C Hamano | 12 August 2016, 16:47:36 UTC | Merge branch 'rs/merge-add-strategies-simplification' A small code clean-up. * rs/merge-add-strategies-simplification: merge: use string_list_split() in add_strategies() | 12 August 2016, 16:47:36 UTC |
| 18f3ce8 | Junio C Hamano | 12 August 2016, 16:47:36 UTC | Merge branch 'rs/child-process-init' A small code clean-up. * rs/child-process-init: use CHILD_PROCESS_INIT to initialize automatic variables | 12 August 2016, 16:47:36 UTC |
| bb876eb | Junio C Hamano | 12 August 2016, 16:47:36 UTC | Merge branch 'js/import-tars-hardlinks' "import-tars" fast-import script (in contrib/) used to ignore a hardlink target and replaced it with an empty file, which has been corrected to record the same blob as the other file the hardlink is shared with. * js/import-tars-hardlinks: import-tars: support hard links | 12 August 2016, 16:47:36 UTC |
| 62134ef | Junio C Hamano | 12 August 2016, 16:47:35 UTC | Merge branch 'ms/document-pack-window-memory-is-per-thread' * ms/document-pack-window-memory-is-per-thread: document git-repack interaction of pack.threads and pack.windowMemory | 12 August 2016, 16:47:35 UTC |
| 7d4d742 | Junio C Hamano | 12 August 2016, 16:47:35 UTC | Merge branch 'vs/completion-branch-fully-spelled-d-m-r' * vs/completion-branch-fully-spelled-d-m-r: completion: complete --delete, --move, and --remotes for git branch | 12 August 2016, 16:47:35 UTC |
| 2f9c615 | Junio C Hamano | 12 August 2016, 16:47:34 UTC | Merge branch 'sb/submodule-clone-retry' Fix-up to an error codepath in a topic already in 'master'. * sb/submodule-clone-retry: submodule--helper: use parallel processor correctly | 12 August 2016, 16:47:34 UTC |
| e0c1cea | Junio C Hamano | 12 August 2016, 16:17:51 UTC | Git 2.9.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2016, 16:17:51 UTC |
| 9b601ea | Junio C Hamano | 12 August 2016, 16:16:57 UTC | Merge branch 'jk/difftool-in-subdir' into maint "git difftool <paths>..." started in a subdirectory failed to interpret the paths relative to that directory, which has been fixed. * jk/difftool-in-subdir: difftool: use Git::* functions instead of passing around state difftool: avoid $GIT_DIR and $GIT_WORK_TREE difftool: fix argument handling in subdirs | 12 August 2016, 16:16:57 UTC |
| f4fd627 | Junio C Hamano | 12 August 2016, 16:16:56 UTC | Merge branch 'jk/reset-ident-time-per-commit' into maint Not-so-recent rewrite of "git am" that started making internal calls into the commit machinery had an unintended regression, in that no matter how many seconds it took to apply many patches, the resulting committer timestamp for the resulting commits were all the same. * jk/reset-ident-time-per-commit: am: reset cached ident date for each patch | 12 August 2016, 16:16:56 UTC |
| b3dfeeb | Kevin Willford | 29 July 2016, 16:19:20 UTC | rebase: avoid computing unnecessary patch IDs The `rebase` family of Git commands avoid applying patches that were already integrated upstream. They do that by using the revision walking option that computes the patch IDs of the two sides of the rebase (local-only patches vs upstream-only ones) and skipping those local patches whose patch ID matches one of the upstream ones. In many cases, this causes unnecessary churn, as already the set of paths touched by a given commit would suffice to determine that an upstream patch has no local equivalent. This hurts performance in particular when there are a lot of upstream patches, and/or large ones. Therefore, let's introduce the concept of a "diff-header-only" patch ID, compare those first, and only evaluate the "full" patch ID lazily. Please note that in contrast to the "full" patch IDs, those "diff-header-only" patch IDs are prone to collide with one another, as adjacent commits frequently touch the very same files. Hence we now have to be careful to allow multiple hash entries with the same hash. We accomplish that by using the hashmap_add() function that does not even test for hash collisions. This also allows us to evaluate the full patch ID lazily, i.e. only when we found commits with matching diff-header-only patch IDs. We add a performance test that demonstrates ~1-6% improvement. In practice this will depend on various factors such as how many upstream changes and how big those changes are along with whether file system caches are cold or warm. As Git's test suite has no way of catching performance regressions, we also add a regression test that verifies that the full patch ID computation is skipped when the diff-header-only computation suffices. Signed-off-by: Kevin Willford <kcwillford@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2016, 21:39:16 UTC |
| 2e3a16b | Ville Skyttä | 09 August 2016, 08:53:38 UTC | Spelling fixes <BAD> <CORRECTED> accidently accidentally commited committed dependancy dependency emtpy empty existance existence explicitely explicitly git-upload-achive git-upload-archive hierachy hierarchy indegee indegree intial initial mulitple multiple non-existant non-existent precendence. precedence. priviledged privileged programatically programmatically psuedo-binary pseudo-binary soemwhere somewhere successfull successful transfering transferring uncommited uncommitted unkown unknown usefull useful writting writing Signed-off-by: Ville Skyttä <ville.skytta@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2016, 21:35:42 UTC |
| a42d7b6 | Junio C Hamano | 10 August 2016, 19:38:02 UTC | Sync with maint * maint: Yet another batch for 2.9.3 | 10 August 2016, 19:38:02 UTC |
| 27b0ea4 | Junio C Hamano | 10 August 2016, 19:35:40 UTC | Twelfth batch for 2.10 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 August 2016, 19:37:53 UTC |
| 11b5395 | Junio C Hamano | 10 August 2016, 19:33:20 UTC | Merge branch 'sb/submodule-update-dot-branch' A few updates to "git submodule update". Use of "| wc -l" break with BSD variant of 'wc'. * sb/submodule-update-dot-branch: t7406: fix breakage on OSX submodule update: allow '.' for branch value submodule--helper: add remote-branch helper submodule-config: keep configured branch around submodule--helper: fix usage string for relative-path submodule update: narrow scope of local variable submodule update: respect depth in subsequent fetches t7406: future proof tests with hard coded depth | 10 August 2016, 19:33:20 UTC |
| 1a5f1a3 | Junio C Hamano | 10 August 2016, 19:33:20 UTC | Merge branch 'js/am-3-merge-recursive-direct' "git am -3" calls "git merge-recursive" when it needs to fall back to a three-way merge; this call has been turned into an internal subroutine call instead of spawning a separate subprocess. * js/am-3-merge-recursive-direct: merge-recursive: flush output buffer even when erroring out merge_trees(): ensure that the callers release output buffer merge-recursive: offer an option to retain the output in 'obuf' merge-recursive: write the commit title in one go merge-recursive: flush output buffer before printing error messages am -3: use merge_recursive() directly again merge-recursive: switch to returning errors instead of dying merge-recursive: handle return values indicating errors merge-recursive: allow write_tree_from_memory() to error out merge-recursive: avoid returning a wholesale struct merge_recursive: abort properly upon errors prepare the builtins for a libified merge_recursive() merge-recursive: clarify code in was_tracked() die(_("BUG")): avoid translating bug messages die("bug"): report bugs consistently t5520: verify that `pull --rebase` shows the helpful advice when failing | 10 August 2016, 19:33:20 UTC |
| 7a3ea66 | Junio C Hamano | 10 August 2016, 19:33:20 UTC | Merge branch 'js/commit-slab-decl-fix' * js/commit-slab-decl-fix: commit-slab.h: avoid duplicated global static variables config.c: avoid duplicated global static variables | 10 August 2016, 19:33:20 UTC |
| 483ca93 | Junio C Hamano | 10 August 2016, 19:33:19 UTC | Merge branch 'jk/completion-diff-submodule' * jk/completion-diff-submodule: completion: add completion for --submodule=* diff option | 10 August 2016, 19:33:19 UTC |
| 2dceb92 | Junio C Hamano | 10 August 2016, 19:33:18 UTC | Merge branch 'cc/mailmap-tuxfamily' * cc/mailmap-tuxfamily: .mailmap: use Christian Couder's Tuxfamily address | 10 August 2016, 19:33:18 UTC |
| db40a62 | Junio C Hamano | 10 August 2016, 19:33:18 UTC | Merge branch 'jt/format-patch-from-config' "git format-patch" learned format.from configuration variable to specify the default settings for its "--from" option. * jt/format-patch-from-config: format-patch: format.from gives the default for --from | 10 August 2016, 19:33:18 UTC |
| e674762 | Junio C Hamano | 10 August 2016, 19:33:18 UTC | Merge branch 'jk/push-force-with-lease-creation' "git push --force-with-lease" already had enough logic to allow ensuring that such a push results in creation of a ref (i.e. the receiving end did not have another push from sideways that would be discarded by our force-pushing), but didn't expose this possibility to the users. It does so now. * jk/push-force-with-lease-creation: t5533: make it pass on case-sensitive filesystems push: allow pushing new branches with --force-with-lease push: add shorthand for --force-with-lease branch creation Documentation/git-push: fix placeholder formatting | 10 August 2016, 19:33:18 UTC |
| 24fbe00 | Junio C Hamano | 10 August 2016, 19:33:17 UTC | Merge branch 'jk/reset-ident-time-per-commit' Not-so-recent rewrite of "git am" that started making internal calls into the commit machinery had an unintended regression, in that no matter how many seconds it took to apply many patches, the resulting committer timestamp for the resulting commits were all the same. * jk/reset-ident-time-per-commit: am: reset cached ident date for each patch | 10 August 2016, 19:33:17 UTC |
| 8e4b75a | Junio C Hamano | 10 August 2016, 18:56:56 UTC | Yet another batch for 2.9.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 August 2016, 18:56:56 UTC |
| 019d8a4 | Junio C Hamano | 10 August 2016, 18:55:34 UTC | Merge branch 'jh/clean-smudge-f-doc' into maint A minor documentation update. This was split out from a stalled jh/clean-smudge-annex topic before discarding it. * jh/clean-smudge-f-doc: clarify %f documentation | 10 August 2016, 18:55:34 UTC |
| 574a31b | Junio C Hamano | 10 August 2016, 18:55:33 UTC | Merge branch 'rs/use-strbuf-addstr' into maint * rs/use-strbuf-addstr: use strbuf_addstr() instead of strbuf_addf() with "%s" use strbuf_addstr() for adding constant strings to a strbuf | 10 August 2016, 18:55:34 UTC |
| 9a54075 | Junio C Hamano | 10 August 2016, 18:55:33 UTC | Merge branch 'cp/completion-clone-recurse-submodules' into maint * cp/completion-clone-recurse-submodules: completion: add option '--recurse-submodules' to 'git clone' | 10 August 2016, 18:55:33 UTC |
| 66d6511 | Junio C Hamano | 10 August 2016, 18:55:32 UTC | Merge branch 'jk/t4205-cleanup' into maint Test modernization. * jk/t4205-cleanup: t4205: indent here documents t4205: drop top-level &&-chaining | 10 August 2016, 18:55:32 UTC |
| 33481c1 | Junio C Hamano | 10 August 2016, 18:55:31 UTC | Merge branch 'jc/hashmap-doc-init' into maint The API documentation for hashmap was unclear if hashmap_entry can be safely discarded without any other consideration. State that it is safe to do so. * jc/hashmap-doc-init: hashmap: clarify that hashmap_entry can safely be discarded | 10 August 2016, 18:55:31 UTC |
| 05a6d0e | Junio C Hamano | 10 August 2016, 18:55:31 UTC | Merge branch 'js/nedmalloc-gcc6-warnings' into maint Squelch compiler warnings for netmalloc (in compat/) library. * js/nedmalloc-gcc6-warnings: nedmalloc: work around overzealous GCC 6 warning nedmalloc: fix misleading indentation | 10 August 2016, 18:55:31 UTC |
| f7fb6e2 | Junio C Hamano | 10 August 2016, 18:55:30 UTC | Merge branch 'nd/fbsd-lazy-mtime' into maint FreeBSD can lie when asked mtime of a directory, which made the untracked cache code to fall back to a slow-path, which in turn caused tests in t7063 to fail because it wanted to verify the behaviour of the fast-path. * nd/fbsd-lazy-mtime: t7063: work around FreeBSD's lazy mtime update feature | 10 August 2016, 18:55:30 UTC |
| 1dc4aa6 | Junio C Hamano | 10 August 2016, 18:55:30 UTC | Merge branch 'ab/gitweb-link-html-escape' into maint The characters in the label shown for tags/refs for commits in "gitweb" output are now properly escaped for proper HTML output. * ab/gitweb-link-html-escape: gitweb: escape link body in format_ref_marker | 10 August 2016, 18:55:30 UTC |
| 85b2ea2 | Junio C Hamano | 10 August 2016, 18:55:29 UTC | Merge branch 'js/t4130-rename-without-ino' into maint Windows port was failing some tests in t4130, due to the lack of inum in the returned values by its lstat(2) emulation. * js/t4130-rename-without-ino: t4130: work around Windows limitation | 10 August 2016, 18:55:30 UTC |
| 7b163e9 | Junio C Hamano | 10 August 2016, 18:55:29 UTC | Merge branch 'jc/grep-commandline-vs-configuration' into maint "git -c grep.patternType=extended log --basic-regexp" misbehaved because the internal API to access the grep machinery was not designed well. * jc/grep-commandline-vs-configuration: grep: further simplify setting the pattern type | 10 August 2016, 18:55:29 UTC |
| cee6c5b | Junio C Hamano | 10 August 2016, 18:55:28 UTC | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maint There is an optimization used in "git diff $treeA $treeB" to borrow an already checked-out copy in the working tree when it is known to be the same as the blob being compared, expecting that open/mmap of such a file is faster than reading it from the object store, which involves inflating and applying delta. This however kicked in even when the checked-out copy needs to go through the convert-to-git conversion (including the clean filter), which defeats the whole point of the optimization. The optimization has been disabled when the conversion is necessary. * jk/diff-do-not-reuse-wtf-needs-cleaning: diff: do not reuse worktree files that need "clean" conversion | 10 August 2016, 18:55:28 UTC |
| d1d9c3c | Junio C Hamano | 10 August 2016, 18:55:27 UTC | Merge branch 'pm/build-persistent-https-with-recent-go' into maint The build procedure for "git persistent-https" helper (in contrib/) has been updated so that it can be built with more recent versions of Go. * pm/build-persistent-https-with-recent-go: contrib/persistent-https: use Git version for build label contrib/persistent-https: update ldflags syntax for Go 1.7+ | 10 August 2016, 18:55:27 UTC |
| 366d2d5 | Junio C Hamano | 10 August 2016, 18:55:26 UTC | Merge branch 'da/subtree-2.9-regression' into maint "git merge" in Git v2.9 was taught to forbid merging an unrelated lines of history by default, but that is exactly the kind of thing the "--rejoin" mode of "git subtree" (in contrib/) wants to do. "git subtree" has been taught to use the "--allow-unrelated-histories" option to override the default. * da/subtree-2.9-regression: subtree: fix "git subtree split --rejoin" t7900-subtree.sh: fix quoting and broken && chains | 10 August 2016, 18:55:26 UTC |
| d9d7ab3 | Junio C Hamano | 10 August 2016, 18:55:25 UTC | Merge branch 'os/no-verify-skips-commit-msg-too' into maint "git commit --help" said "--no-verify" is only about skipping the pre-commit hook, and failed to say that it also skipped the commit-msg hook. * os/no-verify-skips-commit-msg-too: commit: describe that --no-verify skips the commit-msg hook in the help text | 10 August 2016, 18:55:25 UTC |
| b7fb136 | Junio C Hamano | 10 August 2016, 18:55:24 UTC | Merge branch 'rs/rm-strbuf-optim' into maint The use of strbuf in "git rm" to build filename to remove was a bit suboptimal, which has been fixed. * rs/rm-strbuf-optim: rm: reuse strbuf for all remove_dir_recursively() calls | 10 August 2016, 18:55:24 UTC |
| 60b84ba | Junio C Hamano | 10 August 2016, 18:55:23 UTC | Merge branch 'jk/parse-options-concat' into maint Users of the parse_options_concat() API function need to allocate extra slots in advance and fill them with OPT_END() when they want to decide the set of supported options dynamically, which makes the code error-prone and hard to read. This has been corrected by tweaking the API to allocate and return a new copy of "struct option" array. * jk/parse-options-concat: parse_options: allocate a new array when concatenating | 10 August 2016, 18:55:24 UTC |
| dbc5276 | Junio C Hamano | 10 August 2016, 18:55:22 UTC | Merge branch 'ls/travis-enable-httpd-tests' into maint Allow http daemon tests in Travis CI tests. * ls/travis-enable-httpd-tests: travis-ci: enable web server tests t55xx on Linux | 10 August 2016, 18:55:23 UTC |
| f98a20c | Junio C Hamano | 10 August 2016, 18:55:20 UTC | Merge branch 'ew/autoconf-pthread' into maint Existing autoconf generated test for the need to link with pthread library did not check all the functions from pthread libraries; recent FreeBSD has some functions in libc but not others, and we mistakenly thought linking with libc is enough when it is not. * ew/autoconf-pthread: configure.ac: stronger test for pthread linkage | 10 August 2016, 18:55:21 UTC |
| e223c2c | Junio C Hamano | 10 August 2016, 18:55:19 UTC | Merge branch 'rs/help-c-source-with-gitattributes' into maint The .c/.h sources are marked as such in our .gitattributes file so that "git diff -W" and friends would work better. * rs/help-c-source-with-gitattributes: .gitattributes: set file type for C files | 10 August 2016, 18:55:20 UTC |
| 61efc5c | Junio C Hamano | 10 August 2016, 18:55:19 UTC | Merge branch 'mm/status-suggest-merge-abort' into maint "git status" learned to suggest "merge --abort" during a conflicted merge, just like it already suggests "rebase --abort" during a conflicted rebase. * mm/status-suggest-merge-abort: status: suggest 'git merge --abort' when appropriate | 10 August 2016, 18:55:19 UTC |
| 967d7f8 | Stefan Beller | 10 August 2016, 17:56:07 UTC | t7406: fix breakage on OSX On OSX `wc` prefixes the output of numbers with whitespace, such that the `commit_count` would be "SP <NUMBER>". When using that in git submodule update --init --depth=$commit_count the depth would be empty and the number is interpreted as the pathspec. Fix this by not using `wc` and rather instruct rev-list to count. Another way to fix this is to remove the `=` sign after the `--depth` argument as then we are allowed to have more than just one whitespace between `--depth` and the actual number. Prefer the solution of rev-list counting as that is expected to be slightly faster and more self-contained within Git. Reported-by: Lars Schneider <larsxschneider@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com>, Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 August 2016, 18:27:22 UTC |
| 954176c | Michael Stahl | 10 August 2016, 10:39:35 UTC | document git-repack interaction of pack.threads and pack.windowMemory Signed-off-by: Michael Stahl <mstahl@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 August 2016, 17:55:13 UTC |
| 599e7a0 | Vasco Almeida | 10 August 2016, 10:50:30 UTC | i18n: git-stash: mark messages for translation Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 August 2016, 17:50:18 UTC |
| b36045c | Eric Wong | 09 August 2016, 23:47:31 UTC | http-backend: buffer headers before sending Avoid waking up the readers for unnecessary context switches for each line of header data being written, as all the headers are written in short succession. It is unlikely any HTTP/1.x server would want to read a CGI response one-line-at-a-time and trickle each to the client. Instead, I'd expect HTTP servers want to minimize syscall and TCP/IP framing overhead by trying to send all of its response headers in a single syscall or even combining the headers and first chunk of the body with MSG_MORE or writev. Verified by strace-ing response parsing on the CGI side. Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 August 2016, 16:27:26 UTC |
| 2201ee0 | Stefan Beller | 09 August 2016, 21:29:13 UTC | submodule--helper: use parallel processor correctly When developing another patch series I had a temporary state in which git-clone would segfault, when the call was prepared in prepare_to_clone_next_submodule. This lead to the call failing, i.e. in `update_clone_task_finished` the task was scheduled to be tried again. The second call to prepare_to_clone_next_submodule would return 0, as the segfaulted clone did create the .git file already, such that was not considered to need to be cloned again. I was seeing the "BUG: ce was a submodule before?\n" message, which was the correct behavior at the time as my local code was buggy. When trying to debug this failure, I tried to use printing messages into the strbuf that is passed around, but these messages were never printed as the die(..) doesn't flush the `err` strbuf. When implementing the die() in 665b35ecc (2016-06-09, "submodule--helper: initial clone learns retry logic"), I considered this condition to be a severe condition, which should lead to an immediate abort as we do not trust ourselves any more. However the queued messages in `err` are valuable so let's not toss them out by immediately dying, but a graceful return. Another thing to note: The error message itself was misleading. A return value of 0 doesn't indicate the passed in `ce` is not a submodule any more, but just that we do not consider cloning it any more. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2016, 21:54:16 UTC |
| ac76fd5 | Jacob Keller | 09 August 2016, 18:34:46 UTC | completion: add completion for --submodule=* diff option Teach git-completion.bash to complete --submodule= for git commands which take diff options. Also teach completion for git-log to support --diff-algorithms as well. Signed-off-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2016, 19:51:50 UTC |
| 5a36d00 | Vasco Almeida | 08 August 2016, 11:16:00 UTC | i18n: archive: mark errors for translation Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2016, 19:44:59 UTC |
| 2ff30e6 | Vasco Almeida | 08 August 2016, 11:15:59 UTC | i18n: setup: mark error messages for translation Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2016, 19:44:59 UTC |
| 2703c22 | Ville Skyttä | 09 August 2016, 09:34:44 UTC | completion: complete --delete, --move, and --remotes for git branch Signed-off-by: Ville Skyttä <ville.skytta@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2016, 18:30:23 UTC |
| af920e3 | Johannes Sixt | 09 August 2016, 14:17:56 UTC | commit-slab.h: avoid duplicated global static variables The gigantic define_commit_slab() macro repeats the definition of a static variable that occurs earlier in the macro text. The purpose of the repeated definition at the end of the macro is that it takes the semicolon that occurs where the macro is used. We cannot just remove the first definition of the variable because it is referenced elsewhere in the macro text, and defining the macro later would produce undefined identifier errors. We cannot have a "forward" declaration, either. (This works only with "extern" global variables.) The solution is to use a declaration of a struct that is already defined earlier. This language construct can serve the same purpose as the duplicated static variable definition, but without the confusion. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2016, 17:20:06 UTC |
| dc29dde | Johannes Sixt | 09 August 2016, 14:16:33 UTC | config.c: avoid duplicated global static variables Repeating the definition of a static variable seems to be valid in C. Nevertheless, it is bad style because it can cause confusion, definitely when it becomes necessary to change the type. d64ec16 (git config: reorganize to use parseopt, 2009-02-21) added two static variables near the top of the file config.c without removing the definitions of the two variables that occurs later in the file. The two variables were needed earlier in the file in the newly introduced parseopt structure. These references were removed later in d0e08d6 (config: fix parsing of "git config --get-color some.key -1", 2014-11-20). Remove the redundant, younger, definitions near the top of the file and keep the original definitions that occur later. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2016, 17:19:24 UTC |
| b3cbdd4 | Christian Couder | 08 August 2016, 21:17:22 UTC | .mailmap: use Christian Couder's Tuxfamily address Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 August 2016, 22:17:24 UTC |
