- 20 8月, 2015 5 次提交
-
-
由 Dave Borowitz 提交于
This field was set in transport_set_option, but never read in the push code. The push code basically ignores the smart_options field entirely, and derives its options from the flags arguments to the push* callbacks. Note that in git_transport_push there are already several args set from flags that have no corresponding field in git_transport_options; after this change, push_cert is just like those. Signed-off-by: NDave Borowitz <dborowitz@google.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Dave Borowitz 提交于
Signed-off-by: NDave Borowitz <dborowitz@google.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Dave Borowitz 提交于
Signed-off-by: NDave Borowitz <dborowitz@google.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Dave Borowitz 提交于
Signed-off-by: NDave Borowitz <dborowitz@google.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Dave Borowitz 提交于
Like --atomic, --signed will fail if the server does not advertise the necessary capability. In addition, it requires gpg on the client side. Signed-off-by: NDave Borowitz <dborowitz@google.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 22 7月, 2015 1 次提交
-
-
由 Junio C Hamano 提交于
When git-send-pack is exec'ed, as is done by git-remote-http, it does not read the config, and configured value of user.signingkey is ignored. Thus it was impossible to specify a signing key over HTTP, other than the default key in the keyring having a User ID matching the "Name <email>" format. This patch at least partially fixes the problem by reading in the GPG config from within send-pack. It does not address the related problem of plumbing a value for this configuration option using `git -c user.signingkey push ...`. Signed-off-by: NDave Borowitz <dborowitz@google.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 16 7月, 2015 12 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Docfix. * mm/describe-doc: Documentation/describe: improve one-line summary
-
由 Junio C Hamano 提交于
Docfix. * jc/prompt-document-ps1-state-separator: git-prompt.sh: document GIT_PS1_STATESEPARATOR
-
由 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 提交于
A compilation workaround. * es/utf8-stupid-compiler-workaround: utf8: NO_ICONV: silence uninitialized variable warning
-
由 Junio C Hamano 提交于
Docfix. * fk/doc-format-patch-vn: doc: format-patch: fix typo
-
由 Junio C Hamano 提交于
* pt/t0302-needs-sanity: t0302: "unreadable" test needs SANITY prereq
-
由 Junio C Hamano 提交于
"git fetch --depth=<depth>" and "git clone --depth=<depth>" issued a shallow transfer request even to an upload-pack that does not support the capability. * me/fetch-into-shallow-safety: fetch-pack: check for shallow if depth given
-
由 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 提交于
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 提交于
Recent Mac OS X updates breaks the logic to detect that the machine is on the AC power in the sample pre-auto-gc script. * pa/auto-gc-mac-osx: hooks/pre-auto-gc: adjust power checking for newer OS X
-
由 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()
-
- 26 6月, 2015 12 次提交
-
-
由 Junio C Hamano 提交于
A hotfix for the topic already in 'master'. * jk/stash-require-clean-index: Revert "stash: require a clean index to apply"
-
由 Junio C Hamano 提交于
* cb/array-size: Fix definition of ARRAY_SIZE for non-gcc builds
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Doc updates. * sg/merge-summary-config: Documentation: include 'merge.branchdesc' for merge and config as well
-
由 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 提交于
Doc updates. * sb/pack-protocol-mention-smart-http: Documentation/technical/pack-protocol: mention http as possible protocol
-
由 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 提交于
There was a dead code that used to handle "git pull --tags" and show special-cased error message, which was made irrelevant when the semantics of the option changed back in Git 1.9 days. * pt/pull-tags-error-diag: pull: remove --tags error in no merge candidates case
-
由 Junio C Hamano 提交于
"color.diff.plain" was a misnomer; give it 'color.diff.context' as a more logical synonym. * jk/color-diff-plain-is-context: diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT diff: accept color.diff.context as a synonym for "plain"
-
由 Junio C Hamano 提交于
The configuration reader/writer uses mmap(2) interface to access the files; when we find a directory, it barfed with "Out of memory?". * jk/diagnose-config-mmap-failure: xmmap(): drop "Out of memory?" config.c: rewrite ENODEV into EISDIR when mmap fails config.c: avoid xmmap error messages config.c: fix mmap leak when writing config read-cache.c: drop PROT_WRITE from mmap of index
-
由 Junio C Hamano 提交于
Recent "git prune" traverses young unreachable objects to safekeep old objects in the reachability chain from them, which sometimes caused error messages that are unnecessarily alarming. * jk/squelch-missing-link-warning-for-unreachable: suppress errors on missing UNINTERESTING links silence broken link warnings with revs->ignore_missing_links add quieter versions of parse_{tree,commit}
-
由 Junio C Hamano 提交于
"git rebase -i" fired post-rewrite hook when it shouldn't (namely, when it was told to stop sequencing with 'exec' insn). * mm/rebase-i-post-rewrite-exec: t5407: use <<- to align the expected output rebase -i: fix post-rewrite hook with failed exec command rebase -i: demonstrate incorrect behavior of post-rewrite
-
- 25 6月, 2015 1 次提交
-
-
由 Charles Bailey 提交于
The improved ARRAY_SIZE macro uses BARF_UNLESS_AN_ARRAY which expands to a valid check for recent gcc versions and to 0 for older gcc versions but is not defined on non-gcc builds. Non-gcc builds need this macro to expand to 0 as well. The current outer test (defined(__GNUC__) && (__GNUC__ >= 3)) is a strictly weaker condition than the inner test (GIT_GNUC_PREREQ(3, 1)) so we can omit the outer test and cause the BARF_UNLESS_AN_ARRAY macro to be defined correctly on non-gcc builds as well as gcc builds with older versions. Signed-off-by: NCharles Bailey <cbailey32@bloomberg.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 18 6月, 2015 1 次提交
-
-
由 Mike Edgar 提交于
When a repository is first fetched as a shallow clone, either by git-clone or by fetching into an empty repo, the server's capabilities are not currently consulted. The client will send shallow requests even if the server does not understand them, and the resulting error may be unhelpful to the user. This change pre-emptively checks so we can exit with a helpful error if necessary. Signed-off-by: NMike Edgar <adgar@google.com> Reviewed-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 17 6月, 2015 8 次提交
-
-
由 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
-