1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 22:07:53 +01:00
Commit graph

28411 commits

Author SHA1 Message Date
Junio C Hamano
7b90ed59fa Merge branch 'tr/maint-word-diff-regex-sticky' into maint
The regexp configured with diff.wordregex was incorrectly reused
across files.

By Thomas Rast (2) and Johannes Sixt (1)
* tr/maint-word-diff-regex-sticky:
  diff: tweak a _copy_ of diff_options with word-diff
  diff: refactor the word-diff setup from builtin_diff_cmd
  t4034: diff.*.wordregex should not be "sticky" in --word-diff
2012-04-26 10:34:44 -07:00
Junio C Hamano
058432635b Merge branch 'jh/notes-merge-in-git-dir-worktree' into maint
Running "notes merge --commit" failed to perform correctly when run
from any directory inside $GIT_DIR/.  When "notes merge" stops with
conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
to resolve it.

By Johan Herland (3) and Junio C Hamano (1)
* jh/notes-merge-in-git-dir-worktree:
  notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
  notes-merge: use opendir/readdir instead of using read_directory()
  t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/
  remove_dir_recursively(): Add flag for skipping removal of toplevel dir
2012-04-26 10:32:55 -07:00
Junio C Hamano
50bf38ac23 Sync with 1.7.9.7 2012-04-26 10:31:43 -07:00
Junio C Hamano
d0f1ea6003 Git 1.7.9.7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-26 10:23:15 -07:00
Junio C Hamano
b2bab5b338 Sync with 1.7.8.6 2012-04-26 10:22:20 -07:00
Junio C Hamano
d9f5ef7a4a Git 1.7.8.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-26 10:14:45 -07:00
Junio C Hamano
aba5f57c8f Sync with 1.7.7.7 2012-04-26 09:52:33 -07:00
Junio C Hamano
8258858493 Git 1.7.7.7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-26 09:41:52 -07:00
Jonathan Nieder
97afde15f5 bundle: remove stray single-quote from error message
After running rev-list --boundary to retrieve the list of boundary
commits, "git bundle create" runs its own revision walk.  If in this
stage git encounters an unfamiliar option, it writes a message with an
unbalanced quotation mark:

	error: unrecognized argument: --foo'

Drop the stray quote to match the "unrecognized argument: %s" message
used elsewhere and save translators some work.

This is mostly a futureproofing measure: for now, the "rev-list
--boundary" command catches most strange arguments on its own and the
above message is not seen unless you try something esoteric like "git
bundle create test.bundle --header HEAD".

Reported-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-26 08:08:07 -07:00
Junio C Hamano
fdec2eb8eb Merge branch 'maint-1.7.9' into maint
* maint-1.7.9:
2012-04-10 12:44:58 -07:00
Junio C Hamano
6eab5f2f14 Merge branch 'maint-1.7.8' into maint-1.7.9
* maint-1.7.8:
  Documentation/gitweb: trivial English fixes
  fetch/receive: remove over-pessimistic connectivity check
2012-04-10 12:44:45 -07:00
René Scharfe
a961d1f1ea test-subprocess: fix segfault without arguments
Check if we even have a parameter before checking its value.  Running
this command without any arguments may not make a lot of sense, but
reacting with a segmentation fault is unduly harsh.

While we're at it, avoid casting argv by declaring it const right away.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-10 12:28:20 -07:00
René Scharfe
c2df7585ef submodule: fix prototype of gitmodules_config
Add void to make it match its definition in submodule.c.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-10 12:27:54 -07:00
Junio C Hamano
b1bcfbe344 Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8
* jc/maint-verify-objects-remove-pessimism:
  fetch/receive: remove over-pessimistic connectivity check
2012-04-09 13:43:16 -07:00
Junio C Hamano
795283c415 Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8
* dw/gitweb-doc-grammo:
  Documentation/gitweb: trivial English fixes
2012-04-09 13:42:56 -07:00
Junio C Hamano
6d5c16a90c Merge branch 'tr/cache-tree' into maint-1.7.8
* tr/cache-tree:
  t0090: be prepared that 'wc -l' writes leading blanks
  reset: update cache-tree data when appropriate
  commit: write cache-tree data when writing index anyway
  Refactor cache_tree_update idiom from commit
  Test the current state of the cache-tree optimization
  Add test-scrap-cache-tree
2012-04-09 13:40:32 -07:00
Junio C Hamano
00fb2d2563 Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8
* cb/maint-t5541-make-server-port-portable:
  t5541: check error message against the real port number used
  remote-curl: Fix push status report when all branches fail
2012-04-09 13:38:41 -07:00
Junio C Hamano
fc2d99f1e9 Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8
* cn/maint-rev-list-doc:
  Documentation: use {asterisk} in rev-list-options.txt when needed
2012-04-09 13:36:44 -07:00
Junio C Hamano
50c9403284 Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8
* tr/maint-bundle-boundary:
  bundle: keep around names passed to add_pending_object()
  t5510: ensure we stay in the toplevel test dir
  t5510: refactor bundle->pack conversion
2012-04-09 13:36:26 -07:00
Junio C Hamano
8502a779da Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8
* tr/maint-bundle-long-subject:
  t5704: match tests to modern style
  strbuf: improve strbuf_get*line documentation
  bundle: use a strbuf to scan the log for boundary commits
  bundle: put strbuf_readline_fd in strbuf.c with adjustments
2012-04-09 13:36:20 -07:00
Junio C Hamano
dbdc07fcbe Merge branch 'ph/rerere-doc' into maint-1.7.8
* ph/rerere-doc:
  rerere: Document 'rerere remaining'
2012-04-09 13:34:09 -07:00
Junio C Hamano
e8dde3e5f9 Git 1.7.10
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-06 10:47:58 -07:00
Felipe Contreras
e681a93a98 spec: add missing build dependency
Otherwise:

/usr/bin/perl Makefile.PL PREFIX='/opt/git' INSTALL_BASE=''
Can't locate ExtUtils/MakeMaker.pm in @INC (@INC contains: ...) at Makefile.PL line 1.
BEGIN failed--compilation aborted at Makefile.PL line 1.
make[1]: *** [perl.mak] Error 2
make: *** [perl/perl.mak] Error 2

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-06 10:15:11 -07:00
Junio C Hamano
e5056c05ec Git 1.7.10-rc4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-03 09:30:58 -07:00
Junio C Hamano
ca2b71a00b Merge branch 'pt/gitk'
* pt/gitk:
  gitk: fix setting font display with new tabbed dialog layout.
  gitk: fix tabbed preferences construction when using tcl 8.4
2012-04-02 15:06:25 -07:00
Junio C Hamano
d82829b612 Sync with 1.7.9.6 2012-04-02 13:11:49 -07:00
Junio C Hamano
cb2ed324fc Git 1.7.9.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-02 13:07:58 -07:00
Junio C Hamano
b52ab19d91 Merge branch 'jc/maint-merge-autoedit' into maint
* jc/maint-merge-autoedit:
  merge: backport GIT_MERGE_AUTOEDIT support
2012-04-02 12:56:35 -07:00
Pat Thoyts
39ddf99c1d gitk: fix setting font display with new tabbed dialog layout.
The changes to the dialog window tree broke the preview of the selected
font on the button. This corrects that issue.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-02 10:21:10 -07:00
Pat Thoyts
28cb707472 gitk: fix tabbed preferences construction when using tcl 8.4
In 8.5 the incr command creates the target variable if it does not exist
but in 8.4 using incr on a non-existing variable raises an error. Ensure
we have created our counter variable when creating the tabbed dialog for
non-themed preferences.

Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-02 10:21:08 -07:00
Junio C Hamano
02f419efcb Merge git://github.com/git-l10n/git-po
Portuguese Portuguese translations from Marco Sousa via Jiang Xin

* 'master' of git://github.com/git-l10n/git-po:
  l10n: Add the Dutch translation team and initialize nl.po
  l10n: Inital Portuguese Portugal language (pt_PT)
  l10n: Improve zh_CN translation for Git 1.7.10-rc3
2012-04-02 09:19:47 -07:00
Vincent van Ravesteijn
18ac610272 l10n: Add the Dutch translation team and initialize nl.po
Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
2012-04-02 14:20:54 +02:00
Marco Sousa
833662295e l10n: Inital Portuguese Portugal language (pt_PT)
Signed-off-by: Marco Sousa <marcomsousa@gmail.com>
2012-04-02 09:46:11 +08:00
Junio C Hamano
19a6cd372a Merge branch 'maint'
* maint:
  string-list: document that string_list_insert() inserts unique strings
2012-03-30 20:25:55 -07:00
Heiko Voigt
b8939b2b3a string-list: document that string_list_insert() inserts unique strings
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-30 09:06:04 -07:00
Jiang Xin
7e238ab7ba l10n: Improve zh_CN translation for Git 1.7.10-rc3
Improvements of zh_CN translations:

 - Update translation for msg "Changes not staged for commit:".
 - Remove unnecessary leading spaces for some messages.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-30 17:02:12 +08:00
René Scharfe
b3065bdc03 config: remove useless assignment
v1.7.9-8-g270a344 (config: stop using config_exclusive_filename) replaced
config_exclusive_filename with given_config_file.  In one case this
resulted in a self-assignment, which is reported by clang as a warning.
Remove the useless code.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-28 15:19:17 -07:00
Junio C Hamano
455cf268db Git 1.7.10-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-28 11:18:42 -07:00
Jim Meyering
65c2b2b509 correct a few doubled-word nits in comments and documentation
Found by running this command:
$ git ls-files -z|xargs -0 perl -0777 -n \
 -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt]o)\s+\1\b/gims)' \
 -e '  {' \
 -e '    $n = ($` =~ tr/\n/\n/ + 1);' \
 -e '    ($v = $&) =~ s/\n/\\n/g;' \
 -e '    print "$ARGV:$n:$v\n";' \
 -e '  }'

Why not just git grep -E ...?
That wouldn't work then the doubled words are separated by a newline.
This is derived from a Makefile syntax-check rule in gnulib's maint.mk:
  http://git.sv.gnu.org/cgit/gnulib.git/tree/top/maint.mk

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-28 11:18:35 -07:00
Jim Meyering
a7793a7491 correct spelling: an URL -> a URL
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-28 08:47:23 -07:00
Junio C Hamano
59012e20f8 l10n updates for Git 1.7.10-rc1
* 'master' of git://github.com/git-l10n/git-po:
  Add url of Swedish l10n team in TEAMS file
  l10n: Review zh_CN translation for Git 1.7.10-rc1
  Update Swedish translation (724t0f0u).
  l10n: Update zh_CN translation for Git 1.7.10-rc1
  l10n: Update git.pot (1 new message)
2012-03-27 08:39:18 -07:00
Zbigniew Jędrzejewski-Szmek
b1d645b58a tests: unset COLUMNS inherited from environment
$COLUMNS must be unset to not interfere with the tests. The tests
already ignore the terminal size because output is redirected to a
file, but COLUMNS overrides terminal size detection and changes the
test output away from the standard 80.

Reported-by: Jeff King <peff@peff.net>
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-27 07:56:57 -07:00
Jiang Xin
3601b1d359 Add url of Swedish l10n team in TEAMS file
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-27 17:11:34 +08:00
Jiang Xin
90e6ef5320 l10n: Review zh_CN translation for Git 1.7.10-rc1
Overall review of the zh_CN translation:

 - Distinguish the translations of index and stage, though they are the
   same thing.

 - Many other fixes, e.g., add the lost periods at the end of translated
   sentences.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-03-27 16:09:03 +08:00
Peter Krefting
0e641b1f95 Update Swedish translation (724t0f0u).
- Update for 1.7.10-rc1.
- Add a missing -e when generaring the "Untracked files" message.
- Fixed some wordings after playing with the localized version.
2012-03-27 16:09:03 +08:00
Junio C Hamano
fae9d761c7 Update draft release notes to 1.7.10
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-26 12:38:34 -07:00
Junio C Hamano
ee459baa5c Git 1.7.9.5
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJPcMOYAAoJELC16IaWr+bLGoQP/2nHXaa6SBovRWgjDpqlVCdI
 xzrUmpkDre5fqTwxuvXF2xfCXT+vzO5kI/pxI58IVlrp9AueVyalkP0M1kJWPMMw
 1esBc4N9Hgc9N3tDDLYOSeJTwozoqv5fiv+Kexecpc1nguP3fEgLfPcjQ9LFb9s3
 pGMr1FroqnX3TLKlcHB3FFO/0fojMtZ+NJOOFV8rCqe+0khcy41+f2FeGL/6eLja
 kTnfC+WewoUcSKjAUd19xPk+QZ0xVh69/aV4jv64mpBcFPTv/8YJTOp5A6d5I/UP
 adoH64rG6h8B4SpUOIHubXpLC5XdDYkinjnSOKkMiSeolPJPInSuS4pZy86YWpYt
 pKEI3/rxh/TbK7F9LnJhunbPX6j2MpZywIt7/ux8idwjyU7z/IRTeetrqRhG1Pno
 av3Fgez/gNOPSDiABEv9Kn3QLSj4IfHCtT+Ih7ejzKk8sCCCFCucueINsdl6EVni
 sQRN1E+UKcRUhIIdPZWvwop6IzbFGCkqFthup2gOiAZfZj9j27Ht1TOl7vDWvsOK
 +Vlff+kzJIXxbiiXhjVAX3RjAKj8Dq0jILXhmu6p60e6FkQuLwN/YcMKhwW1IJgq
 58g22g6CAIgXeItttCdv690qVM3KE7c+sR3S1aJyQdzDsBu1J5wPTUmeY5aBjQGZ
 1kHlftCTxQ5H8HFRmURT
 =pq47
 -----END PGP SIGNATURE-----

Sync with 1.7.9.5
2012-03-26 12:30:51 -07:00
Junio C Hamano
8ced9c90a2 Git 1.7.9.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-26 12:29:25 -07:00
Junio C Hamano
79efeae69d Merge branch 'jn/maint-fast-import-empty-ls' into maint
* jn/maint-fast-import-empty-ls:
  fast-import: don't allow 'ls' of path with empty components
  fast-import: leakfix for 'ls' of dirty trees
2012-03-26 12:10:25 -07:00
Junio C Hamano
bda02ebc39 Merge branch 'ph/rerere-doc' into maint
* ph/rerere-doc:
  rerere: Document 'rerere remaining'
2012-03-26 12:10:12 -07:00