- 26 7月, 2019 10 次提交
-
-
由 Junio C Hamano 提交于
"git merge --squash" is designed to update the working tree and the index without creating the commit, and this cannot be countermanded by adding the "--commit" option; the command now refuses to work when both options are given. * vv/merge-squash-with-explicit-commit: merge: refuse --commit with --squash
-
由 Junio C Hamano 提交于
"git bundle verify" needs to see if prerequisite objects exist in the receiving repository, but the command did not check if we are in a repository upfront, which has been corrected. * js/bundle-verify-require-object-store: bundle verify: error out if called without an object database
-
由 Junio C Hamano 提交于
"git am -i --resolved" segfaulted after trying to see a commit as if it were a tree, which has been corrected. * jk/am-i-resolved-fix: am: fix --interactive HEAD tree resolution am: drop tty requirement for --interactive am: read interactive input from stdin am: simplify prompt response handling
-
由 Junio C Hamano 提交于
The server side support for "git fetch" used to show incorrect value for the HEAD symbolic ref when the namespace feature is in use, which has been corrected. * jk/HEAD-symref-in-xfer-namespaces: upload-pack: strip namespace from symref data
-
由 Junio C Hamano 提交于
"git update-server-info" used to leave stale packfiles in its output, which has been corrected. * ew/server-info-remove-crufts: server-info: do not list unlinked packs
-
由 Junio C Hamano 提交于
More parameter validation. * es/grep-require-name-when-needed: grep: fail if call could output and name is null
-
由 Junio C Hamano 提交于
Code cleanup and futureproof. * ds/object-info-for-prefetch-fix: sha1-file: split OBJECT_INFO_FOR_PREFETCH
-
由 Junio C Hamano 提交于
The ownership rule for the file descriptor to fast-import remote backend was mixed up, leading to unrelated file descriptor getting closed, which has been fixed. * mh/import-transport-fd-fix: Use xmmap_gently instead of xmmap in use_pack dup() the input fd for fast-import used for remote helpers
-
由 Junio C Hamano 提交于
"git worktree add" used to fail when another worktree connected to the same repository was corrupt, which has been corrected. * nd/corrupt-worktrees: worktree add: be tolerant of corrupt worktrees
-
由 Junio C Hamano 提交于
A relative pathname given to "git init --template=<path> <repo>" ought to be relative to the directory "git init" gets invoked in, but it instead was made relative to the repository, which has been corrected. * nd/init-relative-template-fix: init: make --template path relative to $CWD
-
- 08 6月, 2019 2 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
l10n-2.22.0-rnd3 * tag 'l10n-2.22.0-rnd3' of git://github.com/git-l10n/git-po: (25 commits) l10n: fr.po: Review French translation l10n: de.po: Update German translation l10n: de.po: improve description of 'git reset --quiet' l10n: TEAMS: Change German translation team leader l10n: bg.po: Updated Bulgarian translation (4581t) l10n: zh_CN: Revision for git v2.22.0 l10n l10n: zh_CN: for git v2.22.0 l10n round 1~3 l10n: es: 2.22.0 round 3 l10n: it.po: Updated Italian translation l10n: fr v2.22.0 rnd 3 l10n: vi.po(4581t): Updated Vietnamese translation for v2.22.0 round 3 l10n: git.pot: v2.22.0 round 3 (3 new, 2 removed) l10n: es: 2.22.0 round 2 l10n: bg.po: Updated Bulgarian translation (4580t) l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2 l10n: fr.po v2.22.0 round 2 l10n: git.pot: v2.22.0 round 2 (6 new, 3 removed) l10n: bg.po: Updated Bulgarian translation (4577t) l10n: es: 2.22.0 round 1 l10n: vi.po(4577t): Updated Vietnamese translation for v2.22.0 round 1 ...
-
- 07 6月, 2019 4 次提交
-
-
git://github.com/jnavila/git由 Jiang Xin 提交于
* 'fr_review' of git://github.com/jnavila/git: l10n: fr.po: Review French translation
-
git://github.com/alshopov/git-po由 Jiang Xin 提交于
* 'master' of git://github.com/alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (4581t)
-
由 Cédric Malard 提交于
Signed-off-by: NCédric Malard <c.malard-git@valdun.net> Signed-off-by: NJean-Noel Avila <jn.avila@free.fr>
-
由 Junio C Hamano 提交于
Recent code restructuring of merge-recursive engine introduced a regression dealing with rename/add conflict. * en/merge-directory-renames-fix: merge-recursive: restore accidentally dropped setting of path
-
- 06 6月, 2019 4 次提交
-
-
由 Matthias Rüster 提交于
Reviewed-by: NRalf Thielow <ralf.thielow@gmail.com> Signed-off-by: NMatthias Rüster <matthias.ruester@gmail.com>
-
由 Ralf Thielow 提交于
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>
-
由 Matthias Rüster 提交于
Acked-by: NRalf Thielow <ralf.thielow@gmail.com> Signed-off-by: NMatthias Rüster <matthias.ruester@gmail.com>
-
由 Elijah Newren 提交于
In commit 8daec1df ("merge-recursive: switch from (oid,mode) pairs to a diff_filespec", 2019-04-05), we actually switched from (oid,mode,path) triplets to a diff_filespec -- but most callsites in the patch only needed to worry about oid and mode so the commit message focused on that. The oversight in the commit message apparently spilled over to the code as well; one of the dozen or so callsites accidentally dropped the setting of the path in the conversion. Restore the path setting in that location. Also, this pointed out that our testsuite was lacking a good rename/add test, at least one that involved the need for merge content with the rename. Add such a test, and since rename/add vs. add/rename could possibly be important, redo the merge the opposite direction to make sure we don't have issues with the direction of the merge. These testcases failed before restoring the setting of path, but with the paths appropriately set the testcases both pass. Reported-by: NBen Humphreys <behumphreys@atlassian.com> Based-on-patch-by: NSZEDER Gábor <szeder.dev@gmail.com> Tested-by: NBen Humphreys <behumphreys@atlassian.com> Signed-off-by: NElijah Newren <newren@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 05 6月, 2019 8 次提交
-
-
由 Alexander Shopov 提交于
Signed-off-by: NAlexander Shopov <ash@kambanaria.org>
-
由 Fangyi Zhou 提交于
Revise 51 translations, improving consistency for some phrased. Update email address for Fangyi Zhou Signed-off-by: NFangyi Zhou <me@fangyi.io> Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
由 Jiang Xin 提交于
Translate 274 new messages (4581t0f0u) for git 2.22.0. Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
https://github.com/ChrisADR/git-po由 Jiang Xin 提交于
* '2.22' of https://github.com/ChrisADR/git-po: l10n: es: 2.22.0 round 3
-
由 Jiang Xin 提交于
* 'it-l10n-wip' of github.com:AlessandroMenti/git-po: l10n: it.po: Updated Italian translation
-
由 Christopher Diaz Riveros 提交于
Signed-off-by: NChristopher Diaz Riveros <chrisadr@gentoo.org>
-
由 Alessandro Menti 提交于
Signed-off-by: NAlessandro Menti <alessandro.menti@alessandromenti.it>
-
由 Jean-Noël Avila 提交于
Signed-off-by: NJean-Noël Avila <jn.avila@free.fr>
-
- 04 6月, 2019 7 次提交
-
-
由 Tran Ngoc Quan 提交于
Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>
-
由 Jiang Xin 提交于
Generate po/git.pot from v2.22.0-rc3 for git v2.22.0 l10n round 3. Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
git://git.kernel.org/pub/scm/git/git由 Jiang Xin 提交于
* 'master' of git://git.kernel.org/pub/scm/git/git: Git 2.22-rc3 i18n: fix typos found during l10n for git 2.22.0 RelNotes: minor typo fixes in 2.22.0 draft list-objects-filter: disable 'sparse:path' filters
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Disable "--filter=sparse:path=<path>" that would allow reading from paths on the filesystem. * cc/list-objects-filter-wo-sparse-path: list-objects-filter: disable 'sparse:path' filters
-
由 Jiang Xin 提交于
Fix two typos introduced by the following commits: + 31fba9d3 (diff-parseopt: convert --[src|dst]-prefix, 2019-03-24) + ed8b4132 (remote-curl: mark all error messages for translation, 2019-03-05) Signed-off-by: NJiang Xin <worldhello.net@gmail.com> Acked-by: NJohannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Todd Zullinger 提交于
Signed-off-by: NTodd Zullinger <tmz@pobox.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 03 6月, 2019 1 次提交
-
-
由 Christopher Diaz Riveros 提交于
Signed-off-by: NChristopher Diaz Riveros <chrisadr@gentoo.org>
-
- 02 6月, 2019 3 次提交
-
-
https://github.com/vnwildman/git由 Jiang Xin 提交于
* 'master' of https://github.com/vnwildman/git: l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2
-
git://github.com/alshopov/git-po由 Jiang Xin 提交于
* 'master' of git://github.com/alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (4580t)
-
由 Alexander Shopov 提交于
Signed-off-by: NAlexander Shopov <ash@kambanaria.org>
-
- 01 6月, 2019 1 次提交
-
-
由 Tran Ngoc Quan 提交于
Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>
-