- 25 6月, 2015 18 次提交
-
-
由 Junio C Hamano 提交于
Disable "have we lost a race with competing repack?" check while receiving a huge object transfer that runs index-pack. * jk/index-pack-reduce-recheck: index-pack: avoid excessive re-reading of pack directory
-
由 Junio C Hamano 提交于
The tcsh completion writes a bash scriptlet but that would have failed for users with noclobber set. * af/tcsh-completion-noclobber: git-completion.tcsh: fix redirect with noclobber
-
由 Junio C Hamano 提交于
"git for-each-ref" reported "missing object" for 0{40} when it encounters a broken ref. The lack of object whose name is 0{40} is not the problem; the ref being broken is. * mh/reporting-broken-refs-from-for-each-ref: read_loose_refs(): treat NULL_SHA1 loose references as broken read_loose_refs(): simplify function logic for-each-ref: report broken references correctly t6301: new tests of for-each-ref error handling
-
由 Junio C Hamano 提交于
* sg/completion-commit-cleanup: completion: teach 'scissors' mode to 'git commit --cleanup='
-
由 Junio C Hamano 提交于
Various fixes around "git am" that applies a patch to a history that is not there yet. * pt/am-abort-fix: am --abort: keep unrelated commits on unborn branch am --abort: support aborting to unborn branch am --abort: revert changes introduced by failed 3way merge am --skip: support skipping while on unborn branch am -3: support 3way merge on unborn branch am --skip: revert changes introduced by failed 3way merge
-
由 Junio C Hamano 提交于
Hotfix for the 'untracked-cache' topic that is already in 'master'. * nd/untracked-cache: read-cache: fix untracked cache invalidation when split-index is used
-
由 Junio C Hamano 提交于
"git fsck" used to ignore missing or invalid objects recorded in reflog. * mh/fsck-reflog-entries: fsck: report errors if reflog entries point at invalid objects fsck_handle_reflog_sha1(): new function
-
由 Junio C Hamano 提交于
Portability fix. * js/sleep-without-select: lockfile: wait using sleep_millisec() instead of select() lockfile: convert retry timeout computations to millisecond help.c: wrap wait-only poll() invocation in sleep_millisec() lockfile: replace random() by rand()
-
由 Junio C Hamano 提交于
A compilation workaround. * es/utf8-stupid-compiler-workaround: utf8: NO_ICONV: silence uninitialized variable warning
-
由 Junio C Hamano 提交于
"git am" learned am.threeWay configuration variable. * rl/am-3way-config: git-am: add am.threeWay config variable t4150-am: refactor am -3 tests git-am.sh: fix initialization of the threeway variable
-
由 Junio C Hamano 提交于
Traditionally, external low-level 3-way merge drivers are expected to produce their results based solely on the contents of the three variants given in temporary files named by %O, %A and %B on their command line. Additionally allow them to look at the final path (given by %P). * jc/ll-merge-expose-path: ll-merge: pass the original path to external drivers
-
由 Junio C Hamano 提交于
* es/osx-header-pollutes-mask-macro: ewah: use less generic macro name ewah/bitmap: silence warning about MASK macro redefinition
-
由 Junio C Hamano 提交于
Auto-detect availability of getdelim() that helps optimized version of strbuf_getwholeline(). * es/configure-getdelim: configure: add getdelim() check config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases
-
由 Junio C Hamano 提交于
"git pull" has become more aware of the options meant for underlying "git fetch" and then learned to use parse-options parser. * pt/pull-optparse: pull: use git-rev-parse --parseopt for option parsing pull: handle git-fetch's options as well
-
由 Junio C Hamano 提交于
"git blame" learned blame.showEmail configuration variable. * qn/blame-show-email: blame: add blame.showEmail configuration
-
由 Junio C Hamano 提交于
"git format-patch --ignore-if-upstream A..B" did not like to be fed tags as boundary commits. * jc/do-not-feed-tags-to-clear-commit-marks: format-patch: do not feed tags to clear_commit_marks()
-
由 Junio C Hamano 提交于
"git send-email" learned to handle more forms of sendmail style aliases file. * es/send-email-sendmail-alias: send-email: further warn about unsupported sendmail aliases features t9001: add sendmail aliases line continuation tests t9001: refactor sendmail aliases test infrastructure send-email: implement sendmail aliases line continuation support send-email: simplify sendmail aliases comment and blank line recognizer send-email: refactor sendmail aliases parser send-email: fix style: cuddle 'elsif' and 'else' with closing brace send-email: drop noise comments which merely repeat what code says send-email: visually distinguish sendmail aliases parser warnings send-email: further document missing sendmail aliases functionality
-
由 Junio C Hamano 提交于
"git apply" cannot diagnose a patch corruption when the breakage is to mark the length of the hunk shorter than it really is on the hunk header line "@@ -l,k +m,n @@"; one special case it could is when the hunk becomes no-op (e.g. k == n == 2 for two-line context patch output), and it learned how to do so. * jc/apply-reject-noop-hunk: apply: reject a hunk that does not do anything
-
- 19 6月, 2015 1 次提交
-
-
由 Matthieu Moy 提交于
The changes are described in CHANGES. Contributions-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Contributions-by: NRichard Hansen <rhansen@rhansen.org> Contributions-by: NMichael Haggerty <mhagger@alum.mit.edu> Contributions-by: NElijah Newren <newren@gmail.com> Contributions-by: NLuke Mewburn <luke@mewburn.net> Contributions-by: NDave Boutcher <daveboutcher@gmail.com> Contributions-by: NAzat Khuzhin <a3at.mail@gmail.com> Contributions-by: NSebastian Schuberth <sschuberth@gmail.com> Contributions-by: NMikko Johannes Koivunalho <mikko.koivunalho@iki.fi> Contributions-by: NElijah Newren <newren@palantir.com> Contributions-by: NBenoît Ryder <benoit@ryder.fr> Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 17 6月, 2015 21 次提交
-
-
由 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 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Code clean-up. * jk/clone-dissociate: clone: reorder --dissociate and --reference options clone: use OPT_STRING_LIST for --reference
-
由 Junio C Hamano 提交于
* sb/submodule-doc-intro: submodule doc: reorder introductory paragraphs
-
由 Junio C Hamano 提交于
* sb/glossary-submodule: glossary: add "remote", "submodule", "superproject"
-
由 Junio C Hamano 提交于
A few usage string updates. * ah/usage-strings: blame, log: format usage strings similarly to those in documentation
-
由 Junio C Hamano 提交于
Doc grammar fix. * mc/commit-doc-grammofix: Documentation/git-commit: grammofix
-
由 Junio C Hamano 提交于
Code clean-up. * rs/janitorial: dir: remove unused variable sb clean: remove unused variable buf use file_exists() to check if a file exists in the worktree
-
由 Junio C Hamano 提交于
An earlier leakfix to bitmap testing code was incomplete. * sb/test-bitmap-free-at-end: test_bitmap_walk: free bitmap with bitmap_free
-
由 Junio C Hamano 提交于
"git clean pathspec..." tried to lstat(2) and complain even for paths outside the given pathspec. * dt/clean-pathspec-filter-then-lstat: clean: only lstat files in pathspec
-
由 Junio C Hamano 提交于
Communication between the HTTP server and http_backend process can lead to a dead-lock when relaying a large ref negotiation request. Diagnose the situation better, and mitigate it by reading such a request first into core (to a reasonable limit). * jk/http-backend-deadlock: http-backend: spool ref negotiation requests to buffer t5551: factor out tag creation http-backend: fix die recursion with custom handler
-
由 Junio C Hamano 提交于
The clean/smudge interface did not work well when filtering an empty contents (failed and then passed the empty input through). It can be argued that a filter that produces anything but empty for an empty input is nonsense, but if the user wants to do strange things, then why not? * jh/filter-empty-contents: sha1_file: pass empty buffer to index empty file
-
由 Junio C Hamano 提交于
Make "git stash something --help" error out, so that users can safely say "git stash drop --help". * jk/stash-options: stash: recognize "--help" for subcommands stash: complain about unknown flags
-
由 Junio C Hamano 提交于
Clarify that "log --raw" and "log --format=raw" are unrelated concepts. * mm/log-format-raw-doc: Documentation/log: clarify sha1 non-abbreviation in log --raw Documentation/log: clarify what --raw means
-
由 Junio C Hamano 提交于
Catch a programmer mistake to feed a pointer not an array to ARRAY_SIZE() macro, by using a couple of GCC extensions. * ep/do-not-feed-a-pointer-to-array-size: git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deriving the size of array
-
由 Junio C Hamano 提交于
An earlier optimization broke index-pack for a large object transfer; this fixes it before the breakage hits any released version. * nd/slim-index-pack-memory-usage: index-pack: fix truncation of off_t in comparison
-
由 Junio C Hamano 提交于
Doc updates. * sb/pack-protocol-mention-smart-http: Documentation/technical/pack-protocol: mention http as possible protocol
-
由 Junio C Hamano 提交于
Build clean-up. * jk/make-fix-dependencies: Makefile: silence perl/PM.stamp recipe Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS Makefile: drop dependency between git-instaweb and gitweb
-
由 Junio C Hamano 提交于
The setup code used to die when core.bare and core.worktree are set inconsistently, even for commands that do not need working tree. * jk/die-on-bogus-worktree-late: setup_git_directory: delay core.bare/core.worktree errors
-
由 Junio C Hamano 提交于
Doc updates. * sg/merge-summary-config: Documentation: include 'merge.branchdesc' for merge and config as well
-