| addfb21 | Junio C Hamano | 12 January 2015, 22:12:42 UTC | Git 2.3.0-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2015, 22:12:42 UTC |
| def6dd9 | Junio C Hamano | 12 January 2015, 22:08:42 UTC | Sync with 2.2.2 | 12 January 2015, 22:08:42 UTC |
| fdf96a2 | Junio C Hamano | 12 January 2015, 22:06:12 UTC | Git 2.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2015, 22:06:12 UTC |
| 9f16184 | Junio C Hamano | 12 January 2015, 22:02:54 UTC | Merge branch 'jk/read-packed-refs-without-path-max' into maint * jk/read-packed-refs-without-path-max: read_packed_refs: use skip_prefix instead of static array read_packed_refs: pass strbuf to parse_ref_line read_packed_refs: use a strbuf for reading lines | 12 January 2015, 22:02:54 UTC |
| d0879b3 | Junio C Hamano | 12 January 2015, 22:02:19 UTC | Merge branch 'mg/add-ignore-errors' into maint * mg/add-ignore-errors: add: ignore only ignored files | 12 January 2015, 22:02:19 UTC |
| efc028b | Junio C Hamano | 12 January 2015, 22:02:05 UTC | Merge branch 'mh/find-uniq-abbrev' into maint * mh/find-uniq-abbrev: sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev | 12 January 2015, 22:02:05 UTC |
| 9ea21fa | Junio C Hamano | 12 January 2015, 22:01:18 UTC | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint * jk/approxidate-avoid-y-d-m-over-future-dates: approxidate: allow ISO-like dates far in the future pass TIME_DATE_NOW to approxidate future-check | 12 January 2015, 22:01:18 UTC |
| ba1edc9 | Junio C Hamano | 12 January 2015, 22:00:16 UTC | Merge branch 'rw/apply-does-not-take-ignore-date' into maint * rw/apply-does-not-take-ignore-date: git-am.txt: --ignore-date flag is not passed to git-apply | 12 January 2015, 22:00:16 UTC |
| 417a5b2 | Junio C Hamano | 12 January 2015, 20:19:17 UTC | Merge branch 'jk/for-each-reflog-ent-reverse' into maint * jk/for-each-reflog-ent-reverse: for_each_reflog_ent_reverse: turn leftover check into assertion for_each_reflog_ent_reverse: fix newlines on block boundaries | 12 January 2015, 20:19:17 UTC |
| 832258d | Junio C Hamano | 12 January 2015, 19:38:56 UTC | Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository' Earlier we made "rev-list --object-edge" more aggressively list the objects at the edge commits, in order to reduce number of objects fetched into a shallow repository, but the change affected cases other than "fetching into a shallow repository" and made it unusably slow (e.g. fetching into a normal repository should not have to suffer the overhead from extra processing). Limit it to a more specific case by introducing --objects-edge-aggressive, a new option to rev-list. * bc/fetch-thin-less-aggressive-in-normal-repository: pack-objects: use --objects-edge-aggressive for shallow repos rev-list: add an option to mark fewer edges as uninteresting Documentation: add missing article in rev-list-options.txt | 12 January 2015, 19:38:57 UTC |
| e20d5a2 | Junio C Hamano | 12 January 2015, 19:38:54 UTC | Merge branch 'sb/doc-submitting-patches-keep-notes' * sb/doc-submitting-patches-keep-notes: SubmittingPatches: explain rationale for using --notes with format-patch | 12 January 2015, 19:38:55 UTC |
| 7a353ec | Junio C Hamano | 12 January 2015, 19:38:51 UTC | Merge branch 'rs/simplify-transport-get' * rs/simplify-transport-get: transport: simplify duplicating a substring in transport_get() using xmemdupz() | 12 January 2015, 19:38:53 UTC |
| acddf49 | Junio C Hamano | 12 January 2015, 19:38:39 UTC | Merge branch 'rs/simplify-parsing-commit-tree-S' * rs/simplify-parsing-commit-tree-S: commit-tree: simplify parsing of option -S using skip_prefix() | 12 January 2015, 19:38:48 UTC |
| d61e790 | Junio C Hamano | 12 January 2015, 19:38:32 UTC | Merge branch 'rs/plug-strbuf-leak-in-merge' * rs/plug-strbuf-leak-in-merge: merge: release strbuf after use in suggest_conflicts() | 12 January 2015, 19:38:37 UTC |
| 97488ab | Junio C Hamano | 12 January 2015, 19:38:30 UTC | Merge branch 'rs/plug-strbuf-leak-in-lock-ref' * rs/plug-strbuf-leak-in-lock-ref: refs: plug strbuf leak in lock_ref_sha1_basic() | 12 January 2015, 19:38:31 UTC |
| c00e1c5 | Junio C Hamano | 12 January 2015, 19:38:23 UTC | Merge branch 'es/checkout-index-temp' "git checkout-index --temp=$target $path" did not work correctly for paths outside the current subdirectory in the project. * es/checkout-index-temp: checkout-index: fix --temp relative path mangling t2004: demonstrate broken relative path printing t2004: standardize file naming in symlink test t2004: drop unnecessary write-tree/read-tree t2004: modernize style | 12 January 2015, 19:38:28 UTC |
| 42618bc | Junio C Hamano | 12 January 2015, 19:38:14 UTC | Merge branch 'cc/bisect-rev-parsing' The logic in "git bisect bad HEAD" etc. to avoid forcing the test of the common ancestor of bad and good commits was broken. * cc/bisect-rev-parsing: bisect: add test to check that revs are properly parsed bisect: parse revs before passing them to check_expected_revs() | 12 January 2015, 19:38:19 UTC |
| 1e6f5b2 | Junio C Hamano | 07 January 2015, 21:12:54 UTC | Fourth batch for 2.3 cycle Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2015, 21:28:37 UTC |
| ee6e4c7 | Junio C Hamano | 07 January 2015, 21:28:29 UTC | Merge branch 'maint' * maint: is_hfs_dotgit: loosen over-eager match of \u{..47} | 07 January 2015, 21:28:29 UTC |
| 7ba4626 | Junio C Hamano | 07 January 2015, 21:28:10 UTC | Merge branch 'maint-2.1' into maint * maint-2.1: is_hfs_dotgit: loosen over-eager match of \u{..47} | 07 January 2015, 21:28:10 UTC |
| 3c84ac8 | Junio C Hamano | 07 January 2015, 21:27:56 UTC | Merge branch 'maint-2.0' into maint-2.1 * maint-2.0: is_hfs_dotgit: loosen over-eager match of \u{..47} | 07 January 2015, 21:27:56 UTC |
| 282616c | Junio C Hamano | 07 January 2015, 21:27:19 UTC | Merge branch 'maint-1.9' into maint-2.0 * maint-1.9: is_hfs_dotgit: loosen over-eager match of \u{..47} | 07 January 2015, 21:27:19 UTC |
| 64a03e9 | Junio C Hamano | 07 January 2015, 21:27:13 UTC | Merge branch 'maint-1.8.5' into maint-1.9 * maint-1.8.5: is_hfs_dotgit: loosen over-eager match of \u{..47} | 07 January 2015, 21:27:13 UTC |
| 3d8a54e | Junio C Hamano | 07 January 2015, 21:26:35 UTC | Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5 * jk/dotgit-case-maint-1.8.5: is_hfs_dotgit: loosen over-eager match of \u{..47} | 07 January 2015, 21:26:35 UTC |
| 40d2f38 | Junio C Hamano | 07 January 2015, 21:10:44 UTC | Merge branch 'bw/maint-0090-awk-tweak' * bw/maint-0090-awk-tweak: t0090: tweak awk statement for Solaris /usr/xpg4/bin/awk | 07 January 2015, 21:10:44 UTC |
| 06a8bbb | Junio C Hamano | 07 January 2015, 21:10:40 UTC | Merge branch 'jh/pre-push-sample-no-custom-ifs' The sample pre-push hook used customized IFS=' ' for no good reason. * jh/pre-push-sample-no-custom-ifs: pre-push.sample: remove unnecessary and misleading IFS=' ' | 07 January 2015, 21:10:40 UTC |
| 487b17d | Junio C Hamano | 07 January 2015, 21:09:35 UTC | Merge branch 'tf/prompt-preserve-exit-status' Using the exit status of the last command in the prompt, e.g. PS1='$(__git_ps1) $? ', did not work well because the helper function stomped on the exit status. * tf/prompt-preserve-exit-status: git-prompt: preserve value of $? inside shell prompt | 07 January 2015, 21:09:35 UTC |
| 7938918 | Junio C Hamano | 07 January 2015, 21:09:32 UTC | Merge branch 'sb/dco-indentation-fix' * sb/dco-indentation-fix: Documentation/SubmittingPatches: unify whitespace/tabs for the DCO | 07 January 2015, 21:09:32 UTC |
| c0cf686 | Junio C Hamano | 07 January 2015, 21:09:04 UTC | Merge branch 'bb/update-unicode-table' Simplify the procedure to generate unicode table. * bb/update-unicode-table: update_unicode.sh: delete the command group update_unicode.sh: make the output structure visible update_unicode.sh: shorten uniset invocation path update_unicode.sh: set UNICODE_DIR only once update_unicode.sh: simplify output capture | 07 January 2015, 21:09:04 UTC |
| 74a101e | Junio C Hamano | 07 January 2015, 21:08:30 UTC | Merge branch 'es/squelch-openssl-warnings-on-macosx' Squelch useless compiler warnings on Mac OS X. * es/squelch-openssl-warnings-on-macosx: git-compat-util: suppress unavoidable Apple-specific deprecation warnings | 07 January 2015, 21:08:30 UTC |
| 3d2c1bf | Junio C Hamano | 07 January 2015, 21:08:26 UTC | Merge branch 'sb/t5400-remove-unused' * sb/t5400-remove-unused: t5400: remove dead code | 07 January 2015, 21:08:27 UTC |
| 5095fa6 | Junio C Hamano | 07 January 2015, 21:07:27 UTC | Merge branch 'lh/send-email-hide-x-mailer' "git send-email" normally identifies itself via X-Mailer: header in the message it sends out. A new command line flag allows the user to squelch the header. * lh/send-email-hide-x-mailer: test/send-email: --[no-]xmailer tests send-email: add --[no-]xmailer option | 07 January 2015, 21:07:27 UTC |
| 948e814 | Junio C Hamano | 07 January 2015, 21:06:47 UTC | Merge branch 'rd/send-email-2047-fix' "git send-email" did not handle RFC 2047 encoded headers quite right. * rd/send-email-2047-fix: send-email: handle adjacent RFC 2047-encoded words properly send-email: align RFC 2047 decoding more closely with the spec | 07 January 2015, 21:06:47 UTC |
| e82f629 | Junio C Hamano | 07 January 2015, 21:06:36 UTC | Merge branch 'pd/completion-filenames-fix' The top-of-the-file instruction for completion scripts (in contrib/) did not name the files correctly. * pd/completion-filenames-fix: Update documentation occurrences of filename .sh | 07 January 2015, 21:06:37 UTC |
| abac75c | Junio C Hamano | 07 January 2015, 21:05:58 UTC | Merge branch 'jk/add-i-read-error' "git add -i" did not notice when the interactive command input stream went away and kept asking. * jk/add-i-read-error: add--interactive: leave main loop on read error | 07 January 2015, 21:05:58 UTC |
| 04950c7 | Junio C Hamano | 07 January 2015, 21:01:16 UTC | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' Traditionally we tried to avoid interpreting date strings given by the user as future dates, e.g. GIT_COMMITTER_DATE=2014-12-10 when used early November 2014 was taken as "October 12, 2014" because it is likely that a date in the future, December 10, is a mistake. Loosen this and do not tiebreak by future-ness of the date when (1) ISO-like format is used, and (2) the string can make sense interpreted as both y-m-d and y-d-m. * jk/approxidate-avoid-y-d-m-over-future-dates: approxidate: allow ISO-like dates far in the future pass TIME_DATE_NOW to approxidate future-check | 07 January 2015, 21:01:16 UTC |
| c5cb52f | Junio C Hamano | 07 January 2015, 20:58:05 UTC | Merge branch 'br/imap-send-via-libcurl' Newer libCurl knows how to talk IMAP; "git imap-send" has been updated to use this instead of a hand-rolled OpenSSL calls. * br/imap-send-via-libcurl: git-imap-send: use libcurl for implementation | 07 January 2015, 20:58:05 UTC |
| 08db3b6 | Junio C Hamano | 07 January 2015, 20:57:03 UTC | Merge branch 'br/imap-send-verbosity' * br/imap-send-verbosity: imap-send: use parse options API to determine verbosity | 07 January 2015, 20:57:03 UTC |
| bb86a40 | Junio C Hamano | 07 January 2015, 20:56:01 UTC | Merge branch 'nd/lockfile-absolute' The lockfile API can get confused which file to clean up when the process moved the $cwd after creating a lockfile. * nd/lockfile-absolute: lockfile.c: store absolute path | 07 January 2015, 20:56:01 UTC |
| 0985015 | Junio C Hamano | 07 January 2015, 20:55:05 UTC | Merge branch 'jc/merge-bases' The get_merge_bases*() API was easy to misuse by careless copy&paste coders, leaving object flags tainted in the commits that needed to be traversed. * jc/merge-bases: get_merge_bases(): always clean-up object flags bisect: clean flags after checking merge bases | 07 January 2015, 20:55:05 UTC |
| 58e0362 | Junio C Hamano | 07 January 2015, 20:49:19 UTC | Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence' The commented output used to blindly add a SP before the payload line, resulting in "# \t<indented text>\n" when the payload began with a HT. Instead, produce "#\t<indented text>\n". * jc/strbuf-add-lines-avoid-sp-ht-sequence: strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines | 07 January 2015, 20:49:19 UTC |
| f41157e | Junio C Hamano | 07 January 2015, 20:44:41 UTC | Merge branch 'jc/diff-b-m' Fix long-standing bug in "diff -B -M" output. * jc/diff-b-m: diff -B -M: fix output for "copy and then rewrite" case | 07 January 2015, 20:44:42 UTC |
| d35c802 | Junio C Hamano | 07 January 2015, 20:42:13 UTC | Merge branch 'jc/clone-borrow' Allow "git clone --reference" to be used more safely. * jc/clone-borrow: clone: --dissociate option to mark that reference is only temporary | 07 January 2015, 20:42:13 UTC |
| da178ac | Junio C Hamano | 07 January 2015, 20:40:59 UTC | Merge branch 'jc/checkout-local-track-report' The report from "git checkout" on a branch that builds on another local branch by setting its branch.*.merge to branch name (not a full refname) incorrectly said that the upstream is gone. * jc/checkout-local-track-report: checkout: report upstream correctly even with loosely defined branch.*.merge | 07 January 2015, 20:41:00 UTC |
| 8601099 | Eric Sunshine | 30 December 2014, 23:30:30 UTC | SubmittingPatches: explain rationale for using --notes with format-patch While here, also change grammatically poor "three dash lines" to "three-dash line". Suggested-by: Stefan Beller <sbeller@google.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2015, 18:21:17 UTC |
| 33adc83 | René Scharfe | 24 December 2014, 00:18:45 UTC | refs: plug strbuf leak in lock_ref_sha1_basic() Don't just reset, but release the resource held by the local variable that is about to go out of scope. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 21:14:16 UTC |
| 6aaf956 | Jeff King | 23 December 2014, 08:45:36 UTC | is_hfs_dotgit: loosen over-eager match of \u{..47} Our is_hfs_dotgit function relies on the hackily-implemented next_hfs_char to give us the next character that an HFS+ filename comparison would look at. It's hacky because it doesn't implement the full case-folding table of HFS+; it gives us just enough to see if the path matches ".git". At the end of next_hfs_char, we use tolower() to convert our 32-bit code point to lowercase. Our tolower() implementation only takes an 8-bit char, though; it throws away the upper 24 bits. This means we can't have any false negatives for is_hfs_dotgit. We only care about matching 7-bit ASCII characters in ".git", and we will correctly process 'G' or 'g'. However, we _can_ have false positives. Because we throw away the upper bits, code point \u{0147} (for example) will look like 'G' and get downcased to 'g'. It's not known whether a sequence of code points whose truncation ends up as ".git" is meaningful in any language, but it does not hurt to be more accurate here. We can just pass out the full 32-bit code point, and compare it manually to the upper and lowercase characters we care about. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 20:06:27 UTC |
| 07913d5 | Christian Couder | 25 December 2014, 18:25:33 UTC | bisect: add test to check that revs are properly parsed Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 19:34:05 UTC |
| 6bc02d5 | Christian Couder | 25 December 2014, 18:25:32 UTC | bisect: parse revs before passing them to check_expected_revs() When running for example "git bisect bad HEAD" or "git bisect good master", the parameter passed to "git bisect (bad|good)" has to be parsed into a commit hash before checking if it is the expected commit or not. We could do that in is_expected_rev() or in check_expected_revs(), but it is already done in bisect_state(). Let's just store the hash values that result from this parsing, and then reuse them after all the parsing is done. This way we can also use a for loop over these values to call bisect_write() on them, instead of using eval. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 19:19:55 UTC |
| 74c4de5 | Eric Sunshine | 24 December 2014, 09:43:16 UTC | checkout-index: fix --temp relative path mangling checkout-index --temp only properly prints relative paths which are descendants of the current directory. Paths in ancestor or sibling directories (or their children) are often printed in mangled form. For example: mkdir a bbb && >file && >bbb/file && git update-index --add file bbb/file && cd a && git checkout-index --temp ../file ../bbb/file prints: .merge_file_ooblek le .merge_file_igloo0 b/file rather than the correct: .merge_file_ooblek ../file .merge_file_igloo0 ../bbb/file Internally, given the above example, checkout-index prefixes each input argument with the name of the current directory ("a/", in this case), and then assumes that it can simply skip forward by strlen("a/") bytes to recover the original name. This works for files in the current directory or its descendants, but fails for files in ancestors or siblings (or their children) due to path normalization. For instance, given "../file", "a/" is prepended, giving "a/../file". Path normalization folds out "a/../", resulting in "file". Attempting to recover the original name by skipping strlen("a/") bytes gives the incorrect "le" rather than the desired "../file". Fix this by taking advantage of write_name_quoted_relative() to recover the original name properly, rather than assuming that it can be recovered by skipping strlen(prefix) bytes. As a bonus, this also fixes a bug in which checkout-index --temp accessed and printed memory beyond the end-of-string. For instance, within a subdirectory named "subdirectory", and given argument "../file", prefixing would give "subdirectory/../file", which would become "file" after normalization. checkout-index would then attempt to recover the original name by skipping strlen("subdirectory/") bytes of "file", which placed it well beyond end-of-string. Despite this error, it often appeared to give the correct result, but only due to an accident of implementation which left an apparently correct copy of the path in memory following the normalized value. In particular, handed "subdirectory/../file", in-place processing by normalize_path_copy_len() resulted in "file\0rectory/../file". When checkout-index skipped strlen("subdirectory/") bytes, it ended up back at "../file" and thus appeared to give the correct answer, despite being past end-of-string. Reported-by: Russ Cox <rsc@golang.org> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 18:58:45 UTC |
| 052b255 | Eric Sunshine | 24 December 2014, 09:43:15 UTC | t2004: demonstrate broken relative path printing checkout-index --temp only properly prints relative paths which are descendants of the current directory. Paths in ancestor or sibling directories (or their children) are often printed in mangled form. For example: mkdir a bbb && >file && >bbb/file && git update-index --add file bbb/file && cd a && git checkout-index --temp ../file ../bbb/file prints: .merge_file_ooblek le .merge_file_igloo0 b/file rather than the correct: .merge_file_ooblek ../file .merge_file_igloo0 ../bbb/file Unfortunately, testing is complicated slightly by relative paths sometimes _appearing_ to be printed correctly, but this is an accident of implementation in which a "correct" copy of the string exists in memory beyond the end of the real string, and that "correct" copy gets printed. This test takes care to avoid the accidentally "correct" behavior by testing with a filename longer than the directory name in which checkout-index is invoked. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 18:56:14 UTC |
| 66e28e9 | Eric Sunshine | 24 December 2014, 09:43:14 UTC | t2004: standardize file naming in symlink test Update "symlink" test to use the common file naming scheme so that its temporary files can be cleaned up by the "rm -f path*" idiom employed by other tests in this script. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 18:54:42 UTC |
| 0bbc971 | Eric Sunshine | 24 December 2014, 09:43:13 UTC | t2004: drop unnecessary write-tree/read-tree Unlike earlier tests which reference several trees prepared by "setup", no other tests utilize the tree from the "symlink" test, so there is no need to write it (or read it back immediately). Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 18:54:20 UTC |
| 9fb7b57 | Eric Sunshine | 24 December 2014, 09:43:12 UTC | t2004: modernize style In particular: * indent test body * place test description on same line as test_expect_* * place closing quote on its own line * name output file "actual" rather than "out" * name setup test "setup" rather than "preparation" Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 18:52:43 UTC |
| c5b9256 | Junio C Hamano | 29 December 2014, 18:15:22 UTC | Merge branch 'for-junio' of git://bogomips.org/git-svn * 'for-junio' of git://bogomips.org/git-svn: git-svn: support for git-svn propset | 29 December 2014, 18:15:22 UTC |
| 2dacf26 | brian m. carlson | 24 December 2014, 23:05:40 UTC | pack-objects: use --objects-edge-aggressive for shallow repos When fetching into or pushing from a shallow repository, we want to aggressively mark edges as uninteresting, since this decreases the pack size. However, aggressively marking edges can negatively affect performance on large non-shallow repositories with lots of refs. Teach pack-objects a --shallow option to indicate that we're pushing from or fetching into a shallow repository. Use --objects-edge-aggressive only for shallow repositories and otherwise use --objects-edge, which performs better in the general case. Update the callers to pass the --shallow option when they are dealing with a shallow repository. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 17:58:25 UTC |
| 1684c1b | brian m. carlson | 24 December 2014, 23:05:39 UTC | rev-list: add an option to mark fewer edges as uninteresting In commit fbd4a70 (list-objects: mark more commits as edges in mark_edges_uninteresting - 2013-08-16), we marked an increasing number of edges uninteresting. This change, and the subsequent change to make this conditional on --objects-edge, are used by --thin to make much smaller packs for shallow clones. Unfortunately, they cause a significant performance regression when pushing non-shallow clones with lots of refs (23.322 seconds vs. 4.785 seconds with 22400 refs). Add an option to git rev-list, --objects-edge-aggressive, that preserves this more aggressive behavior, while leaving --objects-edge to provide more performant behavior. Preserve the current behavior for the moment by using the aggressive option. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 17:57:55 UTC |
| 6b33894 | René Scharfe | 24 December 2014, 00:18:31 UTC | transport: simplify duplicating a substring in transport_get() using xmemdupz() Signed-off-by: Rene Scharfe <l.s.r@web.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 17:39:23 UTC |
| 8d025b7 | René Scharfe | 24 December 2014, 00:18:38 UTC | merge: release strbuf after use in suggest_conflicts() Signed-off-by: Rene Scharfe <l.s.r@web.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 17:33:25 UTC |
| 8547e0f | René Scharfe | 24 December 2014, 00:18:11 UTC | commit-tree: simplify parsing of option -S using skip_prefix() Signed-off-by: Rene Scharfe <l.s.r@web.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2014, 17:32:45 UTC |
| 4395b21 | Junio C Hamano | 29 December 2014, 17:32:07 UTC | Merge branch 'jc/t9001-modernise' * jc/t9001-modernise: t9001: style modernisation phase #5 t9001: style modernisation phase #4 t9001: style modernisation phase #3 t9001: style modernisation phase #2 t9001: style modernisation phase #1 | 29 December 2014, 17:32:07 UTC |
| cb71e73 | Junio C Hamano | 29 December 2014, 17:30:55 UTC | Merge branch 'mh/update-ref-verify' "git update-ref --stdin"'s verify command did not work well when <oldvalue>, which is documented as optional, was missing. * mh/update-ref-verify: update-ref: fix "verify" command with missing <oldvalue> t1400: add some more tests of "update-ref --stdin"'s verify command | 29 December 2014, 17:30:56 UTC |
| d69360c | Ben Walton | 22 December 2014, 23:25:44 UTC | t0090: tweak awk statement for Solaris /usr/xpg4/bin/awk The awk statements previously used in this test weren't compatible with the native versions of awk on Solaris: echo "dir" | /bin/awk -v c=0 '$1 {++c} END {print c}' awk: syntax error near line 1 awk: bailing out near line 1 echo "dir" | /usr/xpg4/bin/awk -v c=0 '$1 {++c} END {print c}' 0 Even though we do not cater to tools in /usr/bin on Solaris that have and are overridden by corresponding ones in /usr/xpg?/bin, in this case, even the XPG version does not work correctly. With GNU awk for comparison: echo "dir" | /opt/csw/gnu/awk -v c=0 '$1 {++c} END {print c}' 1 which is what this test expects (and is in line with POSIX; non-empty string is true and an empty string is false). Work this issue around by using $1 != "" to state more explicitly that we are skipping empty lines. Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ben Walton <bdwalton@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2014, 15:34:19 UTC |
| bbcefff | Junio C Hamano | 22 December 2014, 20:43:48 UTC | Sync with maint Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2014, 20:43:48 UTC |
| 2c380e7 | Junio C Hamano | 22 December 2014, 20:43:16 UTC | Third batch for 2.3 cycle Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2014, 20:43:16 UTC |
| a305b15 | Junio C Hamano | 22 December 2014, 20:28:22 UTC | Merge branch 'rs/use-strbuf-complete-line' * rs/use-strbuf-complete-line: use strbuf_complete_line() for adding a newline if needed | 22 December 2014, 20:28:22 UTC |
| 35b5a8b | Junio C Hamano | 22 December 2014, 20:28:20 UTC | Merge branch 'jg/prompt-localize-temporary' "git-prompt" (in contrib/) used a variable from the global scope, possibly contaminating end-user's namespace. * jg/prompt-localize-temporary: git-prompt.sh: make $f local to __git_eread() | 22 December 2014, 20:28:20 UTC |
| 3d4eecc | Junio C Hamano | 22 December 2014, 20:28:16 UTC | Merge branch 'ch/new-gpg-drops-rfc-1991' Recent GPG changes the keyring format and drops support for RFC1991 formatted signatures, breaking our existing tests. * ch/new-gpg-drops-rfc-1991: tests: make comment on GPG keyring match the code tests: squelch noise from GPG machinery set-up tests: replace binary GPG keyrings with ASCII-armored keys tests: skip RFC1991 tests for gnupg 2.1 tests: create gpg homedir on the fly | 22 December 2014, 20:28:17 UTC |
| 2df3973 | Junio C Hamano | 22 December 2014, 20:28:14 UTC | Merge branch 'jk/commit-date-approxidate' Recent update to "git commit" broke amending an existing commit with bogus author/committer lines without a valid e-mail address. * jk/commit-date-approxidate: commit: always populate GIT_AUTHOR_* variables commit: loosen ident checks when generating template | 22 December 2014, 20:28:14 UTC |
| 63903d0 | Junio C Hamano | 22 December 2014, 20:28:11 UTC | Merge branch 'nd/split-index' A typofix to the documentation of a feature already in the release. * nd/split-index: index-format.txt: add a missing closing quote | 22 December 2014, 20:28:11 UTC |
| 9f240ec | Junio C Hamano | 22 December 2014, 20:28:08 UTC | Merge branch 'jk/test-asan' * jk/test-asan: t: support clang/gcc AddressSanitizer | 22 December 2014, 20:28:08 UTC |
| 3701aa0 | Junio C Hamano | 22 December 2014, 20:28:06 UTC | Merge branch 'ok/rebase-i-count-todo' * ok/rebase-i-count-todo: Show number of TODO items for interactive rebase | 22 December 2014, 20:28:06 UTC |
| aa9066f | Junio C Hamano | 22 December 2014, 20:28:04 UTC | Merge branch 'jk/read-packed-refs-without-path-max' Git did not correctly read an overlong refname from a packed refs file. * jk/read-packed-refs-without-path-max: read_packed_refs: use skip_prefix instead of static array read_packed_refs: pass strbuf to parse_ref_line read_packed_refs: use a strbuf for reading lines | 22 December 2014, 20:28:04 UTC |
| 8ada1d8 | Junio C Hamano | 22 December 2014, 20:28:02 UTC | Merge branch 'jk/always-allow-large-packets' "git push" and "git fetch" did not communicate an overlong refname correctly. * jk/always-allow-large-packets: pkt-line: allow writing of LARGE_PACKET_MAX buffers | 22 December 2014, 20:28:02 UTC |
| 3dadfc7 | Junio C Hamano | 22 December 2014, 20:27:58 UTC | Merge branch 'jk/colors' "diff-highlight" filter (in contrib/) allows its color output to be customized via configuration variables. * jk/colors: parse_color: drop COLOR_BACKGROUND macro diff-highlight: allow configurable colors parse_color: recognize "no$foo" to clear the $foo attribute parse_color: support 24-bit RGB values parse_color: refactor color storage | 22 December 2014, 20:27:58 UTC |
| d539eb9 | Junio C Hamano | 22 December 2014, 20:27:51 UTC | Merge branch 'rw/apply-does-not-take-ignore-date' * rw/apply-does-not-take-ignore-date: git-am.txt: --ignore-date flag is not passed to git-apply | 22 December 2014, 20:27:55 UTC |
| 6d43519 | Junio C Hamano | 22 December 2014, 20:27:46 UTC | Merge branch 'js/test-hashmap-squelch-gcc' * js/test-hashmap-squelch-gcc: test-hashmap: squelch gcc compiler warning | 22 December 2014, 20:27:46 UTC |
| 1cb4b3d | Junio C Hamano | 22 December 2014, 20:27:41 UTC | Merge branch 'js/fsck-tag-validation' New tag object format validation added in 2.2 showed garbage after a tagname it reported in its error message. * js/fsck-tag-validation: index-pack: terminate object buffers with NUL fsck: properly bound "invalid tag name" error message | 22 December 2014, 20:27:41 UTC |
| 14d4aab | Junio C Hamano | 22 December 2014, 20:27:38 UTC | Merge branch 'po/doc-assume-unchanged' Fixes long-standing misunderstanding of what assume-unchanged is about. Some text near what is removed by the bottom patch may also have to be removed. * po/doc-assume-unchanged: gitignore.txt: do not suggest assume-unchanged doc: make clear --assume-unchanged's user contract | 22 December 2014, 20:27:38 UTC |
| 15a171f | Junio C Hamano | 22 December 2014, 20:27:36 UTC | Merge branch 'mg/branch-d-m-f' "git branch -d" (delete) and "git branch -m" (move) learned to honor "-f" (force) flag; unlike many other subcommands, the way to force these have been with separate "-D/-M" options, which was inconsistent. * mg/branch-d-m-f: branch: allow -f with -m and -d t3200-branch: test -M | 22 December 2014, 20:27:36 UTC |
| 00c194a | Junio C Hamano | 22 December 2014, 20:27:34 UTC | Merge branch 'tb/t0027-eol-conversion' * tb/t0027-eol-conversion: t0027: check the eol conversion warnings | 22 December 2014, 20:27:34 UTC |
| 6f3abb7 | Junio C Hamano | 22 December 2014, 20:27:32 UTC | Merge branch 'jk/for-each-reflog-ent-reverse' The code that reads the reflog from the newer to the older entries did not handle an entry that crosses a boundary of block it uses to read them correctly. * jk/for-each-reflog-ent-reverse: for_each_reflog_ent_reverse: turn leftover check into assertion for_each_reflog_ent_reverse: fix newlines on block boundaries | 22 December 2014, 20:27:32 UTC |
| 12b9f08 | Junio C Hamano | 22 December 2014, 20:27:29 UTC | Merge branch 'sb/string-list' API simplification. * sb/string-list: string_list: remove string_list_insert_at_index() from its API mailmap: use higher level string list functions string_list: document string_list_(insert,lookup) | 22 December 2014, 20:27:30 UTC |
| 53c3692 | Junio C Hamano | 22 December 2014, 20:27:27 UTC | Merge branch 'sv/doc-stripspace' * sv/doc-stripspace: Documentation/git-stripspace: add synopsis for --comment-lines | 22 December 2014, 20:27:27 UTC |
| 2cd20dc | Junio C Hamano | 22 December 2014, 20:27:24 UTC | Merge branch 'rt/completion-tag' * rt/completion-tag: completion: add git-tag options | 22 December 2014, 20:27:24 UTC |
| 3ab0029 | Junio C Hamano | 22 December 2014, 20:27:22 UTC | Merge branch 'mg/doc-check-ignore-tracked-are-not-ignored' * mg/doc-check-ignore-tracked-are-not-ignored: check-ignore: clarify treatment of tracked files | 22 December 2014, 20:27:22 UTC |
| 86362f7 | Junio C Hamano | 22 December 2014, 20:27:19 UTC | Merge branch 'jk/credential-quit' Credential helpers are asked in turn until one of them give positive response, which is cumbersome to turn off when you need to run Git in an automated setting. The credential helper interface learned to allow a helper to say "stop, don't ask other helpers." Also GIT_TERMINAL_PROMPT environment can be set to false to disable our built-in prompt mechanism for passwords. * jk/credential-quit: prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts credential: let helpers tell us to quit | 22 December 2014, 20:27:20 UTC |
| 2f17ecb | Junio C Hamano | 22 December 2014, 20:27:16 UTC | Merge branch 'dm/compat-s-ifmt-for-zos' Long overdue departure from the assumption that S_IFMT is shared by everybody made in 2005. * dm/compat-s-ifmt-for-zos: compat: convert modes to use portable file type values | 22 December 2014, 20:27:16 UTC |
| 0b5ae7b | Junio C Hamano | 22 December 2014, 20:27:13 UTC | Merge branch 'ps/new-workdir-into-empty-directory' "git new-workdir" (in contrib/) can be used to populate an empty and existing directory now. * ps/new-workdir-into-empty-directory: git-new-workdir: don't fail if the target directory is empty | 22 December 2014, 20:27:14 UTC |
| 5700772 | Junio C Hamano | 22 December 2014, 20:27:12 UTC | Merge branch 'nd/ls-tree-pathspec' "git ls-tree" does not support path selection based on negative pathspecs, but did not error out when negative pathspecs are given. * nd/ls-tree-pathspec: t3102: style modernization t3102: document that ls-tree does not yet support negated pathspec ls-tree: disable negative pathspec because it's not supported ls-tree: remove path filtering logic in show_tree tree.c: update read_tree_recursive callback to pass strbuf as base | 22 December 2014, 20:27:12 UTC |
| 77a801d | Junio C Hamano | 22 December 2014, 20:27:10 UTC | Merge branch 'jc/hook-cleanup' Remove unused code. * jc/hook-cleanup: run-command.c: retire unused run_hook_with_custom_index() | 22 December 2014, 20:27:10 UTC |
| a558344 | Junio C Hamano | 22 December 2014, 20:27:08 UTC | Merge branch 'rt/for-each-ref-spell-tcl-as-Tcl' * rt/for-each-ref-spell-tcl-as-Tcl: for-each-ref: correct spelling of Tcl in option description | 22 December 2014, 20:27:08 UTC |
| 08884f5 | Junio C Hamano | 22 December 2014, 20:27:06 UTC | Merge branch 'rj/t0050-passes' * rj/t0050-passes: t0050-*.sh: mark the rename (case change) test as passing | 22 December 2014, 20:27:06 UTC |
| 72ecc6e | Junio C Hamano | 22 December 2014, 20:27:03 UTC | Merge branch 'js/push-to-deploy' "git push" into a repository with a working tree normally refuses to modify the branch that is checked out. The command learned to optionally do an equivalent of "git reset --hard" only when there is no change to the working tree and the index instead, which would be useful to "deploy" by pushing into a repository. * js/push-to-deploy: t5516: more tests for receive.denyCurrentBranch=updateInstead receive-pack: add another option for receive.denyCurrentBranch | 22 December 2014, 20:27:04 UTC |
| 6bcaff1 | Junio C Hamano | 22 December 2014, 20:27:01 UTC | Merge branch 'jc/exec-cmd-system-path-leak-fix' The function sometimes returned a non-freeable memory and some other times returned a piece of memory that must be freed. * jc/exec-cmd-system-path-leak-fix: system_path(): always return free'able memory to the caller | 22 December 2014, 20:27:01 UTC |
| 5109f2a | Junio C Hamano | 22 December 2014, 20:26:57 UTC | Merge branch 'mh/find-uniq-abbrev' The code to abbreviate an object name to its short unique prefix has been optimized when no abbreviation was requested. * mh/find-uniq-abbrev: sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev | 22 December 2014, 20:26:58 UTC |
| 2374f1d | Junio C Hamano | 22 December 2014, 20:26:53 UTC | Merge branch 'pb/send-email-te' "git send-email" learned "--transfer-encoding" option to force a non-fault Content-Transfer-Encoding header (e.g. base64). * pb/send-email-te: git-send-email: add --transfer-encoding option git-send-email: delay creation of MIME headers | 22 December 2014, 20:26:54 UTC |
| fa7f51d | Junio C Hamano | 22 December 2014, 20:26:52 UTC | Merge branch 'pb/am-message-id-footer' "git am" learned "--message-id" option to copy the message ID of the incoming e-mail to the log message of resulting commit. * pb/am-message-id-footer: git-am: add --message-id/--no-message-id git-mailinfo: add --message-id | 22 December 2014, 20:26:52 UTC |
| a7ddaa8 | Junio C Hamano | 22 December 2014, 20:26:50 UTC | Merge branch 'mh/simplify-repack-without-refs' "git remote update --prune" to drop many refs has been optimized. * mh/simplify-repack-without-refs: sort_string_list(): rename to string_list_sort() prune_remote(): iterate using for_each_string_list_item() prune_remote(): rename local variable repack_without_refs(): make the refnames argument a string_list prune_remote(): sort delete_refs_list references en masse prune_remote(): initialize both delete_refs lists in a single loop prune_remote(): exit early if there are no stale references | 22 December 2014, 20:26:50 UTC |
| 8e606f9 | Junio C Hamano | 22 December 2014, 20:26:48 UTC | Merge branch 'dw/shell-basename-dashdash-before-stripping-leading-dash-from-login' * dw/shell-basename-dashdash-before-stripping-leading-dash-from-login: git-sh-setup.sh: use dashdash with basename call | 22 December 2014, 20:26:48 UTC |
