Skip to content

Commit 1318425

Browse files
dschodscho
committed
base: cherry-pick e920a5b onto d9dd990
This commit helps to teach `git rerere` to resolve merge conflicts when cherry-picking: e920a5b (fixup! Merge pull request #964 from jeffhostetler/jeffhostetler/memihash_perf, 2017-03-27)
1 parent 61082df commit 1318425

File tree

137 files changed

+5640
-1503
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+5640
-1503
lines changed

‎.gitattributes

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
* whitespace=!indent,trail,space
2-
*.[ch] whitespace=indent,trail,space diff=cpp
3-
*.sh whitespace=indent,trail,space
2+
*.[ch] whitespace=indent,trail,space diff=cpp eol=lf
3+
*.sh whitespace=indent,trail,space eol=lf
4+
*.{perl,pm,txt} eol=lf

‎.github/ISSUE_TEMPLATE.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
- [ ] I was not able to find an [open](https://github.com/git-for-windows/git/issues?q=is%3Aopen) or [closed](https://github.com/git-for-windows/git/issues?q=is%3Aclosed) issue matching what I'm seeing
2+
3+
### Setup
4+
5+
- Which version of Git for Windows are you using? Is it 32-bit or 64-bit?
6+
7+
```
8+
$ git --version --build-options
9+
10+
** insert your machine's response here **
11+
```
12+
13+
- Which version of Windows are you running? Vista, 7, 8, 10? Is it 32-bit or 64-bit?
14+
15+
```
16+
$ cmd.exe /c ver
17+
18+
** insert your machine's response here **
19+
```
20+
21+
- What options did you set as part of the installation? Or did you choose the
22+
defaults?
23+
24+
```
25+
# One of the following:
26+
> type "C:\Program Files\Git\etc\install-options.txt"
27+
> type "C:\Program Files (x86)\Git\etc\install-options.txt"
28+
> type "%USERPROFILE%\AppData\Local\Programs\Git\etc\install-options.txt"
29+
$ cat /etc/install-options.txt
30+
31+
** insert your machine's response here **
32+
```
33+
34+
- Any other interesting things about your environment that might be related
35+
to the issue you're seeing?
36+
37+
** insert your response here **
38+
39+
### Details
40+
41+
- Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other
42+
43+
** insert your response here **
44+
45+
- What commands did you run to trigger this issue? If you can provide a
46+
[Minimal, Complete, and Verifiable example](http://stackoverflow.com/help/mcve)
47+
this will help us understand the issue.
48+
49+
```
50+
** insert your commands here **
51+
```
52+
- What did you expect to occur after running these commands?
53+
54+
** insert here **
55+
56+
- What actually happened instead?
57+
58+
** insert here **
59+
60+
- If the problem was occurring with a specific repository, can you provide the
61+
URL to that repository to help us with testing?
62+
63+
** insert URL here **

‎.gitignore

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,43 @@
179179
/gitweb/gitweb.cgi
180180
/gitweb/static/gitweb.js
181181
/gitweb/static/gitweb.min.*
182+
/libgit
183+
/test-chmtime
184+
/test-ctype
185+
/test-config
186+
/test-date
187+
/test-delta
188+
/test-dump-cache-tree
189+
/test-dump-split-index
190+
/test-dump-untracked-cache
191+
/test-fake-ssh
192+
/test-scrap-cache-tree
193+
/test-genrandom
194+
/test-hashmap
195+
/test-index-version
196+
/test-line-buffer
197+
/test-match-trees
198+
/test-mergesort
199+
/test-mktemp
200+
/test-parse-options
201+
/test-path-utils
202+
/test-prio-queue
203+
/test-read-cache
204+
/test-regex
205+
/test-revision-walking
206+
/test-run-command
207+
/test-sha1
208+
/test-sha1-array
209+
/test-sigchain
210+
/test-string-list
211+
/test-submodule-config
212+
/test-subprocess
213+
/test-svn-fe
214+
/test-urlmatch-normalization
215+
/test-wildmatch
182216
/common-cmds.h
217+
/vcs-svn_lib
218+
/xdiff_lib
183219
*.tar.gz
184220
*.dsc
185221
*.deb
@@ -216,5 +252,17 @@
216252
*.user
217253
*.idb
218254
*.pdb
219-
/Debug/
220-
/Release/
255+
*.ilk
256+
*.iobj
257+
*.ipdb
258+
*.dll
259+
.vs/
260+
*.manifest
261+
Debug/
262+
Release/
263+
/UpgradeLog*.htm
264+
/git.VC.VC.opendb
265+
/git.VC.db
266+
/.vagrant/
267+
/vagrant2[0-9][0-9][0-9]*-*-*
268+
/d2[0-9][0-9][0-9]*-*-*

‎.nuget/NuGet.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<config>
4+
<add key="repositoryPath" value="..\compat\vcbuild\GEN.PKGS" />
5+
</config>
6+
</configuration>

‎CONTRIBUTING.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Git for Windows Code of Conduct
2+
3+
This code of conduct outlines our expectations for participants within the **Git for Windows** community, as well as steps to reporting unacceptable behavior. We are committed to providing a welcoming and inspiring community for all and expect our code of conduct to be honored. Anyone who violates this code of conduct may be banned from the community.
4+
5+
## Our Pledge
6+
7+
In the interest of fostering an open and welcoming environment, we as
8+
contributors and maintainers pledge to making participation in our project and
9+
our community a harassment-free experience for everyone, regardless of age, body
10+
size, disability, ethnicity, gender identity and expression, level of experience,
11+
nationality, personal appearance, race, religion, or sexual identity and
12+
orientation.
13+
14+
## Our Standards
15+
16+
Examples of behavior that contributes to creating a positive environment
17+
include:
18+
19+
* Using welcoming and inclusive language
20+
* Being respectful of differing viewpoints and experiences
21+
* Gracefully accepting constructive criticism
22+
* Focusing on what is best for the community
23+
* Showing empathy towards other community members
24+
25+
Examples of unacceptable behavior by participants include:
26+
27+
* The use of sexualized language or imagery and unwelcome sexual attention or
28+
advances
29+
* Trolling, insulting/derogatory comments, and personal or political attacks
30+
* Public or private harassment
31+
* Publishing others' private information, such as a physical or electronic
32+
address, without explicit permission
33+
* Other conduct which could reasonably be considered inappropriate in a
34+
professional setting
35+
36+
## Our Responsibilities
37+
38+
Project maintainers are responsible for clarifying the standards of acceptable
39+
behavior and are expected to take appropriate and fair corrective action in
40+
response to any instances of unacceptable behavior.
41+
42+
Project maintainers have the right and responsibility to remove, edit, or
43+
reject comments, commits, code, wiki edits, issues, and other contributions
44+
that are not aligned to this Code of Conduct, or to ban temporarily or
45+
permanently any contributor for other behaviors that they deem inappropriate,
46+
threatening, offensive, or harmful.
47+
48+
## Scope
49+
50+
This Code of Conduct applies both within project spaces and in public spaces
51+
when an individual is representing the project or its community. Examples of
52+
representing a project or community include using an official project e-mail
53+
address, posting via an official social media account, or acting as an appointed
54+
representative at an online or offline event. Representation of a project may be
55+
further defined and clarified by project maintainers.
56+
57+
## Enforcement
58+
59+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
60+
reported by contacting the project team at **johannes.schindelin@gmx.de**. All
61+
complaints will be reviewed and investigated and will result in a response that
62+
is deemed necessary and appropriate to the circumstances. The project team is
63+
obligated to maintain confidentiality with regard to the reporter of an incident.
64+
Further details of specific enforcement policies may be posted separately.
65+
66+
Project maintainers who do not follow or enforce the Code of Conduct in good
67+
faith may face temporary or permanent repercussions as determined by other
68+
members of the project's leadership.
69+
70+
## Attribution
71+
72+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
73+
available at [http://contributor-covenant.org/version/1/4][version]
74+
75+
[homepage]: http://contributor-covenant.org
76+
[version]: http://contributor-covenant.org/version/1/4/

‎Documentation/Makefile

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,9 @@ docdep_prereqs = \
295295
cmd-list.made $(cmds_txt)
296296

297297
doc.dep : $(docdep_prereqs) $(wildcard *.txt) build-docdep.perl
298-
$(QUIET_GEN)$(RM) $@+ $@ && \
299-
$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \
300-
mv $@+ $@
298+
$(QUIET_GEN)$(RM) $@.new $@ && \
299+
$(PERL_PATH) ./build-docdep.perl >$@.new $(QUIET_STDERR) && \
300+
mv $@.new $@
301301

302302
-include doc.dep
303303

@@ -333,8 +333,8 @@ mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*)
333333
date >$@
334334

335335
clean:
336-
$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
337-
$(RM) *.texi *.texi+ *.texi++ git.info gitman.info
336+
$(RM) *.xml *.xml.new *.html *.html.new *.1 *.5 *.7
337+
$(RM) *.texi *.texi.new *.texi.new.new git.info gitman.info
338338
$(RM) *.pdf
339339
$(RM) howto-index.txt howto/*.html doc.dep
340340
$(RM) technical/*.html technical/api-index.txt
@@ -343,14 +343,14 @@ clean:
343343
$(RM) po/*/*.1 po/*/*.txt
344344

345345
$(MAN_HTML): %.html : %.txt asciidoc.conf
346-
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
347-
$(TXT_TO_HTML) -d manpage -o $@+ $< && \
348-
mv $@+ $@
346+
$(QUIET_ASCIIDOC)$(RM) $@.new $@ && \
347+
$(TXT_TO_HTML) -d manpage -o $@.new $< && \
348+
mv $@.new $@
349349

350350
$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
351-
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
352-
$(TXT_TO_HTML) -o $@+ $< && \
353-
mv $@+ $@
351+
$(QUIET_ASCIIDOC)$(RM) $@.new $@ && \
352+
$(TXT_TO_HTML) -o $@.new $< && \
353+
mv $@.new $@
354354

355355
manpage-base-url.xsl: manpage-base-url.xsl.in
356356
sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
@@ -360,14 +360,14 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
360360
$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) -o $(dir $<) man $<
361361

362362
%.xml : %.txt asciidoc.conf
363-
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
364-
$(TXT_TO_XML) -d manpage -o $@+ $< && \
365-
mv $@+ $@
363+
$(QUIET_ASCIIDOC)$(RM) $@.new $@ && \
364+
$(TXT_TO_XML) -d manpage -o $@.new $< && \
365+
mv $@.new $@
366366

367367
user-manual.xml: user-manual.txt user-manual.conf
368-
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
369-
$(TXT_TO_XML) -d book -o $@+ $< && \
370-
mv $@+ $@
368+
$(QUIET_ASCIIDOC)$(RM) $@.new $@ && \
369+
$(TXT_TO_XML) -d book -o $@.new $< && \
370+
mv $@.new $@
371371

372372
technical/api-index.txt: technical/api-index-skel.txt \
373373
technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
@@ -381,46 +381,46 @@ XSLT = docbook.xsl
381381
XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
382382

383383
user-manual.html: user-manual.xml $(XSLT)
384-
$(QUIET_XSLTPROC)$(RM) $@+ $@ && \
385-
xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
386-
mv $@+ $@
384+
$(QUIET_XSLTPROC)$(RM) $@.new $@ && \
385+
xsltproc $(XSLTOPTS) -o $@.new $(XSLT) $< && \
386+
mv $@.new $@
387387

388388
git.info: user-manual.texi
389389
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi
390390

391391
user-manual.texi: user-manual.xml
392-
$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
393-
$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \
394-
$(PERL_PATH) fix-texi.perl <$@++ >$@+ && \
395-
rm $@++ && \
396-
mv $@+ $@
392+
$(QUIET_DB2TEXI)$(RM) $@.new $@ && \
393+
$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@.new.new && \
394+
$(PERL_PATH) fix-texi.perl <$@.new.new >$@.new && \
395+
rm $@.new.new && \
396+
mv $@.new $@
397397

398398
user-manual.pdf: user-manual.xml
399-
$(QUIET_DBLATEX)$(RM) $@+ $@ && \
400-
$(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \
401-
mv $@+ $@
399+
$(QUIET_DBLATEX)$(RM) $@.new $@ && \
400+
$(DBLATEX) -o $@.new $(DBLATEX_COMMON) $< && \
401+
mv $@.new $@
402402

403403
gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl
404-
$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
405-
($(foreach xml,$(sort $(MAN_XML)),xsltproc -o $(xml)+ texi.xsl $(xml) && \
406-
$(DOCBOOK2X_TEXI) --encoding=UTF-8 --to-stdout $(xml)+ && \
407-
rm $(xml)+ &&) true) > $@++ && \
408-
$(PERL_PATH) cat-texi.perl $@ <$@++ >$@+ && \
409-
rm $@++ && \
410-
mv $@+ $@
404+
$(QUIET_DB2TEXI)$(RM) $@.new $@ && \
405+
($(foreach xml,$(sort $(MAN_XML)),xsltproc -o $(xml).new texi.xsl $(xml) && \
406+
$(DOCBOOK2X_TEXI) --encoding=UTF-8 --to-stdout $(xml).new && \
407+
rm $(xml).new &&) true) > $@.new.new && \
408+
$(PERL_PATH) cat-texi.perl $@ <$@.new.new >$@.new && \
409+
rm $@.new.new && \
410+
mv $@.new $@
411411

412412
gitman.info: gitman.texi
413413
$(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi
414414

415415
$(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml
416-
$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
417-
$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \
418-
mv $@+ $@
416+
$(QUIET_DB2TEXI)$(RM) $@.new $@ && \
417+
$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@.new && \
418+
mv $@.new $@
419419

420420
howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
421-
$(QUIET_GEN)$(RM) $@+ $@ && \
422-
'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(wildcard howto/*.txt)) >$@+ && \
423-
mv $@+ $@
421+
$(QUIET_GEN)$(RM) $@.new $@ && \
422+
'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(wildcard howto/*.txt)) >$@.new && \
423+
mv $@.new $@
424424

425425
$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
426426
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
@@ -429,10 +429,10 @@ WEBDOC_DEST = /pub/software/scm/git/docs
429429

430430
howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
431431
$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
432-
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
432+
$(QUIET_ASCIIDOC)$(RM) $@.new $@ && \
433433
sed -e '1,/^$$/d' $< | \
434-
$(TXT_TO_HTML) - >$@+ && \
435-
mv $@+ $@
434+
$(TXT_TO_HTML) - >$@.new && \
435+
mv $@.new $@
436436

437437
install-webdoc : html
438438
'$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST)

0 commit comments

Comments
 (0)