| 28274d0 | Junio C Hamano | 28 December 2015, 22:00:52 UTC | Git 2.7-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2015, 22:00:52 UTC |
| aecb997 | Junio C Hamano | 28 December 2015, 21:58:57 UTC | Merge branch 'sh/p4-multi-depot' "git p4" when interacting with multiple depots at the same time used to incorrectly drop changes. * sh/p4-multi-depot: git-p4: reduce number of server queries for fetches git-p4: support multiple depot paths in p4 submit git-p4: failing test case for skipping changes with multiple depots | 28 December 2015, 21:58:58 UTC |
| 7195733 | Junio C Hamano | 28 December 2015, 21:58:03 UTC | Merge branch 'jk/pending-keep-tag-name' 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 | 28 December 2015, 21:58:04 UTC |
| e929264 | Junio C Hamano | 28 December 2015, 21:57:24 UTC | Merge branch 'jk/symbolic-ref-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() | 28 December 2015, 21:57:24 UTC |
| ce858c0 | Junio C Hamano | 28 December 2015, 21:53:47 UTC | Merge tag 'l10n-2.7.0-rnd2' of git://github.com/git-l10n/git-po l10n-2.7.0-rnd2 * tag 'l10n-2.7.0-rnd2' of git://github.com/git-l10n/git-po: l10n: ru.po: update Russian translation l10n: Updated Bulgarian translation of git (2477t,0f,0u) l10n: ca.po: update translation l10n: zh_CN: for git v2.7.0 l10n round 2 l10n: sv.po: Update Swedish translation (2477t0f0u) l10n: sv: Fix bad translation l10n: fr.po v2.7.0 round 2 (2477t) l10n: git.pot: v2.7.0 round 2 (2 new, 2 removed) l10n: zh_CN: for git v2.7.0 l10n round 1 l10n: ca.po: update translation l10n: fr v2.7.0 round 1 (2477t) l10n: Updated Bulgarian translation of git (2477t,0f,0u) l10n: sv.po: Update Swedish translation (2477t0f0u) l10n: vi.po: Updated translation (2477t) l10n: git.pot: v2.7.0 round 1 (66 new, 29 removed) l10n: fr.po: Fix typo l10n: fr.po: Fix typo | 28 December 2015, 21:53:47 UTC |
| 5fa9ab8 | Dimitriy Ryazantcev | 25 December 2015, 12:02:48 UTC | l10n: ru.po: update Russian translation Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com> | 28 December 2015, 15:16:00 UTC |
| 9011cf9 | Jiang Xin | 28 December 2015, 15:13:15 UTC | Merge branch 'master' of git://github.com/alshopov/git-po * 'master' of git://github.com/alshopov/git-po: l10n: Updated Bulgarian translation of git (2477t,0f,0u) | 28 December 2015, 15:13:15 UTC |
| c5e5e68 | Alexander Shopov | 28 December 2015, 09:33:41 UTC | l10n: Updated Bulgarian translation of git (2477t,0f,0u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 28 December 2015, 09:33:41 UTC |
| 62c9705 | Alex Henrie | 28 December 2015, 04:42:59 UTC | l10n: ca.po: update translation Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 28 December 2015, 04:42:59 UTC |
| 89f80d7 | Jiang Xin | 22 December 2015, 15:06:59 UTC | l10n: zh_CN: for git v2.7.0 l10n round 2 Update 2 translations (2477t0f0u) for git v2.7.0-rc1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 26 December 2015, 13:22:53 UTC |
| 707a423 | Jiang Xin | 26 December 2015, 13:22:30 UTC | Merge branch 'master' of git://github.com/nafmo/git-l10n-sv * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (2477t0f0u) l10n: sv: Fix bad translation | 26 December 2015, 13:22:30 UTC |
| 9ff1198 | Peter Krefting | 26 December 2015, 11:27:15 UTC | l10n: sv.po: Update Swedish translation (2477t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 26 December 2015, 11:27:15 UTC |
| 171e58a | Peter Krefting | 07 November 2015, 14:48:20 UTC | l10n: sv: Fix bad translation Found-by: Sebastian Rasmussen <sebras@gmail.com> Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 26 December 2015, 11:24:44 UTC |
| f938915 | Jean-Noel Avila | 24 December 2015, 06:38:22 UTC | l10n: fr.po v2.7.0 round 2 (2477t) Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 24 December 2015, 06:38:22 UTC |
| 554f6e4 | Junio C Hamano | 22 December 2015, 22:46:01 UTC | Git 2.7-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2015, 22:46:01 UTC |
| de60b97 | Junio C Hamano | 22 December 2015, 22:45:16 UTC | Merge branch 'js/emu-write-epipe-on-windows' The write(2) emulation for Windows learned to set errno to EPIPE when necessary. * js/emu-write-epipe-on-windows: mingw: emulate write(2) that fails with a EPIPE | 22 December 2015, 22:45:16 UTC |
| 6a4f2ec | Ralf Thielow | 22 December 2015, 17:53:00 UTC | push: don't mark options of recurse-submodules for translation Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2015, 22:40:47 UTC |
| 2c0ca05 | Jiang Xin | 22 December 2015, 14:51:43 UTC | l10n: git.pot: v2.7.0 round 2 (2 new, 2 removed) Generate po/git.pot from v2.7.0-rc1-44-g1d88dab for git v2.7.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 22 December 2015, 14:51:43 UTC |
| 076ab2b | Jiang Xin | 22 December 2015, 14:50:24 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.7.0 l10n round 1 l10n: ca.po: update translation l10n: fr v2.7.0 round 1 (2477t) l10n: Updated Bulgarian translation of git (2477t,0f,0u) l10n: sv.po: Update Swedish translation (2477t0f0u) l10n: vi.po: Updated translation (2477t) l10n: git.pot: v2.7.0 round 1 (66 new, 29 removed) l10n: fr.po: Fix typo l10n: fr.po: Fix typo | 22 December 2015, 14:50:24 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 |
| 1f90a64 | Sam Hocevar | 19 December 2015, 09:39:40 UTC | git-p4: reduce number of server queries for fetches When fetching changes from a depot using a full client spec, there is no need to perform as many queries as there are top-level paths in the client spec. Instead we query all changes in chronological order, also getting rid of the need to sort the results and remove duplicates. Signed-off-by: Sam Hocevar <sam@hocevar.net> Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2015, 19:26:55 UTC |
| cbc6924 | Sam Hocevar | 19 December 2015, 09:39:39 UTC | git-p4: support multiple depot paths in p4 submit When submitting from a repository that was cloned using a client spec, use the full list of paths when ruling out files that are outside the view. This fixes a bug where only files pertaining to the first path would be included in the p4 submit. Signed-off-by: Sam Hocevar <sam@hocevar.net> Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2015, 19:26:36 UTC |
| 1d88dab | Junio C Hamano | 21 December 2015, 19:08:20 UTC | Update release notes to 2.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2015, 19:08:20 UTC |
| fbe959d | Junio C Hamano | 21 December 2015, 18:59:07 UTC | Merge branch 'bc/format-patch-null-from-line' "format-patch" has learned a new option to zero-out the commit object name on the mbox "From " line. * bc/format-patch-null-from-line: format-patch: check that header line has expected format format-patch: add an option to suppress commit hash sha1_file.c: introduce a null_oid constant | 21 December 2015, 18:59:08 UTC |
| 5498c57 | Junio C Hamano | 21 December 2015, 18:59:07 UTC | Merge branch 'jk/ident-loosen-getpwuid' 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 | 21 December 2015, 18:59:07 UTC |
| 7aaff08 | Junio C Hamano | 21 December 2015, 18:59:06 UTC | Merge branch 'jk/send-email-ssl-errors' Improve error reporting when SMTP TLS fails. * jk/send-email-ssl-errors: send-email: enable SSL level 1 debug output | 21 December 2015, 18:59:06 UTC |
| d78cba4 | Junio C Hamano | 21 December 2015, 18:59:06 UTC | Merge branch 'sg/completion-no-column' 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 | 21 December 2015, 18:59:06 UTC |
| 5d35d72 | Junio C Hamano | 21 December 2015, 18:59:05 UTC | Merge branch 'mc/push-recurse-submodules-config' Add new config to avoid typing "--recurse-submodules" on each push. * mc/push-recurse-submodules-config: push: follow the "last one wins" convention for --recurse-submodules push: test that --recurse-submodules on command line overrides config push: add recurseSubmodules config option | 21 December 2015, 18:59:05 UTC |
| 2b86292 | Johannes Schindelin | 17 December 2015, 17:08:15 UTC | mingw: emulate write(2) that fails with a EPIPE On Windows, when writing to a pipe fails, errno is always EINVAL. However, Git expects it to be EPIPE. According to the documentation, there are two cases in which write() triggers EINVAL: the buffer is NULL, or the length is odd but the mode is 16-bit Unicode (the broken pipe is not mentioned as possible cause). Git never sets the file mode to anything but binary, therefore we know that errno should actually be EPIPE if it is EINVAL and the buffer is not NULL. See https://msdn.microsoft.com/en-us/library/1570wh78.aspx for more details. This works around t5571.11 failing with v2.6.4 on Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2015, 16:59:04 UTC |
| c3ee2e2 | Junio C Hamano | 21 December 2015, 16:56:16 UTC | Merge git://ozlabs.org/~paulus/gitk * git://ozlabs.org/~paulus/gitk: gitk: sv.po: Update Swedish translation (311t) gitk: Let .bleft.mid widgets 'breathe' gitk: Match ttk fonts to gitk fonts gitk: Update revision date in Japanese PO file gitk: Update "Language:" header gitk: Improve translation message gitk: Remove unused line gitk: Update year gitk: Change last translator line gitk: Update fuzzy messages gitk: Update Japanese translation gitk: Fix translation around copyright sign gitk: Update Japanese translation gitk: Fix wrong translation gitk: Translate Japanese catalog gitk: Translate more to Japanese catalog gitk: Update Japanese message catalog gitk: Re-sync line number in Japanese message catalogue gitk: Color name update | 21 December 2015, 16:56:16 UTC |
| 94550ed | Jiang Xin | 15 November 2015, 23:02:11 UTC | l10n: zh_CN: for git v2.7.0 l10n round 1 Update 66 translations (2477t0f0u) for git v2.7.0-rc0. Reviewed-by: Ray Chen <oldsharp@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 20 December 2015, 11:33:14 UTC |
| 5b82d4e | Jiang Xin | 20 December 2015, 11:32:26 UTC | Merge branch 'master' of git://github.com/alexhenrie/git-po * 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: update translation | 20 December 2015, 11:32:26 UTC |
| 1369190 | Jiang Xin | 20 December 2015, 11:31:47 UTC | Merge branch 'fr_v2.7.0' of git://github.com/jnavila/git * 'fr_v2.7.0' of git://github.com/jnavila/git: l10n: fr v2.7.0 round 1 (2477t) | 20 December 2015, 11:31:47 UTC |
| e976d7a | Jiang Xin | 20 December 2015, 11:30:52 UTC | Merge branch 'master' of git://github.com/alshopov/git-po * 'master' of git://github.com/alshopov/git-po: l10n: Updated Bulgarian translation of git (2477t,0f,0u) | 20 December 2015, 11:30:52 UTC |
| 0d8e36f | Alex Henrie | 19 December 2015, 06:38:23 UTC | l10n: ca.po: update translation Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 19 December 2015, 06:38:23 UTC |
| 0de75aa | Paul Mackerras | 19 December 2015, 02:33:16 UTC | Merge branch 'ja.po' of https://github.com/qykth-git/gitk | 19 December 2015, 02:33:16 UTC |
| 04d04c0 | Paul Mackerras | 19 December 2015, 02:29:35 UTC | Merge branch 'color-fix' of https://github.com/qykth-git/gitk | 19 December 2015, 02:29:35 UTC |
| ffd5159 | Jean-Noel Avila | 18 December 2015, 21:00:37 UTC | l10n: fr v2.7.0 round 1 (2477t) Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 18 December 2015, 21:00:37 UTC |
| aeef7d8 | Alexander Shopov | 13 December 2015, 16:55:45 UTC | l10n: Updated Bulgarian translation of git (2477t,0f,0u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 18 December 2015, 08:36:21 UTC |
| fbc63eb | Peter Krefting | 18 December 2015, 08:09:41 UTC | l10n: sv.po: Update Swedish translation (2477t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 18 December 2015, 08:09:41 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 |
| f3adf45 | Junio C Hamano | 16 December 2015, 22:42:52 UTC | Merge branch 'fr/rebase-i-continue-preserve-options' "git rebase -i" started with merge strategy options did not propagate them upon "git rebase --continue". * fr/rebase-i-continue-preserve-options: rebase -i: remember merge options beyond continue actions | 16 December 2015, 22:42:52 UTC |
| 787407e | Junio C Hamano | 16 December 2015, 22:40:30 UTC | Merge branch 'maint' * maint: credential-store: don't pass strerror to die_errno() | 16 December 2015, 22:40:30 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 |
| 06dfc9e | brian m. carlson | 15 December 2015, 01:52:05 UTC | format-patch: check that header line has expected format The format of the "From " header line is very specific to allow utilities to detect Git-style patches. Add a test that the patches created are in the expected format. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2015, 18:03:56 UTC |
| 3a30aa1 | brian m. carlson | 15 December 2015, 01:52:04 UTC | format-patch: add an option to suppress commit hash Oftentimes, patches created by git format-patch will be stored in version control or compared with diff. In these cases, two otherwise identical patches can have different commit hashes, leading to diff noise. Teach git format-patch a --zero-commit option that instead produces an all-zero hash to avoid this diff noise. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2015, 18:03:40 UTC |
| f900c83 | Junio C Hamano | 15 December 2015, 17:47:11 UTC | Git 2.7-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2015, 17:47:11 UTC |
| bdb32a8 | Junio C Hamano | 15 December 2015, 17:45:06 UTC | Sync with maint | 15 December 2015, 17:45:16 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 |
| 9c69f77 | Junio C Hamano | 15 December 2015, 17:33:19 UTC | Merge branch 'jk/send-email-complete-aliases' A fix-up for recent topic. * jk/send-email-complete-aliases: completion: fix completing unstuck email alias arguments | 15 December 2015, 17:33:19 UTC |
| 47be26d | Junio C Hamano | 15 December 2015, 17:33:19 UTC | Merge branch 'ep/ident-with-getaddrinfo' A fix-up for recent topic. * ep/ident-with-getaddrinfo: ident: fix undefined variable when NO_IPV6 is set | 15 December 2015, 17:33: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 |
| a899d50 | Junio C Hamano | 15 December 2015, 16:02:18 UTC | Merge branch 'ls/p4-keep-empty-commits' "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, 16:02:19 UTC |
| 897b185 | Junio C Hamano | 15 December 2015, 16:02:13 UTC | Merge branch 'jk/prune-mtime' 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, 16:02:16 UTC |
| 785e70f | Luke Diamand | 13 December 2015, 20:07:13 UTC | git-p4: failing test case for skipping changes with multiple depots James Farwell reported that with multiple depots git-p4 would skip changes. http://article.gmane.org/gmane.comp.version-control.git/282297 Add a failing test case demonstrating the problem. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2015, 22:03:45 UTC |
| ccab28a | SZEDER Gábor | 12 December 2015, 00:18:18 UTC | completion: fix completing unstuck email alias arguments Completing unstuck form of email aliases doesn't quite work: $ git send-email --to <TAB> alice bob cecil $ git send-email --to a<TAB> alice bob cecil While listing email aliases works as expected, the second case should just complete to 'alice', but it keeps offering all email aliases instead. The cause for this behavior is that in this case we mistakenly tell __gitcomp() explicitly that the current word to be completed is empty, while in reality it is not. As a result __gitcomp() doesn't filter out non-matching aliases, so all aliases end up being offered over and over again. Fix this by not passing the current word to be completed to __gitcomp() and letting it go the default route and grab it from the '$cur' variable. Don't pass empty prefix either, because it's assumed to be empty when unspecified, so it's not necessary. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2015, 22:01:37 UTC |
| 3e56e72 | brian m. carlson | 06 December 2015, 22:16:35 UTC | sha1_file.c: introduce a null_oid constant null_oid is the struct object_id equivalent to null_sha1. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2015, 21:35:54 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 |
| 843565a | Tran Ngoc Quan | 12 December 2015, 07:34:08 UTC | l10n: vi.po: Updated translation (2477t) Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 12 December 2015, 07:34:08 UTC |
| 4f7214b | Peter Krefting | 11 December 2015, 08:49:21 UTC | gitk: sv.po: Update Swedish translation (311t) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Paul Mackerras <paulus@samba.org> | 12 December 2015, 02:48:20 UTC |
| cae4b60 | Giuseppe Bilotta | 08 December 2015, 07:05:51 UTC | gitk: Let .bleft.mid widgets 'breathe' The widgets on top of the diff window are very tightly packed. Make them breathe a little by adding an 'i'-spaced padding between them. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 12 December 2015, 02:43:53 UTC |
| 6cb73c8 | Giuseppe Bilotta | 08 December 2015, 07:05:50 UTC | gitk: Match ttk fonts to gitk fonts The fonts set in setoptions aren't consistently picked up by ttk, which uses its own predefined fonts. This is noticeable when switching between using and not using ttk with custom fonts or in HiDPI settings (where the default TTK fonts do _not_ respect tk sclaing). Fix by mapping the ttk fontset to the one used by gitk internally. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 12 December 2015, 02:43:52 UTC |
| 040fd39 | Fabian Ruch | 11 December 2015, 20:30:36 UTC | rebase -i: remember merge options beyond continue actions If the user explicitly specified a merge strategy or strategy options, continue to use that strategy/option after "rebase --continue". Add a test of the corrected behavior. If --merge is specified or implied by -s or -X, then "strategy and "strategy_opts" are set to values from which "strategy_args" can be derived; otherwise they are set to empty strings. Either way, their values are propagated from one step of an interactive rebase to the next via state files. "do_merge", on the other hand, is *not* propagated to later steps of an interactive rebase. Therefore, making the initialization of "strategy_args" conditional on "do_merge" being set prevents later steps of an interactive rebase from setting it correctly. Luckily, we don't need the "do_merge" guard at all. If the rebase was started without --merge, then "strategy" and "strategy_opts" are both the empty string, which results in "strategy_args" also being set to the empty string, which is just what we want in that situation. So remove the "do_merge" guard and derive "strategy_args" from "strategy" and "strategy_opts" every time. Reported-by: Diogo de Campos <campos@esss.com.br> Signed-off-by: Fabian Ruch <bafain@gmail.com> Helped-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2015, 20:44:44 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 |
| 4b9ab0e | Junio C Hamano | 11 December 2015, 18:45:44 UTC | Update release notes to 2.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2015, 19:20:23 UTC |
| 52b2e6b | Junio C Hamano | 11 December 2015, 19:19:43 UTC | Merge branch 'maint' * maint: Prepare for 2.6.5 | 11 December 2015, 19:19:43 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 |
| 782ca8c | Junio C Hamano | 11 December 2015, 18:41:01 UTC | Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' 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, 18:41:01 UTC |
| fa41b05 | Junio C Hamano | 11 December 2015, 18:40:59 UTC | Merge branch 'sb/doc-submodule-sync-recursive' * sb/doc-submodule-sync-recursive: document submodule sync --recursive | 11 December 2015, 18:41:00 UTC |
| c87eec9 | Junio C Hamano | 11 December 2015, 18:40:57 UTC | Merge branch 'cb/t3404-shellquote' * cb/t3404-shellquote: t3404: fix quoting of redirect for some versions of bash | 11 December 2015, 18:40:58 UTC |
| e0048d3 | Junio C Hamano | 11 December 2015, 18:40:54 UTC | Merge branch 'sg/lock-file-commit-error' 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, 18:40:55 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 |
| f4f2c8f | Jiang Xin | 11 December 2015, 15:37:11 UTC | l10n: git.pot: v2.7.0 round 1 (66 new, 29 removed) Generate po/git.pot from v2.7.0-rc0 for git v2.7.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 11 December 2015, 15:37:11 UTC |
| c65da26 | Jiang Xin | 11 December 2015, 15:33:45 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: fr.po: Fix typo l10n: fr.po: Fix typo | 11 December 2015, 15:33:45 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 |
| 7d72253 | Junio C Hamano | 10 December 2015, 20:59:37 UTC | Git 2.7-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2015, 20:59:37 UTC |
| 39e07f7 | Junio C Hamano | 10 December 2015, 20:45:17 UTC | Sync with maint * maint: Documentation/git-update-index: add missing opts to synopsis | 10 December 2015, 20:45:17 UTC |
| 86c95ac | Junio C Hamano | 10 December 2015, 20:43:52 UTC | Update release notes to 2.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2015, 20:43:52 UTC |
| 56d63d0 | Junio C Hamano | 10 December 2015, 20:36:15 UTC | Merge branch 'nd/doc-check-ref-format-typo' * nd/doc-check-ref-format-typo: git-check-ref-format.txt: typo, s/avoids/avoid/ | 10 December 2015, 20:36:15 UTC |
| 844a9ce | Junio C Hamano | 10 December 2015, 20:36:13 UTC | Merge branch 'bc/object-id' More transition from "unsigned char[40]" to "struct object_id". This needed a few merge fixups, but is mostly disentangled from other topics. * bc/object-id: remote: convert functions to struct object_id Remove get_object_hash. Convert struct object to object_id Add several uses of get_object_hash. object: introduce get_object_hash macro. ref_newer: convert to use struct object_id push_refs_with_export: convert to struct object_id get_remote_heads: convert to struct object_id parse_fetch: convert to use struct object_id add_sought_entry_mem: convert to struct object_id Convert struct ref to use object_id. sha1_file: introduce has_object_file helper. | 10 December 2015, 20:36:13 UTC |
| b12a966 | Junio C Hamano | 10 December 2015, 20:36:12 UTC | Merge branch 'dt/fsck-verify-pack-error' 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 | 10 December 2015, 20:36:12 UTC |
| 9eb2449 | Junio C Hamano | 10 December 2015, 20:36:12 UTC | Merge branch 'ls/travis-yaml' The necessary infrastructure to build topics using the free Travis CI has been added. Developers forking from this topic (and enabling Travis) can do their own builds, and we can turn on auto-builds for git/git (including build-status for pull requests that people open). * ls/travis-yaml: Add Travis CI support | 10 December 2015, 20:36:12 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 |
