- 07 4月, 2010 7 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* da/maint-python-startup: Makefile: Remove usage of deprecated Python "has_key" method
-
由 Junio C Hamano 提交于
* ic/bash-completion-rpm: RPM spec: include bash completion support
-
由 Junio C Hamano 提交于
* sb/fmt-merge-msg: fmt-merge-msg: hide summary option fmt-merge-msg: remove custom string_list implementation string-list: add unsorted_string_list_lookup() fmt-merge-msg: use pretty.c routines t6200: test fmt-merge-msg more t6200: modernize with test_tick fmt-merge-msg: be quiet if nothing to merge
-
由 Junio C Hamano 提交于
* jc/conflict-marker-size: diff --check: honor conflict-marker-size attribute
-
由 Junio C Hamano 提交于
* ef/maint-empty-commit-log: rev-list: fix --pretty=oneline with empty message
-
由 Junio C Hamano 提交于
* sg/bash-completion: bash: completion for gitk aliases bash: support user-supplied completion scripts for aliases bash: support user-supplied completion scripts for user's git commands bash: improve aliased command recognition
-
- 06 4月, 2010 1 次提交
-
-
由 Junio C Hamano 提交于
Brandon Casey reports: Subject: Re: [PATCH] Link against libiconv on IRIX Date: Mon, 05 Apr 2010 11:45:32 -0500 Message-Id: <1UypQMCHLT57SnjSQIM66RTkLalsvavG8xXoQJv4rEQ@cipher.nrlssc.navy.mil> This breaks compilation on IRIX 6.5.29m for me since there is no separate libiconv.so. What version of IRIX are you using? On my system, even the iconv utility doesn't link against a libiconv shared object. It seems the iconv functionality is in libc. # ldd /usr/bin/iconv libc.so.1 => /usr/lib32/libc.so.1 Could it be that you are using a third party iconv library? I've experienced this on another system and the problem was related to curl. In that case, curl was linked against an external iconv and not the native library, so if I tried to build with curl support, I had to also build against the external iconv library. While we wait for an improved solution, revert the regression caused by 21704227.
-
- 05 4月, 2010 3 次提交
-
-
由 Junio C Hamano 提交于
* maint: pack-protocol.txt: fix pkt-line lengths pack-protocol.txt: fix spelling
-
由 Tay Ray Chuan 提交于
Previously, the lengths were 4-bytes short. Fix it such that the lengths reflect the total length of the pkt-line, as per spec. Signed-off-by: NTay Ray Chuan <rctay89@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Tay Ray Chuan 提交于
s/paramater/parameter/. Signed-off-by: NTay Ray Chuan <rctay89@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 04 4月, 2010 19 次提交
-
-
由 Junio C Hamano 提交于
* mb/rebase-i-no-ff: Teach rebase the --no-ff option. Conflicts: git-rebase--interactive.sh t/t3404-rebase-interactive.sh
-
由 Junio C Hamano 提交于
* sp/maint-http-backend-die-triggers-die-recursively: http-backend: Don't infinite loop during die()
-
由 Junio C Hamano 提交于
* rr/imap-send-unconfuse-from-line: imap-send: Remove limitation on message body
-
由 Junio C Hamano 提交于
* mg/use-default-abbrev-length-in-rev-list: rev-list: use default abbrev length when abbrev-commit is in effect
-
由 Junio C Hamano 提交于
* mg/maint-send-email-lazy-editor: send-email: lazily assign editor variable
-
由 Junio C Hamano 提交于
* rb/maint-python-path: Correct references to /usr/bin/python which does not exist on FreeBSD
-
由 Junio C Hamano 提交于
* jn/merge-diff3-label: merge-recursive: add a label for ancestor cherry-pick, revert: add a label for ancestor revert: clarify label on conflict hunks compat: add mempcpy() checkout -m --conflict=diff3: add a label for ancestor merge_trees(): add ancestor label parameter for diff3-style output merge_file(): add comment explaining behavior wrt conflict style checkout --conflict=diff3: add a label for ancestor ll_merge(): add ancestor label parameter for diff3-style output merge-file --diff3: add a label for ancestor xdl_merge(): move file1 and file2 labels to xmparam structure xdl_merge(): add optional ancestor label to diff3-style output tests: document cherry-pick behavior in face of conflicts tests: document format of conflicts from checkout -m Conflicts: builtin/revert.c
-
由 Junio C Hamano 提交于
* ef/cherry-abbrev: ls: remove redundant logic cherry: support --abbrev option
-
由 Junio C Hamano 提交于
* bw/template-tool-buildconfig: Modernize git calling conventions in hook templates Make templates honour SHELL_PATH and PERL_PATH
-
由 Junio C Hamano 提交于
* mg/mailmap-update: .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
-
由 Junio C Hamano 提交于
* bc/t5505-fix: t/t5505-remote.sh: escape * to prevent interpretation by shell as glob t5505: add missing && t5505: remove unnecessary subshell invocations
-
由 Junio C Hamano 提交于
* gh/maint-stash-show-error-message: Improve error messages from 'git stash show'
-
由 Junio C Hamano 提交于
* rs/threaded-grep-context: grep: enable threading for context line printing Conflicts: grep.c
-
由 Junio C Hamano 提交于
* bc/maint-daemon-sans-ss-family: daemon.c: avoid accessing ss_family member of struct sockaddr_storage
-
由 Junio C Hamano 提交于
* bc/acl-test: t/t1304: make a second colon optional in the mask ACL check t/t1304: set the ACL effective rights mask t/t1304: use 'test -r' to test readability rather than looking at mode bits t/t1304: set the Default ACL base entries t/t1304: avoid -d option to setfacl
-
由 Junio C Hamano 提交于
* ja/send-email-ehlo: git-send-email.perl - try to give real name of the calling host to HELO/EHLO git-send-email.perl: add option --smtp-debug git-send-email.perl: improve error message in send_message()
-
由 Junio C Hamano 提交于
* do/rebase-i-arbitrary: rebase--interactive: don't require what's rebased to be a branch Conflicts: t/t3404-rebase-interactive.sh
-
由 Junio C Hamano 提交于
* ak/everyday-git: everyday: fsck and gc are not everyday operations
-
由 Jonathan Nieder 提交于
Tweak the condition that detects old Cygwin versions to not include versions such as 1.8, 1.11, and 2.1. Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 03 4月, 2010 4 次提交
-
-
由 YONETANI Tomokazu 提交于
As on FreeBSD, defining _XOPEN_SOURCE to 600 on DragonFly BSD 2.4-RELEASE or later hides symbols from programs, which leads to implicit declaration of functions, making the return value to be assumed an int. On architectures where sizeof(int) < sizeof(void *), this can cause unexpected behaviors or crashes. This change won't affect other OSes unless they define __DragonFly__ macro, or older versions of DragonFly BSD as the current git code doesn't rely on the features only available with _XOPEN_SOURCE set to 600 on DragonFly. Signed-off-by: NYONETANI Tomokazu <y0netan1@dragonflybsd.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Markus Heidelberg 提交于
The file descriptor is already defined at the beginning of the function. Signed-off-by: NMarkus Heidelberg <markus.heidelberg@web.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Markus Heidelberg 提交于
Signed-off-by: NMarkus Heidelberg <markus.heidelberg@web.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Eric Raymond 提交于
These have been extensively live-tested in the last week. The version 2 ciabot.sh maintainer has passed the baton to me; ciabot.py is original. Signed-off-by: NEric S. Raymond <esr@thyrsus.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 02 4月, 2010 1 次提交
-
-
由 Eric Blake 提交于
Now that Cygwin 1.7.x has enabled lots of new features, and Cygwin 1.5 is no longer actively supported by the Cygwin mailing lists, we might as well update the defaults to cater to those new features. NO_TRUSTABLE_FILEMODE is only necessary on FAT drives; the Cygwin community recommends NTFS drives, but there is still too much use for FAT to switch the default. Likewise, UNRELIABLE_FSTAT is probably file-system specific, but worth keeping unchanged. This commit does not change the default for NO_MMAP, although definitive proof of whether this option is necessary is lacking. Signed-off-by: NEric Blake <eblake@redhat.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 01 4月, 2010 5 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jc/maint-refs-dangling: refs: ref entry with NULL sha1 is can be a dangling symref
-
由 Holger Weiß 提交于
Specifying one or more <pattern> parameters is optional when calling show-ref, so mark them as such using brackets in the manual. Signed-off-by: NHolger Weiß <holger@zedat.fu-berlin.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Holger Weiß 提交于
On IRIX, "-liconv" must be added to the linker command line in order to get iconv(3) support; set the according Makefile variable appropriately. Signed-off-by: NHolger Weiß <holger@zedat.fu-berlin.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-