git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-03 22:01:18 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
100,081 Commits 18 Branches 1,111 Tags
30aa353e32fe8a4f7b602add98bb53b365adf341
Commit Graph

100081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johannes Schindelin
30aa353e32 .github: Add configuration for the Sentiment Bot 
The sentiment bot will help detect when things get too heated.
Hopefully.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2019-06-07 23:14:35 +02:00
Philip Oakley
a089439c4c Modify the GitHub Pull Request template (to reflect Git for Windows) 
Git for Windows accepts pull requests; Core Git does not. Therefore we
need to adjust the template (because it only matches core Git's
project management style, not ours).

Also: direct Git for Windows enhancements to their contributions page,
space out the text for easy reading, and clarify that the mailing list
is plain text, not HTML.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2019-06-07 23:14:35 +02:00
Brendan Forster
63fc0cce8b Add an issue template 
With improvements by Clive Chan, Adric Norris, Ben Bodenmiller and
Philip Oakley.

Helped-by: Clive Chan <cc@clive.io>
Helped-by: Adric Norris <landstander668@gmail.com>
Helped-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
Helped-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Brendan Forster <brendan@github.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2019-06-07 23:14:34 +02:00
Johannes Schindelin
0f59c303d3 README.md: Add a Windows-specific preamble 
Includes touch-ups by Philip Oakley.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2019-06-07 23:14:34 +02:00
Derrick Stolee
945661ac7d CONTRIBUTING.md: add guide for first-time contributors 
Getting started contributing to Git can be difficult on a Windows
machine. CONTRIBUTING.md contains a guide to getting started, including
detailed steps for setting up build tools, running tests, and
submitting patches to upstream.

[includes an example by Pratik Karki how to submit v2, v3, v4, etc.]

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
 2019-06-07 23:14:34 +02:00
Johannes Schindelin
f72c7d94c5 Add a Code of Conduct 
It is better to state clearly expectations and intentions than to assume
quietly that everybody agrees.

This Code of Conduct is the Open Code of Conduct as per
http://todogroup.org/opencodeofconduct/ (the only modifications are the
adjustments to reflect that there is no "response team" in addition to the
Git for Windows maintainer, and the addition of the link to the Open Code
of Conduct itself).

[Completely revamped, based on the Covenant 1.4 by Brendan Forster]

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2019-06-07 23:14:34 +02:00
Johannes Schindelin
b18fe7a141 Start the merging-rebase to v2.22.0 
This commit starts the rebase of 0fc7a44145 to 286461941b7b
 2019-06-07 23:13:46 +02:00
Junio C Hamano
b697d92f56 Git 2.22 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-06-07 09:39:21 -07:00
Junio C Hamano
6ee1eaca3e Merge tag 'l10n-2.22.0-rnd3' of git://github.com/git-l10n/git-po 
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
  ...
 2019-06-07 09:36:32 -07:00
Jiang Xin
0cdb8d2db2 Merge branch 'fr_review' of git://github.com/jnavila/git 
* 'fr_review' of git://github.com/jnavila/git:
  l10n: fr.po: Review French translation
 2019-06-07 16:51:09 +08:00
Jiang Xin
d014920079 Merge branch 'master' of git://github.com/alshopov/git-po 
* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4581t)
 2019-06-07 16:50:23 +08:00
Cédric Malard
82eb147dbb l10n: fr.po: Review French translation 
Signed-off-by: Cédric Malard <c.malard-git@valdun.net>
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2019-06-07 08:54:28 +02:00
Junio C Hamano
20fbf7dd42 Merge branch 'en/merge-directory-renames-fix' 
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
 2019-06-06 14:03:36 -07:00
Matthias Rüster
219829ae83 l10n: de.po: Update German translation 
Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
 2019-06-06 07:03:26 +02:00
Ralf Thielow
8c18948b78 l10n: de.po: improve description of 'git reset --quiet' 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2019-06-06 07:03:25 +02:00
Matthias Rüster
d314d77577 l10n: TEAMS: Change German translation team leader 
Acked-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
 2019-06-05 20:48:37 +02:00
Elijah Newren
481de8a293 merge-recursive: restore accidentally dropped setting of path 
In commit 8daec1df03 ("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: Ben Humphreys <behumphreys@atlassian.com>
Based-on-patch-by: SZEDER Gábor <szeder.dev@gmail.com>
Tested-by: Ben Humphreys <behumphreys@atlassian.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2019-06-05 09:30:40 -07:00
Alexander Shopov
de2b0545ee l10n: bg.po: Updated Bulgarian translation (4581t) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2019-06-05 08:51:15 +02:00
Fangyi Zhou
5b5336320b l10n: zh_CN: Revision for git v2.22.0 l10n 
Revise 51 translations, improving consistency for some phrased.
Update email address for Fangyi Zhou

Signed-off-by: Fangyi Zhou <me@fangyi.io>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-06-05 08:37:30 +08:00
Jiang Xin
d46c551928 l10n: zh_CN: for git v2.22.0 l10n round 1~3 
Translate 274 new messages (4581t0f0u) for git 2.22.0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-06-05 08:37:30 +08:00
Jiang Xin
914bd0923e Merge branch '2.22' of https://github.com/ChrisADR/git-po 
* '2.22' of https://github.com/ChrisADR/git-po:
  l10n: es: 2.22.0 round 3
 2019-06-05 08:35:35 +08:00
Jiang Xin
488ed582d3 Merge branch 'it-l10n-wip' of github.com:AlessandroMenti/git-po 
* 'it-l10n-wip' of github.com:AlessandroMenti/git-po:
  l10n: it.po: Updated Italian translation
 2019-06-05 08:17:28 +08:00
Christopher Diaz Riveros
922a0a7d98 l10n: es: 2.22.0 round 3 
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
 2019-06-04 18:52:28 -05:00
Alessandro Menti
bbc55709e7 l10n: it.po: Updated Italian translation 
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
 2019-06-04 22:27:19 +02:00
Jean-Noël Avila
85b66ac50d l10n: fr v2.22.0 rnd 3 
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
 2019-06-04 19:53:32 +02:00
Tran Ngoc Quan
77e1962193 l10n: vi.po(4581t): Updated Vietnamese translation for v2.22.0 round 3 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2019-06-04 08:13:53 +07:00
Jiang Xin
386544cd84 l10n: git.pot: v2.22.0 round 3 (3 new, 2 removed) 
Generate po/git.pot from v2.22.0-rc3 for git v2.22.0 l10n round 3.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2019-06-04 08:27:36 +08:00
Jiang Xin
b50e1c093c Merge branch 'master' of git://git.kernel.org/pub/scm/git/git 
* '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
 2019-06-04 08:24:28 +08:00
Johannes Schindelin
9c8cba6862 Merge 'readme' into HEAD 
Add a README.md for GitHub goodness.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
v2.22.0-rc3.windows.1 		2019-06-03 23:04:59 +02:00
Johannes Schindelin
ba42a27a15 Merge pull request #1354 from dscho/phase-out-show-ignored-directory-gracefully 
Phase out `--show-ignored-directory` gracefully
 2019-06-03 23:04:59 +02:00
Johannes Schindelin
dba129df37 Merge branch 'status-no-lock-index' 
This branch allows third-party tools to call `git status
--no-lock-index` to avoid lock contention with the interactive Git usage
of the actual human user.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2019-06-03 23:04:58 +02:00
Johannes Schindelin
febd443002 Merge pull request #1170 from dscho/mingw-kill-process 
Handle Ctrl+C in Git Bash nicely

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2019-06-03 23:04:58 +02:00
Johannes Schindelin
009f359231 Merge branch 'busybox-w32' 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2019-06-03 23:04:58 +02:00
Johannes Schindelin
5a6a4fae21 Merge pull request #2091 from dscho/symlink-attr-extra 
Touch up symlink .gitattributes support
 2019-06-03 23:04:58 +02:00
Johannes Schindelin
ede02c578c Merge pull request #1897 from piscisaureus/symlink-attr 
Specify symlink type in .gitattributes
 2019-06-03 23:04:57 +02:00
Johannes Schindelin
f2af5c0a7d Merge 'docker-volumes-are-no-symlinks' 
This was pull request #1645 from ZCube/master

Support windows container.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2019-06-03 23:04:57 +02:00
Johannes Schindelin
89ac5e4601 Merge branch 'kblees/kb/symlinks' 2019-06-03 23:04:57 +02:00
Johannes Schindelin
b453f1db71 Merge branch 'msys2' 2019-06-03 23:04:56 +02:00
Johannes Schindelin
9b70470226 Merge branch 'long-paths' 2019-06-03 23:04:56 +02:00
Johannes Schindelin
c1891b565a Merge pull request #1937 from benpeart/fscache-NtQueryDirectoryFile-gfw 
fscache: teach fscache to use NtQueryDirectoryFile
 2019-06-03 23:04:56 +02:00
Johannes Schindelin
74342c85d2 Merge pull request #1934 from benpeart/fscache-thread-safe-enable-gfw 
fscache: make fscache_enable() thread safe
 2019-06-03 23:04:56 +02:00
Johannes Schindelin
3fb3bd41e4 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw' 
This brings substantial wins in performance because the FSCache is now
per-thread, being merged to the primary thread only at the end, so we do
not have to lock (except while merging).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2019-06-03 23:04:55 +02:00
Johannes Schindelin
8e81dbc971 Merge pull request #1910 from benpeart/fscache_statistics-gfw 
fscache: add fscache hit statistics
 2019-06-03 23:04:55 +02:00
Johannes Schindelin
9124ebb185 Merge pull request #1914 from benpeart/free-fscache-after-add-gfw 
At the end of the add command, disable and free the fscache
 2019-06-03 23:04:55 +02:00
Johannes Schindelin
7acc751611 Merge pull request #1911 from benpeart/git_test_fscache-gfw 
fscache: add GIT_TEST_FSCACHE support
 2019-06-03 23:04:55 +02:00
Johannes Schindelin
229a3a8b50 Merge pull request #1909 from benpeart/free-fscache-after-status-gfw 
status: disable and free fscache at the end of the status command
 2019-06-03 23:04:55 +02:00
Johannes Schindelin
e9a6b2e866 Merge pull request #1908 from benpeart/FindFirstFileEx-gfw 
fscache: use FindFirstFileExW to avoid retrieving the short name
 2019-06-03 23:04:54 +02:00
Johannes Schindelin
4fc613af5f Merge pull request #1827 from benpeart/fscache_refresh_index 
Enable the filesystem cache (fscache) in refresh_index().
 2019-06-03 23:04:54 +02:00
Johannes Schindelin
584abc861d Merge pull request #1468 from atetubou/fscache_checkout_flush 
checkout.c: enable fscache for checkout again

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 2019-06-03 23:04:54 +02:00
Johannes Schindelin
074256c163 Merge pull request #1426 from atetubou/fetch_pack 
fetch-pack.c: enable fscache for stats under .git/objects
 2019-06-03 23:04:54 +02:00