- 14 9月, 2017 3 次提交
-
-
由 Stefan Beller 提交于
Pass DO_FOR_EACH_INCLUDE_BROKEN when iterating over replacement refs so that the iteration does not require opening the named objects from the object store. This avoids a dependency cycle between object access and replace ref iteration. Moreover the ref subsystem has not been migrated yet to access the object store via passed in repository objects. As a result, without this patch, iterating over replace refs in a repository other than the_repository it produces errors: error: refs/replace/3afabef75c627b894cccc3bcae86837abc7c32fe does not point to a valid object! Noticed while adapting the object store (and in particular its evaluation of replace refs) to handle arbitrary repositories. Signed-off-by: NStefan Beller <sbeller@google.com> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Stefan Beller 提交于
The check_has_commit helper uses resolves a submodule entry to a commit, when validating its existence. As a side effect this means tolerates a submodule entry pointing to a tag, which is not a valid submodule entry that git commands would know how to cope with. Tighten the check to require an actual commit, not a tag pointing to a commit. Also improve the error handling when a submodule entry points to non-commit (e.g., a blob) to error out instead of warning and pretending the pointed to object doesn't exist. Signed-off-by: NStefan Beller <sbeller@google.com> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jonathan Nieder 提交于
The MRU cache that keeps track of recently used packs is represented using two global variables: struct mru packed_git_mru_storage; struct mru *packed_git_mru = &packed_git_mru_storage; Callers never assign to the packed_git_mru pointer, though, so we can simplify by eliminating it and using &packed_git_mru_storage (renamed to &packed_git_mru) directly. This variable is only used by the packfile subsystem, making this a relatively uninvasive change (and any new unadapted callers would trigger a compile error). Noticed while moving these globals to the object_store struct. Signed-off-by: NStefan Beller <sbeller@google.com> Signed-off-by: NJonathan Nieder <jrnieder@gmail.com> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 10 9月, 2017 37 次提交
-
-
由 Junio C Hamano 提交于
* maint: RelNotes: further fixes for 2.14.2 from the master front
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Code simplification. * rs/apply-epoch: apply: remove epoch date from regex apply: check date of potential epoch timestamps first
-
由 Junio C Hamano 提交于
Code clean-up. * jk/drop-sha1-entry-pos: sha1-lookup: remove sha1_entry_pos() from header file
-
由 Junio C Hamano 提交于
"git branch -M a b" while on a branch that is completely unrelated to either branch a or branch b misbehaved when multiple worktree was in use. This has been fixed. * nd/worktree-kill-parse-ref: branch: fix branch renaming not updating HEADs correctly
-
由 Junio C Hamano 提交于
In addition to "cc: <a@dd.re.ss> # cruft", "cc: a@dd.re.ss # cruft" was taught to "git send-email" as a valid way to tell it that it needs to also send a carbon copy to <a@dd.re.ss> in the trailer section. * mm/send-email-cc-cruft: send-email: don't use Mail::Address, even if available send-email: fix garbage removal after address
-
由 Junio C Hamano 提交于
The codepath to call external process filter for smudge/clean operation learned to show the progress meter. * ls/convert-filter-progress: convert: display progress for filtered objects that have been delayed
-
由 Junio C Hamano 提交于
Message and doc updates. * ma/up-to-date: treewide: correct several "up-to-date" to "up to date" Documentation/user-manual: update outdated example output
-
由 Junio C Hamano 提交于
Assorted bugfixes and clean-ups. * ma/ts-cleanups: ThreadSanitizer: add suppressions strbuf_setlen: don't write to strbuf_slopbuf pack-objects: take lock before accessing `remaining` convert: always initialize attr_action in convert_attrs
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Doc updates. * jt/doc-pack-objects-fix: Doc: clarify that pack-objects makes packs, plural
-
由 Junio C Hamano 提交于
Code clean-up. * jn/vcs-svn-cleanup: vcs-svn: move remaining repo_tree functions to fast_export.h vcs-svn: remove repo_delete wrapper function vcs-svn: remove custom mode constants vcs-svn: remove more unused prototypes and declarations
-
由 Junio C Hamano 提交于
Code clean-up. * bc/vcs-svn-cleanup: vcs-svn: rename repo functions to "svn_repo" vcs-svn: remove unused prototypes
-
由 Junio C Hamano 提交于
Doc clean-up. * jk/doc-the-this: doc: fix typo in sendemail.identity
-
由 Junio C Hamano 提交于
Code clean-up. * rs/commit-h-single-parent-cleanup: commit: remove unused inline function single_parent()
-
由 Junio C Hamano 提交于
Doc fix. * mg/format-ref-doc-fix: Documentation/git-for-each-ref: clarify peeling of tags for --format Documentation: use proper wording for ref format strings
-
由 Junio C Hamano 提交于
Code clean-up. * sb/submodule-parallel-update: submodule.sh: remove unused variable
-
由 Junio C Hamano 提交于
Test fix. * hv/t5526-andand-chain-fix: t5526: fix some broken && chains
-
由 Junio C Hamano 提交于
Code clean-up. * sb/sha1-file-cleanup: sha1_file: make read_info_alternates static
-
由 Junio C Hamano 提交于
Test simplification. * rs/t1002-do-not-use-sum: t1002: stop using sum(1)
-
由 Junio C Hamano 提交于
Doc update. * ah/doc-empty-string-is-false: doc: clarify "config --bool" behaviour with empty string
-
由 Junio C Hamano 提交于
Code clean-up. * rs/merge-microcleanup: merge: use skip_prefix()
-
由 Junio C Hamano 提交于
Code clean-up. * rs/find-pack-entry-bisection: sha1_file: avoid comparison if no packed hash matches the first byte
-
由 Junio C Hamano 提交于
Code clean-up. * rs/apply-lose-prefix-length: apply: remove prefix_length member from apply_state
-
由 Junio C Hamano 提交于
Message fix. * rj/add-chmod-error-message: builtin/add: add detail to a 'cannot chmod' error message
-
由 Junio C Hamano 提交于
Code clean-up. * jk/hashcmp-memcmp: hashcmp: use memcmp instead of open-coded loop
-
由 Junio C Hamano 提交于
A test fix. * rs/t3700-clean-leftover: t3700: fix broken test under !POSIXPERM
-
由 Junio C Hamano 提交于
A comment fix. * jc/perl-git-comment-typofix: perl/Git.pm: typofix in a comment
-
由 Junio C Hamano 提交于
Code clean-up. * mf/no-dashed-subcommands: scripts: use "git foo" not "git-foo"
-
由 Junio C Hamano 提交于
A test fix. * ab/ref-filter-no-contains: tests: don't give unportable ">" to "test" built-in, use -gt
-
由 Junio C Hamano 提交于
"git archive" did not work well with pathspecs and the export-ignore attribute. We may want to resurrect the "we don't archive an empty directory" bonus patch, but I do not mind merging the above early to 'next' and leave it as a separate follow-up enhancement. cf. <20170820090629.tumvqwzkromcykjf@sigill.intra.peff.net> * rs/archive-excluded-directory: archive: don't queue excluded directories archive: factor out helper functions for handling attributes t5001: add tests for export-ignore attributes and exclude pathspecs
-
由 Junio C Hamano 提交于
Killing "git merge --edit" before the editor returns control left the repository in a state with MERGE_MSG but without MERGE_HEAD, which incorrectly tells the subsequent "git commit" that there was a squash merge in progress. This has been fixed. * mg/killed-merge: merge: save merge state earlier merge: split write_merge_state in two merge: clarify call chain Documentation/git-merge: explain --continue
-
由 Junio C Hamano 提交于
"git apply" that is used as a better "patch -p1" failed to apply a taken from a file with CRLF line endings to a file with CRLF line endings. The root cause was because it misused convert_to_git() that tried to do "safe-crlf" processing by looking at the index entry at the same path, which is a nonsense---in that mode, "apply" is not working on the data in (or derived from) the index at all. This has been fixed. * tb/apply-with-crlf: apply: file commited with CRLF should roundtrip diff and apply convert: add SAFE_CRLF_KEEP_CRLF
-
由 Junio C Hamano 提交于
When handshake with a subprocess filter notices that the process asked for an unknown capability, Git did not report what program the offending subprocess was running. This has been corrected. We may want a follow-up fix to tighten the error checking, though. * cc/subprocess-handshake-missing-capabilities: sub-process: print the cmd when a capability is unsupported
-
由 Junio C Hamano 提交于
"git grep -L" and "git grep --quiet -L" reported different exit codes; this has been corrected. * as/grep-quiet-no-match-exit-code-fix: git-grep: correct exit code with --quiet and -L
-
由 Junio C Hamano 提交于
bash 4.4 or newer gave a warning on NUL byte in command substitution done in "git stash"; this has been squelched. * kd/stash-with-bash-4.4: stash: prevent warning about null bytes in input
-
由 Junio C Hamano 提交于
Memory leak in an error codepath has been plugged. * rs/win32-syslog-leakfix: win32: plug memory leak on realloc() failure in syslog()
-