Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'bw/inet-pton-ntop-compat' into maint * bw/inet-pton-ntop-compat: Drop system includes from inet_pton/inet_ntop compatibility wrappers
Junio C Hamano
Merge branch 'mp/make-cleanse-x-for-exe' into maint * mp/make-cleanse-x-for-exe: Explicitly set X to avoid potential build breakage
Junio C Hamano
Merge branch 'jn/merge-no-edit-fix' into maint * jn/merge-no-edit-fix: merge: do not launch an editor on "--no-edit $tag"
Zbigniew Jędrzejewski-Szmek
pager: find out the terminal width before spawning the pager term_columns() checks for terminal width via ioctl(2) on the standard output, but we spawn the pager too early for this check to be useful. The effect of this buglet can be observed by opening a wide terminal and running "git -p help --all", which still shows 80-column output, while "git help --all" uses the full terminal width. Run the check before we spawn the pager to fix this. While at it, m…
Clemens Buchacher
do not override receive-pack errors Receive runs rev-list --verify-objects in order to detect missing objects. However, such errors are ignored and overridden later. Instead, consequently ignore all update commands for which an error has already been detected. Some tests in t5504 are obsoleted by this change, because invalid objects are detected even if fsck is not enabled. Instead, they now test for different error messages depend…
Clemens Buchacher
t5541: check error message against the real port number used Otherwise the test cannot be run with custom port set to LIB_HTTPD_PORT. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Clemens Buchacher
push/fetch/clone --no-progress suppresses progress output By default, progress output is disabled if stderr is not a terminal. The --progress option can be used to force progress output anyways. Conversely, --no-progress does not force progress output. In particular, if stderr is a terminal, progress output is enabled. This is unintuitive. Change --no-progress to force output off. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C …
Clemens Buchacher
git rev-list: fix invalid typecast git rev-list passes rev_list_info, not rev_list objects. Without this fix, rev-list enables or disables the --verify-objects option depending on a read from an undefined memory location. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes to 1.7.9.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'js/add-e-submodule-fix' into maint * js/add-e-submodule-fix: add -e: do not show difference in a submodule that is merely dirty
Junio C Hamano
Merge branch 'jc/parse-date-raw' into maint * jc/parse-date-raw: parse_date(): '@' prefix forces git-timestamp parse_date(): allow ancient git-timestamp
Junio C Hamano
Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint * jc/merge-ff-only-stronger-than-signed-merge: merge: do not create a signed tag merge under --ff-only option
Junio C Hamano
Merge branch 'jc/branch-desc-typoavoidance' into maint * jc/branch-desc-typoavoidance: branch --edit-description: protect against mistyped branch name tests: add write_script helper function
Junio C Hamano
Merge branch 'jn/rpm-spec' into maint * jn/rpm-spec: git.spec: Workaround localized messages not put in any RPM
Ævar Arnfjörð Bjarmason
t: use sane_unset instead of unset Change several tests to use the sane_unset function introduced in v1.7.3.1-35-g00648ba instead of the built-in unset function. This fixes a failure I was having on t9130-git-svn-authors-file.sh on Solaris, and prevents several other issues from occurring. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason
Remove Git's support for smoke testing I'm no longer running the Git smoke testing service at smoke.git.nix.is due to Smolder being a fragile piece of software not having time to follow through on making it easy for third parties to run and submit their own smoke tests. So remove the support in Git for sending smoke tests to smoke.git.nix.is, it's still easy to modify the test suite to submit smokes somewhere else. This reverts the f…
Ævar Arnfjörð Bjarmason
Makefile: Change the default compiler from "gcc" to "cc" Ever since the very first commit to git.git we've been setting CC to "gcc". Presumably this is behavior that Linus copied from the Linux Makefile. However unlike Linux Git is written in ANSI C and supports a multitude of compilers, including Clang, Sun Studio, xlc etc. On my Linux box "cc" is a symlink to clang, and on a Solaris box I have access to "cc" is Sun Studio's CC. Both of these are per…
Дилян Палаузов
Makefile: introduce CHARSET_LIB to link with -lcharset On some systems, the function locale_charset() may not be exported from libiconv but is available from libcharset, and we need -lcharset when linking. Introduce a make variable CHARSET_LIB that can be set to -lcharsetlib on such systems. Also autodetect this in the configure script by first looking for the symbol in libiconv, and then libcharset. Signed-off-by: Дилян Палаузов <dilyan.palauzov@a…
Jonathan Nieder
mergetools/meld: Use --help output to detect --output support In v1.7.7-rc0~3^2 (2011-08-19), git mergetool's "meld" support learned to use the --output option when calling versions of meld that are detected to support it (1.5.0 and newer, hopefully). Alas, it misdetects old versions (before 1.1.5, 2006-06-11) of meld as supporting the option, so on systems with such meld, instead of getting a nice merge helper, the operator gets a dialog box with the text …
Junio C Hamano
Update draft release notes to 1.7.9.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/maint-request-pull-for-tag' into maint * jc/maint-request-pull-for-tag: request-pull: explicitly ask tags/$name to be pulled
Junio C Hamano
Merge branch 'tr/grep-l-with-decoration' into maint * tr/grep-l-with-decoration: grep: fix -l/-L interaction with decoration lines
Junio C Hamano
Merge branch 'jl/submodule-re-add' into maint * jl/submodule-re-add: submodule add: fix breakage when re-adding a deep submodule
Junio C Hamano
Merge branch 'da/maint-mergetool-twoway' into maint * da/maint-mergetool-twoway: mergetool: Provide an empty file when needed
Namhyung Kim
ctype: implement islower/isupper macro "perf" uses a the forked copy of this file, and wants to use these two macros. Signed-off-by: Namhyung Kim <namhyung.kim@lge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Namhyung Kim
ctype.c only wants git-compat-util.h The implementation of sane ctype macros only depends on symbols in git-compat-util.h not cache.h Signed-off-by: Namhyung Kim <namhyung.kim@lge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Palimaka
Explicitly set X to avoid potential build breakage $X is appended to binary names for Windows builds (ie. git.exe). Pollution from the environment can inadvertently trigger this behaviour, resulting in 'git' turning into 'gitwhatever' without warning. Signed-off-by: Michael Palimaka <kensington@astralcloak.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
merge: do not launch an editor on "--no-edit $tag" When the user explicitly asked us not to, don't launch an editor. But do everything else the same way as the "edit" case, i.e. leave the comment with verification result in the log template and record the mergesig in the resulting merge commit for later inspection. Based on initiail analysis by Jonathan Nieder. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt
Makefile: fix syntax for older make It is necessary to write the else branch as a nested conditional. Also, write the conditions with parentheses because we use them throughout the Makefile. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
tag: do not show non-tag contents with "-n" "git tag -n" did not check the type of the object it is reading the top n lines from. At least, avoid showing the beginning of trees and blobs when dealing with lightweight tags that point at them. As the payload of a tag and a commit look similar in that they both start with a header block, which is skipped for the purpose of "-n" output, followed by human readable text, allow the message of com…
  1. Prev
  2. Next