- 08 2月, 2012 1 次提交
-
-
由 Jeff King 提交于
When the userdiff_config function was introduced in be58e70d (diff: unify external diff and funcname parsing code, 2008-10-05), it used a return value convention unlike any other config callback. Like other callbacks, it used "-1" to signal error. But it returned "1" to indicate that it found something, and "0" otherwise; other callbacks simply returned "0" to indicate that no error occurred. This distinction was necessary at the time, because the userdiff namespace overlapped slightly with the color configuration namespace. So "diff.color.foo" could mean "the 'foo' slot of diff coloring" or "the 'foo' component of the "color" userdiff driver". Because the color-parsing code would die on an unknown color slot, we needed the userdiff code to indicate that it had matched the variable, letting us bypass the color-parsing code entirely. Later, in 8b8e8624 (ignore unknown color configuration, 2009-12-12), the color-parsing code learned to silently ignore unknown slots. This means we no longer need to protect userdiff-matched variables from reaching the color-parsing code. We can therefore change the userdiff_config calling convention to a more normal one. This drops some code from each caller, which is nice. But more importantly, it reduces the cognitive load for readers who may wonder why userdiff_config is unlike every other config callback. There's no need to add a new test confirming that this works; t4020 already contains a test that sets diff.color.external. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 06 2月, 2012 12 次提交
-
-
由 Junio C Hamano 提交于
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Adrian Weimann 提交于
Signed-off-by: NAdrian Weimann <adrian.weimann@googlemail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* sp/smart-http-failure-to-push: remote-curl: Fix push status report when all branches fail
-
由 Junio C Hamano 提交于
* jc/maint-log-first-parent-pathspec: Making pathspec limited log play nicer with --first-parent
-
由 Junio C Hamano 提交于
* cb/push-quiet: t5541: avoid TAP test miscounting fix push --quiet: add 'quiet' capability to receive-pack server_supports(): parse feature list more carefully
-
由 Junio C Hamano 提交于
* cb/maint-kill-subprocess-upon-signal: dashed externals: kill children on exit run-command: optionally kill children on exit
-
由 Junio C Hamano 提交于
* maint-1.7.8: Git 1.7.6.6 imap-send: remove dead code
-
由 Junio C Hamano 提交于
* maint-1.7.7: Git 1.7.6.6 imap-send: remove dead code
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jeff King 提交于
The imap-send code was adapted from another project, and still contains many unused bits of code. One of these bits contains a type "struct string_list" which bears no resemblence to the "struct string_list" we use elsewhere in git. This causes the compiler to complain if git's string_list ever becomes part of cache.h. Let's just drop the dead code. Signed-off-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 02 2月, 2012 1 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 01 2月, 2012 13 次提交
-
-
由 Junio C Hamano 提交于
* tr/merge-edit-guidance: merge: add instructions to the commit message when editing
-
由 Junio C Hamano 提交于
* jc/pull-signed-tag: merge: use editor by default in interactive sessions Conflicts: Documentation/merge-options.txt
-
由 Junio C Hamano 提交于
* ar/i18n-no-gettext: i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n add a Makefile switch to avoid gettext translation in shell scripts git-sh-i18n: restructure the logic to compute gettext.sh scheme
-
由 Junio C Hamano 提交于
* nd/clone-detached: clone: fix up delay cloning conditions push: do not let configured foreign-vcs permanently clobbered clone: print advice on checking out detached HEAD clone: allow --branch to take a tag clone: refuse to clone if --branch points to bogus ref clone: --branch=<branch> always means refs/heads/<branch> clone: delay cloning until after remote HEAD checking clone: factor out remote ref writing clone: factor out HEAD update code clone: factor out checkout code clone: write detached HEAD in bare repositories t5601: add missing && cascade
-
由 Junio C Hamano 提交于
* da/maint-mergetool-twoway: mergetool: Provide an empty file when needed
-
由 Junio C Hamano 提交于
* va/git-p4-branch: t9801: do not overuse test_must_fail git-p4: Change p4 command invocation git-p4: Add test case for complex branch import git-p4: Search for parent commit on branch creation
-
由 Junio C Hamano 提交于
* jl/submodule-re-add: submodule add: fix breakage when re-adding a deep submodule
-
由 Junio C Hamano 提交于
* tr/grep-l-with-decoration: grep: fix -l/-L interaction with decoration lines
-
由 Junio C Hamano 提交于
* ks/sort-wildcard-in-makefile: t/Makefile: Use $(sort ...) explicitly where needed
-
由 Junio C Hamano 提交于
* ld/git-p4-branches-and-labels: git-p4: label import fails with multiple labels at the same changelist git-p4: add test for p4 labels git-p4: importing labels should cope with missing owner git-p4: cope with labels with empty descriptions git-p4: handle p4 branches and labels containing shell chars
-
由 Junio C Hamano 提交于
* rr/sequencer: sequencer: factor code out of revert builtin revert: prepare to move replay_action to header Conflicts: builtin/revert.c
-
由 Junio C Hamano 提交于
* jc/advise-i18n: i18n of multi-line advice messages
-
由 Thomas Rast 提交于
Before f8246281 (merge: use editor by default in interactive sessions, 2012-01-10), git-merge only started an editor if the user explicitly asked for it with --edit. Thus it seemed unlikely that the user would need extra guidance. After f8246281 the _normal_ thing is to start an editor. Give at least an indication of why we are doing it. The sentence about justification is one of the few things about standard git that are not agnostic to the workflow that the user chose. However, f8246281 was proposed by Linus specifically to discourage users from merging unrelated upstream progress into topic branches. So we may as well take another step in the same direction. Signed-off-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 31 1月, 2012 1 次提交
-
-
由 Adrian Weimann 提交于
Signed-off-by: NAdrian Weimann <adrian.weimann@googlemail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 30 1月, 2012 12 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* nd/index-pack-no-recurse: index-pack: eliminate unlimited recursion in get_base_data() index-pack: eliminate recursion in find_unresolved_deltas Eliminate recursion in setting/clearing marks in commit list
-
由 Junio C Hamano 提交于
* rs/diff-postimage-in-context: xdiff: print post-image for common records instead of pre-image
-
由 Junio C Hamano 提交于
* jk/parse-object-cached: upload-pack: avoid parsing tag destinations upload-pack: avoid parsing objects during ref advertisement parse_object: try internal cache before reading object db
-
由 Junio C Hamano 提交于
* sp/smart-http-failure-to-push: remote-curl: Fix push status report when all branches fail
-
由 Junio C Hamano 提交于
* jc/maint-log-first-parent-pathspec: Making pathspec limited log play nicer with --first-parent
-
由 Junio C Hamano 提交于
* mh/ref-clone-without-extra-refs: write_remote_refs(): create packed (rather than extra) refs add_packed_ref(): new function in the refs API. ref_array: keep track of whether references are sorted pack_refs(): remove redundant check
-
由 Junio C Hamano 提交于
* jl/test-pause: test-lib: add the test_pause convenience function
-
由 Junio C Hamano 提交于
* tr/maint-mailinfo: mailinfo: with -b, keep space after [foo] am: learn passing -b to mailinfo Conflicts: git-am.sh
-
由 Junio C Hamano 提交于
* pw/p4-view-updates: git-p4: add tests demonstrating spec overlay ambiguities git-p4: adjust test to adhere to stricter useClientSpec git-p4: clarify comment git-p4: fix verbose comment typo git-p4: only a single ... wildcard is supported
-
由 Junio C Hamano 提交于
* nd/maint-refname-in-hierarchy-check: Fix incorrect ref namespace check
-
由 Junio C Hamano 提交于
* jn/gitweb-unspecified-action: gitweb: Fix actionless dispatch for non-existent objects
-