- 05 9月, 2013 13 次提交
-
-
由 Junio C Hamano 提交于
* fc/remote-hg-shared-setup: remote-hg: add shared repo upgrade remote-hg: ensure shared repo is initialized
-
由 Junio C Hamano 提交于
* sb/misc-cleanup: rm: remove unneeded null pointer check diff: fix a possible null pointer dereference diff: remove ternary operator evaluating always to true
-
由 Junio C Hamano 提交于
* nd/gc-lock-against-each-other: gc: reject if another gc is running, unless --force is given
-
由 Junio C Hamano 提交于
* ap/remote-hg-tilde-is-home-directory: remote-hg: fix path when cloning with tilde expansion
-
由 Junio C Hamano 提交于
Fixes a minor bug in "git rebase -i" (there could be others, as the root cause is pretty generic) where the code feeds a random, data dependeant string to 'echo' and expects it to come out literally. * mm/no-shell-escape-in-die-message: die_with_status: use "printf '%s\n'", not "echo"
-
由 Junio C Hamano 提交于
Finishing touches to an earlier fix already in 'master'. * tr/fd-gotcha-fixes: t0070: test that git_mkstemps correctly checks return value of open()
-
由 Junio C Hamano 提交于
Handle memory pressure and file descriptor pressure separately when deciding to release pack windows to honor resource limits. * bc/unuse-packfile: Don't close pack fd when free'ing pack windows sha1_file: introduce close_one_pack() to close packs on fd pressure
-
由 Junio C Hamano 提交于
* da/darwin: OS X: Fix redeclaration of die warning Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1 imap-send: use Apple's Security framework for base64 encoding
-
由 Junio C Hamano 提交于
Code simplification as a preparatory step to something larger. * nd/sq-quote-buf: quote: remove sq_quote_print() tar-tree: remove dependency on sq_quote_print() for-each-ref, quote: convert *_quote_print -> *_quote_buf
-
由 Junio C Hamano 提交于
* rr/feed-real-path-to-editor: editor: use canonicalized absolute path
-
由 Junio C Hamano 提交于
* jk/fast-import-empty-ls: fast-import: allow moving the root tree fast-import: allow ls or filecopy of the root tree fast-import: set valid mode on root tree in "ls" t9300: document fast-import empty path issues
-
由 Junio C Hamano 提交于
Subversion 1.8.0 that was recently released breaks older subversion clients coming over http/https in various ways. * km/svn-1.8-serf-only: Git.pm: revert _temp_cache use of temp_is_locked git-svn: allow git-svn fetching to work using serf Git.pm: add new temp_is_locked function
-
由 Junio C Hamano 提交于
"git check-ignore -z" applied the NUL termination to both its input (with --stdin) and its output, but "git check-attr -z" ignored the option on the output side. This is potentially a backward incompatible fix. Let's see if anybody screams before deciding if we want to do anything to help existing users (there may be none). * jc/check-x-z: check-attr -z: a single -z should apply to both input and output check-ignore -z: a single -z should apply to both input and output check-attr: the name of the character is NUL, not NULL check-ignore: the name of the character is NUL, not NULL
-
- 04 9月, 2013 4 次提交
-
-
由 Junio C Hamano 提交于
* maint: fix shell syntax error in template l10n: fr.po: hotfix for commit 6b388fca
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
* git://github.com/git-l10n/git-po: l10n: fr.po: hotfix for commit 6b388fca
-
由 Junio C Hamano 提交于
* maint-1.8.3: fix shell syntax error in template
-
由 Junio C Hamano 提交于
* maint-1.8.2: fix shell syntax error in template
-
- 31 8月, 2013 10 次提交
-
-
由 Junio C Hamano 提交于
It is tentatively called 1.8.5, but it should be an easy matter of renaming the release-notes file and RelNotes symlink to later call it 1.9 near the end of the cycle if we wanted to. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Some people still use rather old versions of bash, which cannot grok some constructs like 'printf -v varname' the prompt and completion code started to use recently. * bc/completion-for-bash-3.0: contrib/git-prompt.sh: handle missing 'printf -v' more gracefully t9902-completion.sh: old Bash still does not support array+=('') notation git-completion.bash: use correct Bash/Zsh array length syntax
-
由 Junio C Hamano 提交于
* sp/doc-smart-http: Document the HTTP transport protocols
-
由 Junio C Hamano 提交于
* mm/war-on-whatchanged: whatchanged: document its historical nature core-tutorial: trim the section on Inspecting Changes
-
由 Junio C Hamano 提交于
* rt/doc-merge-file-diff3: Documentation/git-merge-file: document option "--diff3"
-
由 Junio C Hamano 提交于
Declare that the official grammar & spelling of the source of this project is en_US, but strongly discourage patches only to "fix" existing en_UK strings to avoid unnecessary churns. * mb/docs-favor-en-us: Provide some linguistic guidance for the documentation.
-
由 Junio C Hamano 提交于
* rj/doc-rev-parse: rev-parse(1): logically group options rev-parse: remove restrictions on some options
-
由 Junio C Hamano 提交于
Portability fix. * hv/config-from-blob: config: do not use C function names as struct members
-
由 Junio C Hamano 提交于
The recent "short-cut clone connectivity check" topic broke a shallow repository when a fetch operation tries to auto-follow tags. * nd/fetch-pack-shallow-fix: fetch-pack: do not remove .git/shallow file when --depth is not specified
-
由 Thorsten Glaser 提交于
An if clause must not be empty; add a "colon" command. Signed-off-by: NThorsten Glaser <t.glaser@tarent.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 30 8月, 2013 1 次提交
-
-
由 Sebastien Helleu 提交于
Fix many typos and add some new translations (1277/2080 messages translated). Closes git-l10n/git-po/pull/63. Signed-off-by: NSebastien Helleu <flashcode@flashtux.org> Signed-off-by: NJean-Noel Avila <jn.avila@free.fr> Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
- 27 8月, 2013 1 次提交
-
-
由 Jeff King 提交于
According to C99, section 7.1.4: Any function declared in a header may be additionally implemented as a function-like macro defined in the header. Therefore calling our struct member function pointer "fgetc" may run afoul of unwanted macro expansion when we call: char c = cf->fgetc(cf); This turned out to be a problem on uclibc, which defines fgetc as a macro and causes compilation failure. The standard suggests fixing this in a few ways: 1. Using extra parentheses to inhibit the function-like macro expansion. E.g., "(cf->fgetc)(cf)". This is undesirable as it's ugly, and each call site needs to remember to use it (and on systems without the macro, forgetting will compile just fine). 2. Using #undef (because a conforming implementation must also be providing fgetc as a function). This is undesirable because presumably the implementation was using the macro for a performance benefit, and we are dropping that optimization. Instead, we can simply use non-colliding names. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 26 8月, 2013 1 次提交
-
-
由 Nguyễn Thái Ngọc Duy 提交于
fetch_pack() can remove .git/shallow file when a shallow repository becomes a full one again. This behavior is triggered incorrectly when tags are also fetched because fetch_pack() will be called twice. At the first fetch_pack() call: - shallow_lock is set up - alternate_shallow_file points to shallow_lock.filename, which is "shallow.lock" - commit_lock_file is called, which sets shallow_lock.filename to "". alternate_shallow_file also becomes "" because it points to the same memory. At the second call, setup_alternate_shallow() is not called and alternate_shallow_file remains "". It's mistaken as unshallow case and .git/shallow is removed. The end result is a broken repository. Fix this by always initializing alternate_shallow_file when fetch_pack() is called. As an extra measure, check if args->depth > 0 before commit/rollback shallow file. Reported-by: NKacper Kornet <kornet@camk.edu.pl> Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 24 8月, 2013 1 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 23 8月, 2013 1 次提交
-
-
由 Brandon Casey 提交于
Old Bash (3.0) which is distributed with RHEL 4.X and other ancient platforms that are still in wide use, do not have a printf that supports -v. Neither does Zsh (which is already handled in the code). As suggested by Junio, let's test whether printf supports the -v option and store the result. Then later, we can use it to determine whether 'printf -v' can be used, or whether printf must be called in a subshell. Signed-off-by: NBrandon Casey <drafnel@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 22 8月, 2013 4 次提交
-
-
由 Brandon Casey 提交于
Old Bash (3.0) which is distributed with RHEL 4.X and other ancient platforms that are still in wide use, does not understand the array+=() notation. Let's use an explicit assignment to the new array element which works everywhere, like: array[${#array[@]}+1]='' The right-hand side '' is not strictly necessary, but in this case I think it is more clear. Signed-off-by: NBrandon Casey <drafnel@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Brandon Casey 提交于
The syntax for retrieving the number of elements in an array is: ${#name[@]} Signed-off-by: NBrandon Casey <drafnel@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Shawn O. Pearce 提交于
Signed-off-by: NShawn O. Pearce <spearce@spearce.org> Revised-by: NTay Ray Chuan <rctay89@gmail.com> Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 20 8月, 2013 1 次提交
-
-
由 Junio C Hamano 提交于
As we had to revert two topics at the last minute, let's have another (hopefully short) round of rc to make sure the final release will be sound. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 15 8月, 2013 2 次提交
-
-
由 Junio C Hamano 提交于
This reverts commit cdfd9483, as it does not just apply to "@" (and forms with modifiers like @{u} applied to it), but also affects e.g. "refs/heads/@/foo", which it shouldn't. The basic idea of giving a short-hand might be good, and the topic can be retried later, but let's revert to avoid affecting existing use cases for now for the upcoming release.
-
由 Junio C Hamano 提交于
This reverts commit a7365313, as it has been reported that "ls-files --killed" is too time-consuming in a deep directory with too many untracked crufts (e.g. $HOME/.git tracking only a few files). We'd need to revisit it later but "ls-files --killed" needs to be optimized before it happens.
-
- 14 8月, 2013 1 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-