1. Stefan Saasen
  2. git

Commits

Author Commit Message Date Builds
Thomas Rast
send-email: ask about and declare 8bit mails git-send-email passes on an 8bit mail as-is even if it does not declare a content-type. Because the user can edit email between format-patch and send-email, such invalid mails are unfortunately not very hard to come by. Make git-send-email stop and ask about the encoding to use if it encounters any such mail. Also provide a configuration setting to permanently configure an encoding. Signed-off…
Brian Downing
unpack-trees: Make index lookahead less pessimal When traversing trees with an index, the current index pointer (o->cache_bottom) occasionally has to be temporarily advanced forwards to match the traversal order of the tree, which is not the same as the sort order of the index. The existing algorithm that did this (introduced in 730f72840cc50c523fe4cdd796ea2d2fc4571a28) would get "stuck" when the cache_bottom was popped and then repeatedly chec…
Junio C Hamano
Prepare draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'cw/maint-exec-defpath' into maint * cw/maint-exec-defpath: autoconf: Check if <paths.h> exists and set HAVE_PATHS_H exec_cmd.c: replace hard-coded path list with one from <paths.h>
Junio C Hamano
Merge branch 'sc/http-late-auth' into maint * sc/http-late-auth: Prompt for a username when an HTTP request 401s
Junio C Hamano
Merge branch 'by/blame-doc-m-c' into maint * by/blame-doc-m-c: blame-options.txt: Add default value for `-M/-C` options.
Junio C Hamano
Merge branch 'cb/maint-stash-orphaned-file' into maint * cb/maint-stash-orphaned-file: stash tests: stash can lose data in a file removed from the index stash: Don't overwrite files that have gone from the index
Junio C Hamano
Merge branch 'mg/advice-statushints' into maint * mg/advice-statushints: wt-status: take advice.statusHints seriously t7508: test advice.statusHints
Junio C Hamano
Merge branch 'jn/maint-bundle' into maint * jn/maint-bundle: fix "bundle --stdin" segfault t5704 (bundle): add tests for bundle --stdin
Junio C Hamano
Merge branch 'rr/doc-submitting' into maint * rr/doc-submitting: SubmittingPatches: Add new section about what to base work on
Junio C Hamano
Merge branch 'jn/t7006-fixup' into maint * jn/t7006-fixup: t7006: guard cleanup with test_expect_success
Junio C Hamano
Merge branch 'jn/shortlog' into maint * jn/shortlog: pretty: Respect --abbrev option shortlog: Document and test --format option t4201 (shortlog): Test output format with multiple authors t4201 (shortlog): guard setup with test_expect_success Documentation/shortlog: scripted users should not rely on implicit HEAD
Junio C Hamano
Merge branch 'np/index-pack-memsave' into maint * np/index-pack-memsave: index-pack: smarter memory usage when appending objects index-pack: rationalize unpack_entry_data() index-pack: smarter memory usage when resolving deltas
Junio C Hamano
Merge branch 'sp/maint-dumb-http-pack-reidx' into maint * sp/maint-dumb-http-pack-reidx: http.c::new_http_pack_request: do away with the temp variable filename http-fetch: Use temporary files for pack-*.idx until verified http-fetch: Use index-pack rather than verify-pack to check packs Allow parse_pack_index on temporary files Extract verify_pack_index for reuse from verify_pack Introduce close_pack_index to permit replacement http.c: Re…
Junio C Hamano
Merge branch 'jc/am-3-show-corrupted-patch' into maint * jc/am-3-show-corrupted-patch: am -3: recover the diagnostic messages for corrupt patches
Junio C Hamano
Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maint * sp/maint-describe-tiebreak-with-tagger-date: describe: Break annotated tag ties by tagger date tag.c: Parse tagger date (if present) tag.c: Refactor parse_tag_buffer to be saner to program tag.h: Remove unused signature field tag.c: Correct indentation
Junio C Hamano
Merge branch 'np/malloc-threading' into maint * np/malloc-threading: Thread-safe xmalloc and xrealloc needs a recursive mutex Make xmalloc and xrealloc thread-safe
Junio C Hamano
Merge branch 'bg/send-email-smtpdomain' into maint * bg/send-email-smtpdomain: send-email: Cleanup smtp-domain and add config Document send-email --smtp-domain send-email: Don't use FQDNs without a '.' send-email: Cleanup { style
Junio C Hamano
Merge branch 'rc/maint-curl-helper' into maint * rc/maint-curl-helper: remote-curl: ensure that URLs have a trailing slash http: make end_url_with_slash() public t5541-http-push: add test for URLs with trailing slash Conflicts: remote-curl.c
Junio C Hamano
Merge branch 'hg/maint-attr-fix' into maint * hg/maint-attr-fix: attr: Expand macros immediately when encountered. attr: Allow multiple changes to an attribute on the same line. attr: Fixed debug output for macro expansion.
Junio C Hamano
Merge branch 'mh/status-optionally-refresh' into maint * mh/status-optionally-refresh: t7508: add a test for "git status" in a read-only repository git status: refresh the index if possible t7508: add test for "git status" refreshing the index
Junio C Hamano
common_prefix: simplify and fix scanning for prefixes common_prefix() scans backwards from the far end of each 'next' pathspec, starting from 'len', shortening the 'prefix' using 'path' as a reference. However, there is a small opportunity for an out-of-bounds access because len is unconditionally set to prefix-1 after a "direct match" test failed. This means that if 'next' is shorter than prefix+2, we read past it. Instead of a minimal fix, simpl…
Jay Soffian
am: use get_author_ident_from_commit instead of mailinfo when rebasing In certain situations, commit authorship can consist of an invalid e-mail address. For example, this is the case when working with git svn repos where the author email has had the svn repo UUID appended such as: author@example.com <author@example.com@deadbeef-dead-beef-dead-beefdeadbeef> Given such an address, mailinfo extracts the authorship incorrectly as it assumes a valid domain. However, w…
Ævar Arnfjörð Bjarmason
notes: Initialize variable to appease Sun Studio Sun Studio 12 Update 1 thinks that *t could be uninitialized, ostensibly because it doesn't take rewrite_cmd into account in its static analysis. builtin/notes.c: In function `notes_copy_from_stdin': builtin/notes.c:419: warning: 't' might be used uninitialized in this function Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Zhang Le
git-mailinfo documentation: clarify -u/--encoding Instead of talking about hardcoded UTF-8, describe i18n.commitencoding and the --encoding option, and state that they default to UTF-8. Signed-off-by: Zhang Le <r0bertz@gentoo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder
add-interactive: Clarify “remaining hunks in the file” The "a" and "d" commands to ‘add --patch’ (accept/reject rest of file) interact with "j", "g", and "/" (skip some hunks) in a perhaps confusing way: after accepting or rejecting all _later_ hunks in the file, they return to the earlier, skipped hunks and prompt the user about them again. This behavior can be very useful in practice. One can still accept or reject _all_ undecided hunks in a file …
Christian Couder
commit: use value of GIT_REFLOG_ACTION env variable as reflog message The environment variable GIT_REFLOG_ACTION was used by git-commit.sh, but when it was converted to a builtin (f5bbc3225c4b073a7ff3218164a0c820299bc9c6, Port git commit to C, Nov 8 2007) this was lost. Let's use it again as it is more user friendly when reverting or cherry-picking to see "revert" or "cherry-pick" in the reflog rather than to just see "commit". Signed-off-by: Christian Couder <chr…
Tay Ray Chuan
commit::print_summary(): don't use format_commit_message() This attempts to fix a regression in git-commit, where non-abbreviated SHA-1s were printed in the summary. One possible fix would be to set ctx.abbrev to DEFAULT_ABBREV in the `if` block, where format_commit_message() is used. Instead, we do away with the format_commit_message() codeblock altogether, replacing it with a re-run of log_tree_commit(). We re-run log_tree_commit() with rev.always_sh…
Thomas Rast
check_aliased_update: strcpy() instead of strcat() to copy da3efdb (receive-pack: detect aliased updates which can occur with symrefs, 2010-04-19) introduced two strcat() into uninitialized strings. The intent was clearly make a copy of the static buffer used by find_unique_abbrev(), so use strcpy() instead. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Tested-by: Ævar Arnfjörð Bjarmason <avar…
Thomas Rast
t/README: document --root option We've had this option since f423ef5 (tests: allow user to specify trash directory location, 2009-08-09). Make it easier to look up :-) Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next