undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,590 Commits 1 Branch 0 Tags 217 MiB
14f563031d
Commit Graph

38590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junio C Hamano
14f563031d Merge branch 'ak/typofixes' 
* ak/typofixes:
  t/lib-terminal.sh: fix typo
  pack-bitmap: fix typo
 2015-02-11 13:37:39 -08:00
Junio C Hamano
9874fca712 Git 2.3 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-02-05 13:23:56 -08:00
Junio C Hamano
0d1c285af2 Merge git://github.com/git-l10n/git-po 
* git://github.com/git-l10n/git-po:
  l10n: ca.po: Fix trailing whitespace
 2015-02-02 12:05:56 -08:00
Alex Henrie
7471cf88f5 l10n: ca.po: Fix trailing whitespace 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2015-01-30 15:02:34 -07:00
Junio C Hamano
15598cf41b Git 2.3.0-rc2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-27 14:39:53 -08:00
Junio C Hamano
ff76d36b35 Merge git://github.com/git-l10n/git-po 
* git://github.com/git-l10n/git-po:
  l10n: de.po: correct singular form
  l10n: de.po: translate "leave behind" correctly
  l10n: de.po: fix typo
  l10n: ca.po: update translation
 2015-01-27 11:01:05 -08:00
Jiang Xin
b4fde1e37d Merge branch 'master' of git://github.com/alexhenrie/git-po 
* 'master' of git://github.com/alexhenrie/git-po:
  l10n: ca.po: update translation
 2015-01-27 15:00:48 +08:00
Michael J Gruber
07586ebd4f l10n: de.po: correct singular form 
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-26 19:36:04 +01:00
Michael J Gruber
2f334c6461 l10n: de.po: translate "leave behind" correctly 
This message is about leaving orphaned commits behind, not about
behind an upstream branch. Try to make this clear.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-26 19:36:04 +01:00
Benedikt Heine
3b36ef9188 l10n: de.po: fix typo 
Signed-off-by: Benedikt Heine <bebe@bebehei.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-26 19:36:04 +01:00
Alex Henrie
573ed5e147 l10n: ca.po: update translation 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
 2015-01-26 10:12:50 -07:00
Junio C Hamano
76afe74b10 Merge branch 'js/t1050' 
* js/t1050:
  t1050-large: generate large files without dd
 2015-01-22 13:46:45 -08:00
Junio C Hamano
67b5440d0d Merge branch 'ak/cat-file-clean-up' 
* ak/cat-file-clean-up:
  cat-file: use "type" and "size" from outer scope
 2015-01-22 13:46:38 -08:00
Junio C Hamano
d588d4d940 Merge git://github.com/git-l10n/git-po 
* git://github.com/git-l10n/git-po:
  l10n: correct indentation of show-branch usage
  l10n: de.po: translate 3 messages
  l10n: zh_CN: various fixes on command arguments
  l10n: vi.po(2298t): Updated 3 new strings
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 2
  l10n: git.pot: v2.3.0 round 2 (3 updated)
  l10n: de.po: translate 13 new messages
  l10n: de.po: fix typo
  l10n: de.po: translate "track" as "versionieren"
  l10n: zh_CN: translations for git v2.3.0-rc0
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 1
  l10n: vi.po(2298t): Updated and change Plural-Forms
  l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
  l10n: ca.po: various fixes
 2015-01-22 13:45:07 -08:00
Junio C Hamano
ab9432d375 Merge branch 'sh/asciidoc-git-version-fix' 
* sh/asciidoc-git-version-fix:
  Documentation: fix version numbering
 2015-01-22 13:44:47 -08:00
Sven van Haastregt
a4c044484e Documentation: fix version numbering 
Version numbers in asciidoc-generated content (such as man pages)
went missing as of da8a366 (Documentation: refactor common operations
into variables).  Fix by putting the underscore back in the variable
name.

Signed-off-by: Sven van Haastregt <svenvh@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-22 13:44:14 -08:00
Junio C Hamano
ee443cf236 Merge branch 'jh/empty-notes' 
* jh/empty-notes:
  Fix unclosed here document in t3301.sh
 2015-01-22 13:42:37 -08:00
Kacper Kornet
85cb1d0ba8 Fix unclosed here document in t3301.sh 
Commit 908a320363 introduced  indentation
to here documents in t3301.sh. However in one place <<-EOF was missing
-, which broke this test when run with mksh-50d. This commit fixes it.

Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
Acked-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-22 12:23:42 -08:00
Alexander Kuleshov
a9942e108c t/lib-terminal.sh: fix typo 
Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-21 12:40:08 -08:00
Alexander Kuleshov
25143a54fc pack-bitmap: fix typo 
Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-21 12:40:05 -08:00
Jiang Xin
1e60744913 l10n: correct indentation of show-branch usage 
An indentation error was found right after we started l10n round 2, and
commit d6589d1 (show-branch: fix indentation of usage string) and this
update would fix it.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-01-21 15:35:37 +08:00
Jiang Xin
54d80a9343 Merge branch 'master' of git://github.com/git-l10n/git-po 
* 'master' of git://github.com/git-l10n/git-po:
  l10n: de.po: translate 3 messages
  l10n: zh_CN: various fixes on command arguments
  l10n: vi.po(2298t): Updated 3 new strings
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 2
  l10n: git.pot: v2.3.0 round 2 (3 updated)
  l10n: de.po: translate 13 new messages
  l10n: de.po: fix typo
  l10n: de.po: translate "track" as "versionieren"
  l10n: zh_CN: translations for git v2.3.0-rc0
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 1
  l10n: vi.po(2298t): Updated and change Plural-Forms
  l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
  l10n: ca.po: various fixes
 2015-01-21 14:20:53 +08:00
Junio C Hamano
627736ca79 Git 2.3.0-rc1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-20 17:35:41 -08:00
Junio C Hamano
ea6e82c875 Merge branch 'jk/http-push-symref-fix' 
* jk/http-push-symref-fix:
  http-push: trim trailing newline from remote symref
 2015-01-20 17:31:50 -08:00
Junio C Hamano
17ad37112d Merge branch 'ak/show-branch-usage-string' 
* ak/show-branch-usage-string:
  show-branch: fix indentation of usage string
 2015-01-20 16:16:09 -08:00
Ralf Thielow
d6589d1ba4 show-branch: fix indentation of usage string 
Noticed-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-20 16:12:54 -08:00
Junio C Hamano
d06ce4a508 Merge branch 'jk/colors' 
* jk/colors:
  parse_color: fix return value for numeric color values 0-8
 2015-01-20 15:57:22 -08:00
Jeff King
3759d27aca parse_color: fix return value for numeric color values 0-8 
When commit 695d95d refactored the color parsing, it missed
a "return 0" when parsing literal numbers 0-8 (which
represent basic ANSI colors), leading us to report these
colors as an error.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-20 15:56:03 -08:00
Ralf Thielow
a235de4bd2 l10n: de.po: translate 3 messages 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-20 19:23:57 +01:00
Jiang Xin
d9d56b2357 l10n: zh_CN: various fixes on command arguments 
Updated translations for Git 2.3.0 l10n round 2, and fixed various
translations for command arguments.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-01-19 10:23:53 +08:00
Jiang Xin
07361f12ab Merge branch 'v2.3.0' of git://github.com/jnavila/git 
* 'v2.3.0' of git://github.com/jnavila/git:
  l10n: fr.po v2.3.0 round 2
 2015-01-19 10:12:46 +08:00
Jiang Xin
482f68e741 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 (2298t0f0u)
 2015-01-19 10:10:57 +08:00
Tran Ngoc Quan
d1f9c7b77e l10n: vi.po(2298t): Updated 3 new strings 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2015-01-19 07:20:28 +07:00
Peter Krefting
0ef279509b l10n: sv.po: Update Swedish translation (2298t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2015-01-18 20:30:18 +01:00
Jean-Noel Avila
bf41b712c7 l10n: fr.po v2.3.0 round 2 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2015-01-18 17:03:27 +01:00
Jiang Xin
105979f71c l10n: git.pot: v2.3.0 round 2 (3 updated) 
Generate po/git.pot from v2.3.0-rc0-44-ga94655d for git v2.3.0 l10n
round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-01-18 11:26:57 +08:00
Jiang Xin
48a9a6b5eb Merge branch 'master' of git://github.com/git-l10n/git-po 
* 'master' of git://github.com/git-l10n/git-po:
  l10n: de.po: translate 13 new messages
  l10n: de.po: fix typo
  l10n: de.po: translate "track" as "versionieren"
  l10n: zh_CN: translations for git v2.3.0-rc0
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 1
  l10n: vi.po(2298t): Updated and change Plural-Forms
  l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
  l10n: ca.po: various fixes
 2015-01-18 11:24:00 +08:00
Ralf Thielow
124d80928d l10n: de.po: translate 13 new messages 
Translate 13 new messages came from git.pot update in
beb691f (l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-17 18:10:46 +01:00
Ralf Thielow
e1a05ad851 l10n: de.po: fix typo 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-17 18:10:02 +01:00
Ralf Thielow
463243d49c l10n: de.po: translate "track" as "versionieren" 
Suggested-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2015-01-17 18:09:56 +01:00
Jiang Xin
04cb2f28cc l10n: zh_CN: translations for git v2.3.0-rc0 
Translate 13 new messages (2298t0f0u) for git v2.3.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2015-01-17 15:28:36 +08:00
Ramkumar Ramachandra
a94655dcfe git-svn: make it play nicely with submodules 
It's a simple matter of opening the directory specified in the gitfile.

[ew: tweaked check to avoid open() on directories]

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
 2015-01-15 08:35:55 +00:00
Ramkumar Ramachandra
9a2bb059e7 Git::SVN: handle missing ref_id case correctly 
ref_id should not match "refs/remotes/".

[ew: dropped initial hunk for GIT_SVN_ID at Ramkumar's request]

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
 2015-01-15 08:35:55 +00:00
Peter Krefting
2a26377047 l10n: sv.po: Update Swedish translation (2298t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2015-01-14 22:55:49 +01:00
Johannes Sixt
d0a042a186 t1050-large: generate large files without dd 
For some unknown reason, the dd on my Windows box segfaults randomly,
but since recently, it does so much more often than it used to, which
makes running the test suite burdensome.

Use printf to write large files instead of dd. To emphasize that three
of the large blobs are exact copies, use cp to allocate them.

The new code makes the files a bit smaller, and they are not sparse
anymore, but the tests do not depend on these properties. We do not want
to use test-genrandom here (which is used to generate large files
elsewhere in t1050), so that the files can be compressed well (which
keeps the run-time short).

The files are now large text files, not binary files. But since they
are larger than core.bigfilethreshold they are diagnosed as binary
by Git. For this reason, the 'git diff' tests that check the output
for "Binary files differ" still pass.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-14 13:08:12 -08:00
Junio C Hamano
563d4e59bd Fifth batch for 2.3 cycle 
Hopefully this will be the final feature update for 2.3-rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2015-01-14 12:44:03 -08:00
Junio C Hamano
670f6a72b8 Merge branch 'po/doc-core-ignorestat' 
* po/doc-core-ignorestat:
  doc: core.ignoreStat update, and clarify the --assume-unchanged effect
  doc: core.ignoreStat clarify the --assume-unchanged effect
 2015-01-14 12:41:38 -08:00
Junio C Hamano
401a317aae Merge branch 'rc/for-each-ref-tracking' 
* rc/for-each-ref-tracking:
  for-each-ref: always check stat_tracking_info()'s return value
 2015-01-14 12:39:02 -08:00
Junio C Hamano
63a0e83ea6 Merge branch 'rh/autoconf-rhel3' 
Build update for older RHEL.

* rh/autoconf-rhel3:
  configure.ac: check for HMAC_CTX_cleanup
  configure.ac: check for clock_gettime and CLOCK_MONOTONIC
  configure.ac: check 'tv_nsec' field in 'struct stat'
 2015-01-14 12:37:21 -08:00
Junio C Hamano
09deda3746 Merge branch 'ak/fewer-includes' 
* ak/fewer-includes:
  cat-file: remove unused includes
  git.c: remove unnecessary #includes
 2015-01-14 12:37:19 -08:00