summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-02-14Merge branch 'jn/ancient-meld-support'Libravatar Junio C Hamano1-1/+1
* jn/ancient-meld-support: mergetools/meld: Use --help output to detect --output support
2012-02-14Merge branch 'jk/userdiff-config-simplify'Libravatar Junio C Hamano5-37/+12
* jk/userdiff-config-simplify: drop odd return value semantics from userdiff_config
2012-02-14Sync with 1.7.9.1Libravatar Junio C Hamano3-7/+13
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-14Git 1.7.9.1Libravatar Junio C Hamano3-2/+14
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-13Merge branch 'jk/maint-tag-show-fixes' into maintLibravatar Junio C Hamano2-32/+53
* jk/maint-tag-show-fixes: tag: do not show non-tag contents with "-n" tag: die when listing missing or corrupt objects tag: fix output of "tag -n" when errors occur Conflicts: t/t7004-tag.sh
2012-02-13Merge branch 'bw/inet-pton-ntop-compat' into maintLibravatar Junio C Hamano2-12/+0
* bw/inet-pton-ntop-compat: Drop system includes from inet_pton/inet_ntop compatibility wrappers
2012-02-13Merge branch 'mp/make-cleanse-x-for-exe' into maintLibravatar Junio C Hamano1-0/+3
* mp/make-cleanse-x-for-exe: Explicitly set X to avoid potential build breakage
2012-02-13Merge branch 'jn/merge-no-edit-fix' into maintLibravatar Junio C Hamano2-3/+19
* jn/merge-no-edit-fix: merge: do not launch an editor on "--no-edit $tag"
2012-02-13Sync with maintLibravatar Junio C Hamano12-169/+32
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-13Update draft release notes to 1.7.9.1Libravatar Junio C Hamano1-3/+19
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-13Merge branch 'js/add-e-submodule-fix' into maintLibravatar Junio C Hamano1-0/+1
* js/add-e-submodule-fix: add -e: do not show difference in a submodule that is merely dirty
2012-02-13Merge branch 'jc/parse-date-raw' into maintLibravatar Junio C Hamano4-1/+60
* jc/parse-date-raw: parse_date(): '@' prefix forces git-timestamp parse_date(): allow ancient git-timestamp
2012-02-13Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maintLibravatar Junio C Hamano2-1/+15
* jc/merge-ff-only-stronger-than-signed-merge: merge: do not create a signed tag merge under --ff-only option
2012-02-13Merge branch 'jc/branch-desc-typoavoidance' into maintLibravatar Junio C Hamano3-4/+61
* jc/branch-desc-typoavoidance: branch --edit-description: protect against mistyped branch name tests: add write_script helper function
2012-02-13Merge branch 'jn/rpm-spec' into maintLibravatar Junio C Hamano1-0/+1
* jn/rpm-spec: git.spec: Workaround localized messages not put in any RPM
2012-02-13t: use sane_unset instead of unsetLibravatar Ævar Arnfjörð Bjarmason6-10/+10
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>
2012-02-13Remove Git's support for smoke testingLibravatar Ævar Arnfjörð Bjarmason3-133/+1
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 following commits: Revert "t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target" -- e38efac87d Revert "t/README: Document the Smoke testing" -- d15e9ebc5c Revert "t/Makefile: Create test-results dir for smoke target" -- 617344d77b Revert "tests: Infrastructure for Git smoke testing" -- b6b84d1b74 Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-13Makefile: Change the default compiler from "gcc" to "cc"Libravatar Ævar Arnfjörð Bjarmason1-1/+1
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 perfectly capable of compiling Git, and it's annoying to have to specify CC=cc on the command-line when compiling Git when that's the default behavior of most other portable programs. So change the default to "cc". Users who want to compile with GCC can still add "CC=gcc" to the make(1) command-line, but those users who don't have GCC as their "cc" will see expected behavior, and as a bonus we'll be more likely to smoke out new compilation warnings from our distributors since they'll me using a more varied set of compilers by default. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-12Update draft release notes to 1.7.10Libravatar Junio C Hamano1-1/+40
Again this round mostly consists of fixes for 1.7.9 in preparation for merging these topics down to maint for 1.7.9.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-12Merge branch 'jc/checkout-out-of-unborn'Libravatar Junio C Hamano2-1/+29
* jc/checkout-out-of-unborn: git checkout -b: allow switching out of an unborn branch
2012-02-12Merge branch 'jc/maint-mailmap-output'Libravatar Junio C Hamano1-8/+10
* jc/maint-mailmap-output: mailmap: always return a plain mail address from map_user()
2012-02-12Merge branch 'jk/prompt-fallback-to-tty'Libravatar Junio C Hamano1-9/+18
* jk/prompt-fallback-to-tty: prompt: fall back to terminal if askpass fails prompt: clean up strbuf usage
2012-02-12Merge branch 'jn/gitweb-search-utf-8'Libravatar Junio C Hamano1-7/+7
* jn/gitweb-search-utf-8: gitweb: Allow UTF-8 encoded CGI query parameters and path_info Conflicts: gitweb/gitweb.perl
2012-02-12Merge branch 'nd/diffstat-gramnum'Libravatar Junio C Hamano69-118/+168
* nd/diffstat-gramnum: Use correct grammar in diffstat summary line
2012-02-12Merge branch 'nd/find-pack-entry-recent-cache-invalidation'Libravatar Junio C Hamano1-38/+46
* nd/find-pack-entry-recent-cache-invalidation: find_pack_entry(): do not keep packed_git pointer locally sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry()
2012-02-12Merge branch 'tt/profile-build-fix'Libravatar Junio C Hamano2-22/+50
* tt/profile-build-fix: Makefile: fix syntax for older make Fix build problems related to profile-directed optimization
2012-02-12Merge branch 'nd/cache-tree-api-refactor'Libravatar Junio C Hamano5-20/+19
* nd/cache-tree-api-refactor: cache-tree: update API to take abitrary flags
2012-02-12Merge branch 'fc/zsh-completion'Libravatar Junio C Hamano1-56/+11
* fc/zsh-completion: completion: simplify __gitcomp and __gitcomp_nl implementations completion: use ls -1 instead of rolling a loop to do that ourselves completion: work around zsh option propagation bug
2012-02-12Merge branch 'mp/make-cleanse-x-for-exe'Libravatar Junio C Hamano1-0/+3
* mp/make-cleanse-x-for-exe: Explicitly set X to avoid potential build breakage
2012-02-12Merge branch 'bw/inet-pton-ntop-compat'Libravatar Junio C Hamano2-12/+0
* bw/inet-pton-ntop-compat: Drop system includes from inet_pton/inet_ntop compatibility wrappers
2012-02-12Merge branch 'jc/maint-commit-ignore-i-t-a'Libravatar Junio C Hamano2-6/+8
* jc/maint-commit-ignore-i-t-a: commit: ignore intent-to-add entries instead of refusing Conflicts: cache-tree.c
2012-02-12Merge branch 'jk/maint-tag-show-fixes'Libravatar Junio C Hamano2-32/+53
* jk/maint-tag-show-fixes: tag: do not show non-tag contents with "-n" tag: die when listing missing or corrupt objects tag: fix output of "tag -n" when errors occur Conflicts: t/t7004-tag.sh
2012-02-12Merge branch 'mm/empty-loose-error-message'Libravatar Junio C Hamano1-0/+5
* mm/empty-loose-error-message: fsck: give accurate error message on empty loose object files
2012-02-12Merge branch 'nk/ctype-for-perf'Libravatar Junio C Hamano2-1/+16
* nk/ctype-for-perf: ctype: implement islower/isupper macro ctype.c only wants git-compat-util.h
2012-02-12Merge branch 'jn/merge-no-edit-fix'Libravatar Junio C Hamano2-1/+14
* jn/merge-no-edit-fix: merge: do not launch an editor on "--no-edit $tag" Conflicts: builtin/merge.c
2012-02-10mergetools/meld: Use --help output to detect --output supportLibravatar Jonathan Nieder1-1/+1
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 "Wrong number of arguments (Got 5)". (Version 1.1.5 is when meld switched to using optparse. One consequence of that change was that errors in usage are detected and signalled through the exit status even when --help was passed.) Luckily there is a simpler check that is more reliable: the usage string printed by "meld --help" reliably reflects whether --output is supported in a given version. Use it. Reported-by: Jeff Epler <jepler@unpythonic.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-10Update draft release notes to 1.7.10Libravatar Junio C Hamano1-1/+22
Document bunch of bugfix topics to be merged down to 'maint' soonish for 1.7.9.1 maintenance release. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-10Merge branch 'js/add-e-submodule-fix'Libravatar Junio C Hamano1-0/+1
* js/add-e-submodule-fix: add -e: do not show difference in a submodule that is merely dirty
2012-02-10Merge branch 'jc/parse-date-raw'Libravatar Junio C Hamano4-1/+60
* jc/parse-date-raw: parse_date(): '@' prefix forces git-timestamp parse_date(): allow ancient git-timestamp
2012-02-10Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'Libravatar Junio C Hamano2-1/+15
* jc/merge-ff-only-stronger-than-signed-merge: merge: do not create a signed tag merge under --ff-only option
2012-02-10Merge branch 'jc/branch-desc-typoavoidance'Libravatar Junio C Hamano2-4/+52
* jc/branch-desc-typoavoidance: branch --edit-description: protect against mistyped branch name
2012-02-10Merge branch 'jn/rpm-spec'Libravatar Junio C Hamano1-0/+1
* jn/rpm-spec: git.spec: Workaround localized messages not put in any RPM
2012-02-10Merge branch 'jk/tests-write-script'Libravatar Junio C Hamano2-6/+11
* jk/tests-write-script: t0300: use write_script helper tests: add write_script helper function
2012-02-10Sync with maintLibravatar Junio C Hamano2-36/+17
2012-02-10Update draft release notes to 1.7.9.1Libravatar Junio C Hamano1-0/+17
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-02-10Merge branch 'jc/maint-request-pull-for-tag' into maintLibravatar Junio C Hamano3-8/+4
* jc/maint-request-pull-for-tag: request-pull: explicitly ask tags/$name to be pulled
2012-02-10Merge branch 'tr/grep-l-with-decoration' into maintLibravatar Junio C Hamano2-2/+25
* tr/grep-l-with-decoration: grep: fix -l/-L interaction with decoration lines
2012-02-10Merge branch 'jl/submodule-re-add' into maintLibravatar Junio C Hamano2-0/+9
* jl/submodule-re-add: submodule add: fix breakage when re-adding a deep submodule
2012-02-10Merge branch 'da/maint-mergetool-twoway' into maintLibravatar Junio C Hamano2-5/+35
* da/maint-mergetool-twoway: mergetool: Provide an empty file when needed
2012-02-10ctype: implement islower/isupper macroLibravatar Namhyung Kim1-0/+15
"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>