- 11 4月, 2010 2 次提交
-
-
由 Junio C Hamano 提交于
* jl/maint-submodule-gitfile-awareness: Teach diff --submodule and status to handle .git files in submodules
-
由 Jens Lehmann 提交于
The simple test for an existing .git directory gives an incorrect result if .git is a file that records "gitdir: overthere". So for submodules that use a .git file, "git status" and the diff family - when the "--submodule" option is given - did assume the submodule was not populated at all when a .git file was used, thus generating wrong output or no output at all. This is fixed by using read_gitfile_gently() to get the correct location of the .git directory. While at it, is_submodule_modified() was cleaned up to use the "dir" member of "struct child_process" instead of setting the GIT_WORK_TREE and GIT_DIR environment variables. Signed-off-by: NJens Lehmann <Jens.Lehmann@web.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 10 4月, 2010 14 次提交
-
-
由 Junio C Hamano 提交于
* maint: Let check_preimage() use memset() to initialize "struct checkout" fetch/push: fix usage strings
-
由 Jens Lehmann 提交于
Every code site except check_preimage() uses either memset() or declares a static instance of "struct checkout" to achieve proper initialization. Lets use memset() instead of explicit initialization of all members here too to be on the safe side in case this structure is expanded someday. Signed-off-by: NJens Lehmann <Jens.Lehmann@web.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* ef/maint-empty-commit-log: rev-list: fix --pretty=oneline with empty message
-
由 Junio C Hamano 提交于
* jc/conflict-marker-size: diff --check: honor conflict-marker-size attribute
-
由 Junio C Hamano 提交于
* sp/maint-http-backend-die-triggers-die-recursively: http-backend: Don't infinite loop during die()
-
由 Junio C Hamano 提交于
* mg/maint-send-email-lazy-editor: send-email: lazily assign editor variable
-
由 Junio C Hamano 提交于
* rr/imap-send-unconfuse-from-line: imap-send: Remove limitation on message body
-
由 Junio C Hamano 提交于
* rb/maint-python-path: Correct references to /usr/bin/python which does not exist on FreeBSD
-
由 Junio C Hamano 提交于
* gh/maint-stash-show-error-message: Improve error messages from 'git stash show'
-
由 Junio C Hamano 提交于
* mg/mailmap-update: .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
-
由 Junio C Hamano 提交于
* bc/maint-daemon-sans-ss-family: daemon.c: avoid accessing ss_family member of struct sockaddr_storage
-
由 Tay Ray Chuan 提交于
- use "<options>" instead of just "options". - use "[<repository> [<refspec>...]]" to indicate that <repository> and <refspec> are optional, and that <refspec> cannot be specified without specifying <repository>. Note that when called without specifying <repository> (eg. "git fetch -f"), it is accurate to say that the "git fetch [<options>] [<repository> ...]" case takes precedence over "git fetch [<options>] <group>". Signed-off-by: NTay Ray Chuan <rctay89@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* rc/maint-reflog-msg-for-forced-branch: branch: say "Reset to" in reflog entries for 'git branch -f' operations Conflicts: builtin-branch.c
-
由 Tay Ray Chuan 提交于
In 5f856dd4 (fix reflog entries for "git-branch"), it is mentioned that 'git branch -f' is intended to be equivalent to 'git reset'. Since we usually say "reset to <commit>" in the git-reset Documentation and elsewhere, it would make sense to say "Reset to" here as well, instead of "Reset from" previously. Signed-off-by: NTay Ray Chuan <rctay89@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 09 4月, 2010 4 次提交
-
-
由 Junio C Hamano 提交于
-
由 Junio C Hamano 提交于
The textconv leak fix introduced two invocations of free() to release memory pointed by "const char *", which get annoying compiler warning.
-
由 Junio C Hamano 提交于
* maint: docs: clarify "branch -l"
-
由 Jeff King 提交于
This option is mostly useless these days because we turn on reflogs by default in non-bare repos. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 08 4月, 2010 3 次提交
-
-
由 Junio C Hamano 提交于
* mg/notes-reflog: refs.c: Write reflogs for notes just like for branch heads t3301-notes: Test the creation of reflog entries
-
由 Junio C Hamano 提交于
* jn/mailinfo-scissors: Teach mailinfo %< as an alternative scissors mark
-
由 Jeff King 提交于
Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 07 4月, 2010 8 次提交
-
-
由 Brandon Casey 提交于
The IRIX MIPSPro compiler complains like this: cc-1107 c99: WARNING File = notes.h, Line = 215 A signed bit field has a length of 1 bit. int suppress_default_notes:1; ^ 'unsigned' is what was intended, so lets make it so. Signed-off-by: NBrandon Casey <casey@nrlssc.navy.mil> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 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 4 次提交
-
-
由 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>
-
由 Jonathan Nieder 提交于
Handle perforations found “in the wild” more robustly by recognizing “%<” as an alternative scissors mark. This feature is only meant to support old habits. Discourage new use of the percent-based version by only documenting the 8< symbol so new users’ perforations can still be recognized by old versions of Git. Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 04 4月, 2010 4 次提交
-
-
由 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
-