Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.5
Junio C Hamano
Git 1.7.5-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.5-rc3
Junio C Hamano
Sync with 1.7.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.4.5
Michael J Gruber
git-svn.txt: Document --mergeinfo 6abd933 (git-svn: allow the mergeinfo property to be set, 2010-09-24) introduced the --mergeinfo option. Document it. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Revert "run-command: prettify -D_FORTIFY_SOURCE workaround" This reverts commit ebec842773932e6f853acac70c80f84209b5f83e, which somehow mistakenly thought that any non-zero return from write(2) is an error.
Junio C Hamano
Merge branch 'maint' * maint: archive: document limitation of tar.umask config setting t3306,t5304: avoid clock skew issues git.txt: fix list continuation
René Scharfe
archive: document limitation of tar.umask config setting The local value of the config variable tar.umask is not passed to the other side with --remote. We may want to change that, but for now just document this fact. Reported-by: Jacek Masiulaniec <jacek.masiulaniec@gmail.com> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber
t3306,t5304: avoid clock skew issues On systems where the local time and file modification time may be out of sync (e.g. test directory on NFS) t3306 and t5305 can fail because prune compares times such as "now" (client time) with file modification times (server times for remote file systems). I.e., these are spurious test failures. Avoid this by setting the relevant modification times to the local time. Noticed on a system with as…
Michael J Gruber
git.txt: fix list continuation Remove a spurious empty line which prevented asciidoc from recognizing a list continuation mark ('+'), so that it does not get output literally any more. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.5-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.5-rc2
Junio C Hamano
Merge branch 'maint' * maint:
Junio C Hamano
Merge branch 'jc/rev-list-options-fix' into maint * jc/rev-list-options-fix: "log --cherry-pick" documentation regression fix
Junio C Hamano
Merge branch 'js/checkout-untracked-symlink' into maint * js/checkout-untracked-symlink: t2021: mark a test as fixed
Jim Meyering
remove doubled words, e.g., s/to to/to/, and fix related typos I found that some doubled words had snuck back into projects from which I'd already removed them, so now there's a "syntax-check" makefile rule in gnulib to help prevent recurrence. Running the command below spotted a few in git, too: git ls-files | xargs perl -0777 -n \ -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt])\s+\1\b/gims)' \ -e '{$n=($` =~ tr/\n/\n/ + 1); ($v=$&)=~s/\…
Ramkumar Ramachandra
revert: Hide '-r' option in default usage The '-r' command-line option is a no-op provided only for backward compatiblity since abd6970 (cherry-pick: make -r the default, 2006-10-05), and somehow ended up surviving across reimplementation in C at 9509af6 (Make git-revert & git-cherry-pick a builtin, 2007-03-01) and another rewrite of the command line parser at f810379 (Make builtin-revert.c use parse_options, 2007-10-07). We should have …
Junio C Hamano
Merge branch 'js/checkout-untracked-symlink' * js/checkout-untracked-symlink: t2021: mark a test as fixed
Junio C Hamano
Merge branch 'nd/init-gitdir' * nd/init-gitdir: t0001: guard a new test with SYMLINKS prerequisite
Johannes Sixt
t2021: mark a test as fixed The failure was fixed by the previous commit. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt
t0001: guard a new test with SYMLINKS prerequisite Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason
Makefile: extract Q_() source strings as ngettext() The Q_() wrapper added by 0c9ea33 (i18n: add stub Q_() wrapper for ngettext, 2011-03-09) needs to be noticed by xgettext. Add an appropriate --keyword option to the Makefile, so that "make pot" would notice the strings in the plural form marked with the wrapper. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Ha…
Ramsay Jones
i18n: avoid parenthesized string as array initializer The syntax static const char ignore_error[] = ("something"); is invalid C. A parenthesized string is not allowed as an array initializer. Some compilers, for example GCC and MSVC, allow this syntax as an extension, but it is not a portable construct. tcc does not parse it, for example. Remove the parenthesis from the definition of the N_() macro to fix this. Signed-off-by: Ramsay Jones …
Junio C Hamano
Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git-svn: Cache results of running the executable "git config" git-svn: Add a svn-remote.<name>.pushurl config key
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Update cherry-pick error message parsing gitk: Quote tag names in event bindings to avoid problems with % chars gitk: Allow user to control how much of the SHA1 ID gets auto-selected gitk: spelling fixes in Russian translation gitk: Take only numeric version components when computing $git_version
James Y Knight
git-svn: Cache results of running the executable "git config" Running programs is not cheap! Signed-off-by: James Y Knight <jknight@itasoftware.com> Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu> Acked-by: Eric Wong <normalperson@yhbt.net>
Alejandro R. Sedeño
git-svn: Add a svn-remote.<name>.pushurl config key Similar to the 'remote.<name>.pushurl' config key for git remotes, 'pushurl' is designed to be used in cases where 'url' points to an SVN repository via a read-only transport, to provide an alternate read/write transport. It is assumed that both keys point to the same repository. The 'pushurl' key is distinct from the 'commiturl' key in that 'commiturl' is a full svn path while 'pushurl' (like 'u…
Anders Kaseorg
gitk: Update cherry-pick error message parsing Commit 981ff5c37ae20687c98d98c8689d5e89016026d2 changed the error message from git cherry-pick from Automatic cherry-pick failed. [...advice...] to error: could not apply 7ab78c9... Do something neat. [...advice...] Update gitk’s regex to match this, restoring the ability to launch git citool to resolve conflicted cherry-picks. Signed-off-by: Anders Kaseorg <andersk@mit.edu> Signed-…
Andrew Garber
git-p4: replace each tab with 8 spaces for consistency Note that the majority of git-p4 uses spaces, not tabs, for indentation. Consistent indentation is a good hygiene for Python scripts, and mixing tabs and spaces in Python can lead to hard-to-find bugs. Signed-off-by: Andrew Garber <andrew@andrewgarber.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.5-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.5-rc1
Junio C Hamano
Sync with 1.7.4.4
  1. Prev
  2. Next