| 6aba117 | Elijah Newren | 29 August 2018, 07:06:13 UTC | am: avoid directory rename detection when calling recursive merge machinery Let's say you have the following three trees, where Base is from one commit behind either master or branch: Base : bar_v1, foo/{file1, file2, file3} branch: bar_v2, foo/{file1, file2}, goo/file3 master: bar_v3, foo/{file1, file2, file3} Using git-am (or am-based rebase) to apply the changes from branch onto master results in the following tree: Result: bar_merged, goo/{file1, file2, file3} This is not what users want; they did not rename foo/ -> goo/, they only renamed one file within that directory. The reason this happens is am constructs fake trees (via build_fake_ancestor()) of the following form: Base_bfa : bar_v1, foo/file3 branch_bfa: bar_v2, goo/file3 Combining these two trees with master's tree: master: bar_v3, foo/{file1, file2, file3}, You can see that merge_recursive_generic() would see branch_bfa as renaming foo/ -> goo/, and master as just adding both foo/file1 and foo/file2. As such, it ends up with goo/{file1, file2, file3} The core problem is that am does not have access to the original trees; it can only construct trees using the blobs involved in the patch. As such, it is not safe to perform directory rename detection within am -3. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 August 2018, 14:58:59 UTC |
| 5fdddd9 | Elijah Newren | 29 August 2018, 07:06:12 UTC | merge-recursive: add ability to turn off directory rename detection Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 August 2018, 14:58:59 UTC |
| e7588c9 | Elijah Newren | 29 August 2018, 07:06:11 UTC | t3401: add another directory rename testcase for rebase and am Similar to commit 16346883ab ("t3401: add directory rename testcases for rebase and am", 2018-06-27), add another testcase for directory rename detection. This new testcase differs in that it showcases a situation where no directory rename was performed, but which some backends incorrectly detect. As with the other testcase, run this in conjunction with each of the types of rebases: git-rebase--interactive git-rebase--am git-rebase--merge and also use the same testcase for git am --3way Reported-by: Nikolay Kasyanov <corrmage@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 August 2018, 14:58:59 UTC |
| b00bf1c | Elijah Newren | 27 June 2018, 07:23:19 UTC | git-rebase: make --allow-empty-message the default rebase backends currently behave differently with empty commit messages, largely as a side-effect of the different underlying commands on which they are based. am-based rebases apply commits with an empty commit message without stopping or requiring the user to specify an extra flag. (It is interesting to note that am-based rebases are the default rebase type, and no one has ever requested a --no-allow-empty-message flag to change this behavior.) merge-based and interactive-based rebases (which are ultimately based on git-commit), will currently halt on any such commits and require the user to manually specify what to do with the commit and continue. One possible rationale for the difference in behavior is that the purpose of an "am" based rebase is solely to transplant an existing history, while an "interactive" rebase is one whose purpose is to polish a series before making it publishable. Thus, stopping and asking for confirmation for a possible problem is more appropriate in the latter case. However, there are two problems with this rationale: 1) merge-based rebases are also non-interactive and there are multiple types of rebases that use the interactive machinery but are not explicitly interactive (e.g. when either --rebase-merges or --keep-empty are specified without --interactive). These rebases are also used solely to transplant an existing history, and thus also should default to --allow-empty-message. 2) this rationale only says that the user is more accepting of stopping in the case of an explicitly interactive rebase, not that stopping for this particular reason actually makes sense. Exploring whether it makes sense, requires backing up and analyzing the underlying commands... If git-commit did not error out on empty commits by default, accidental creation of commits with empty messages would be a very common occurrence (this check has caught me many times). Further, nearly all such empty commit messages would be considered an accidental error (as evidenced by a huge amount of documentation across version control systems and in various blog posts explaining how important commit messages are). A simple check for what would otherwise be a common error thus made a lot of sense, and git-commit gained an --allow-empty-message flag for special case overrides. This has made commits with empty messages very rare. There are two sources for commits with empty messages for rebase (and cherry-pick): (a) commits created in git where the user previously specified --allow-empty-message to git-commit, and (b) commits imported into git from other version control systems. In case (a), the user has already explicitly specified that there is something special about this commit that makes them not want to specify a commit message; forcing them to re-specify with every cherry-pick or rebase seems more likely to be infuriating than helpful. In case (b), the commit is highly unlikely to have been authored by the person who has imported the history and is doing the rebase or cherry-pick, and thus the user is unlikely to be the appropriate person to write a commit message for it. Stopping and expecting the user to modify the commit before proceeding thus seems counter-productive. Further, note that while empty commit messages was a common error case for git-commit to deal with, it is a rare case for rebase (or cherry-pick). The fact that it is rare raises the question of why it would be worth checking and stopping on this particular condition and not others. For example, why doesn't an interactive rebase automatically stop if the commit message's first line is 2000 columns long, or is missing a blank line after the first line, or has every line indented with five spaces, or any number of other myriad problems? Finally, note that if a user doing an interactive rebase does have the necessary knowledge to add a message for any such commit and wants to do so, it is rather simple for them to change the appropriate line from 'pick' to 'reword'. The fact that the subject is empty in the todo list that the user edits should even serve as a way to notify them. As far as I can tell, the fact that merge-based and interactive-based rebases stop on commits with empty commit messages is solely a by-product of having been based on git-commit. It went without notice for a long time precisely because such cases are rare. The rareness of this situation made it difficult to reason about, so when folks did eventually notice this behavior, they assumed it was there for a good reason and just added an --allow-empty-message flag. In my opinion, stopping on such messages not desirable in any of these cases, even the (explicitly) interactive case. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2018, 18:23:22 UTC |
| 1634688 | Elijah Newren | 27 June 2018, 07:23:18 UTC | t3401: add directory rename testcases for rebase and am Add a simple directory rename testcase, in conjunction with each of the types of rebases: git-rebase--interactive git-rebase--am git-rebase--merge and also use the same testcase for git am --3way This demonstrates a difference in behavior between the different rebase backends in regards to directory rename detection. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2018, 18:23:22 UTC |
| 0661e49 | Elijah Newren | 27 June 2018, 07:23:17 UTC | git-rebase.txt: document behavioral differences between modes There are a variety of aspects that are common to all rebases regardless of which backend is in use; however, the behavior for these different aspects varies in ways that could surprise users. (In fact, it's not clear -- to me at least -- that these differences were even desirable or intentional.) Document these differences. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2018, 18:23:22 UTC |
| 4d34dff | Elijah Newren | 27 June 2018, 07:23:16 UTC | directory-rename-detection.txt: technical docs on abilities and limitations Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2018, 18:23:22 UTC |
| 983f464 | Elijah Newren | 27 June 2018, 07:23:15 UTC | git-rebase.txt: address confusion between --no-ff vs --force-rebase rebase was taught the --force-rebase option in commit b2f82e05de ("Teach rebase to rebase even if upstream is up to date", 2009-02-13). This flag worked for the am and merge backends, but wasn't a valid option for the interactive backend. rebase was taught the --no-ff option for interactive rebases in commit b499549401cb ("Teach rebase the --no-ff option.", 2010-03-24), to do the exact same thing as --force-rebase does for non-interactive rebases. This commit explicitly documented the fact that --force-rebase was incompatible with --interactive, though it made --no-ff a synonym for --force-rebase for non-interactive rebases. The choice of a new option was based on the fact that "force rebase" didn't sound like an appropriate term for the interactive machinery. In commit 6bb4e485cff8 ("rebase: align variable names", 2011-02-06), the separate parsing of command line options in the different rebase scripts was removed, and whether on accident or because the author noticed that these options did the same thing, the options became synonyms and both were accepted by all three rebase types. In commit 2d26d533a012 ("Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op", 2014-08-12), which reworded the description of the --force-rebase option, the (no-longer correct) sentence stating that --force-rebase was incompatible with --interactive was finally removed. Finally, as explained at https://public-inbox.org/git/98279912-0f52-969d-44a6-22242039387f@xiplink.com In the original discussion around this option [1], at one point I proposed teaching rebase--interactive to respect --force-rebase instead of adding a new option [2]. Ultimately --no-ff was chosen as the better user interface design [3], because an interactive rebase can't be "forced" to run. We have accepted both --no-ff and --force-rebase as full synonyms for all three rebase types for over seven years. Documenting them differently and in ways that suggest they might not be quite synonyms simply leads to confusion. Adjust the documentation to match reality. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2018, 18:23:22 UTC |
| c840e1a | Elijah Newren | 27 June 2018, 07:23:14 UTC | git-rebase: error out when incompatible options passed git rebase has three different types: am, merge, and interactive, all of which are implemented in terms of separate scripts. am builds on git-am, merge builds on git-merge-recursive, and interactive builds on git-cherry-pick. We make use of features in those lower-level commands in the different rebase types, but those features don't exist in all of the lower level commands so we have a range of incompatibilities. Previously, we just accepted nearly any argument and silently ignored whichever ones weren't implemented for the type of rebase specified. Change this so the incompatibilities are documented, included in the testsuite, and tested for at runtime with an appropriate error message shown. Some exceptions I left out: * --merge and --interactive are technically incompatible since they are supposed to run different underlying scripts, but with a few small changes, --interactive can do everything that --merge can. In fact, I'll shortly be sending another patch to remove git-rebase--merge and reimplement it on top of git-rebase--interactive. * One could argue that --interactive and --quiet are incompatible since --interactive doesn't implement a --quiet mode (perhaps since cherry-pick itself does not implement one). However, the interactive mode is more quiet than the other modes in general with progress messages, so one could argue that it's already quiet. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2018, 18:23:22 UTC |
| 9929430 | Elijah Newren | 27 June 2018, 07:23:13 UTC | t3422: new testcases for checking when incompatible options passed git rebase is split into three types: am, merge, and interactive. Various options imply different types, and which mode we are using determine which sub-script (git-rebase--$type) is executed to finish the work. Not all options work with all types, so add tests for combinations where we expect to receive an error rather than having options be silently ignored. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2018, 18:23:22 UTC |
| d4e8062 | Elijah Newren | 25 June 2018, 16:12:53 UTC | git-rebase.sh: update help messages a bit signoff is not specific to the am-backend. Also, re-order a few options to make like things (e.g. strategy and strategy-option) be near each other. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 June 2018, 18:00:12 UTC |
| 5dacd4a | Elijah Newren | 25 June 2018, 16:12:52 UTC | git-rebase.txt: document incompatible options git rebase has many options that only work with one of its three backends. It also has a few other pairs of incompatible options. Document these. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 June 2018, 18:00:12 UTC |
| 53f9a3e | Junio C Hamano | 21 June 2018, 17:00:06 UTC | Git 2.18 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2018, 17:00:06 UTC |
| 1fb9df7 | Junio C Hamano | 19 June 2018, 18:11:03 UTC | Merge branch 'en/rename-directory-detection-reboot' * en/rename-directory-detection-reboot: merge-recursive: use xstrdup() instead of fixed buffer | 19 June 2018, 18:11:03 UTC |
| f0ac6e3 | Junio C Hamano | 19 June 2018, 16:29:23 UTC | Merge tag 'l10n-2.18.0-rnd3.1' of git://github.com/git-l10n/git-po Merge Korean translation for l10n of Git 2.18.0 round 3 * tag 'l10n-2.18.0-rnd3.1' of git://github.com/git-l10n/git-po: l10n: ko.po: Update Korean translation | 19 June 2018, 16:29:23 UTC |
| bd73c3f | Junio C Hamano | 19 June 2018, 16:26:59 UTC | Merge branch 'cf/submodule-progress-dissociate' * cf/submodule-progress-dissociate: t7400: encapsulate setup code in test_expect_success | 19 June 2018, 16:26:59 UTC |
| 6b55779 | Junio C Hamano | 19 June 2018, 16:26:28 UTC | Merge branch 'js/rebase-i-root-fix' * js/rebase-i-root-fix: t3404: check root commit in 'rebase -i --root reword root commit' | 19 June 2018, 16:26:28 UTC |
| 83f5fa5 | Stefan Beller | 18 June 2018, 23:41:48 UTC | t7400: encapsulate setup code in test_expect_success When running t7400 in a shell you observe more output than expected: ... ok 8 - setup - hide init subdirectory ok 9 - setup - repository to add submodules to ok 10 - submodule add [master (root-commit) d79ce16] one Author: A U Thor <author@example.com> 1 file changed, 1 insertion(+) create mode 100644 one.t ok 11 - redirected submodule add does not show progress ok 12 - redirected submodule add --progress does show progress ok 13 - submodule add to .gitignored path fails ... Fix the output by encapsulating the setup code in test_expect_success Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 June 2018, 16:25:56 UTC |
| 8788105 | Todd Zullinger | 18 June 2018, 22:19:42 UTC | t3404: check root commit in 'rebase -i --root reword root commit' When testing a reworded root commit, ensure that the squash-onto commit which is created and amended is still the root commit. Suggested-by: Phillip Wood <phillip.wood@talktalk.net> Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 June 2018, 16:14:33 UTC |
| 1f2abe6 | Karthikeyan Singaravelan | 17 June 2018, 04:35:54 UTC | doc: fix typos in documentation and release notes Signed-off-by: Karthikeyan Singaravelan <tir.karthi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 June 2018, 16:01:12 UTC |
| 242ba98 | Junio C Hamano | 18 June 2018, 18:24:21 UTC | Almost 2.18 final Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2018, 18:24:21 UTC |
| da34dd4 | Junio C Hamano | 18 June 2018, 18:23:24 UTC | Merge branch 'es/make-no-iconv' "make NO_ICONV=NoThanks" did not override NEEDS_LIBICONV (i.e. linkage of -lintl, -liconv, etc. that are platform-specific tweaks), which has been corrected. * es/make-no-iconv: Makefile: make NO_ICONV really mean "no iconv" | 18 June 2018, 18:23:24 UTC |
| cc2beaf | Junio C Hamano | 18 June 2018, 18:23:23 UTC | Merge branch 'sg/t7406-chain-fix' Test fix. * sg/t7406-chain-fix: t7406-submodule-update: fix broken &&-chains | 18 June 2018, 18:23:24 UTC |
| 4229478 | Junio C Hamano | 18 June 2018, 18:23:23 UTC | Merge branch 'ks/branch-set-upstream' A test title has been reworded to clarify it. * ks/branch-set-upstream: t3200: clarify description of --set-upstream test | 18 June 2018, 18:23:23 UTC |
| f300f56 | Junio C Hamano | 18 June 2018, 18:23:22 UTC | Merge branch 'js/rebase-i-root-fix' A regression to "rebase -i --root" introduced during this cycle has been fixed. * js/rebase-i-root-fix: rebase --root: fix amending root commit messages rebase --root: demonstrate a bug while amending root commit messages | 18 June 2018, 18:23:22 UTC |
| f35f43f | Junio C Hamano | 18 June 2018, 18:23:22 UTC | Merge branch 'jk/ewah-bounds-check' The code to read compressed bitmap was not careful to avoid reading past the end of the file, which has been corrected. * jk/ewah-bounds-check: ewah: adjust callers of ewah_read_mmap() ewah_read_mmap: bounds-check mmap reads | 18 June 2018, 18:23:22 UTC |
| 1663e2b | Junio C Hamano | 18 June 2018, 17:21:24 UTC | Merge tag 'l10n-2.18.0-rnd3' of git://github.com/git-l10n/git-po l10n for Git 2.18.0 round 3 * tag 'l10n-2.18.0-rnd3' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.18.0 l10n round 1 to 3 l10n: bg.po: Updated Bulgarian translation (3608t) l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round 3 l10n: fr.po v2.18.0 round 3 l10n: es.po: Spanish update for v2.18.0 round 3 l10n: git.pot: v2.18.0 round 3 (1 new, 1 removed) l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2 l10n: bg.po: Updated Bulgarian translation (3608t) l10n: es.po: Spanish update for v2.18.0 round 2 l10n: sv.po: Update Swedish translation (3608t0f0u) l10n: sv.po: Update Swedish translation (3470t0f0u) l10n: git.pot: v2.18.0 round 2 (144 new, 6 removed) l10n: fr.po v2.18 round 1 l10n: vi(3470t): Updated Vietnamese translation for v2.18.0 l10n: es.po: Spanish update for v2.18.0 round 1 l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed) l10n: TEAMS: remove inactive de team members l10n: de.po: fix typos l10n: Update Catalan translation | 18 June 2018, 17:21:24 UTC |
| 1022379 | Junio C Hamano | 18 June 2018, 17:20:42 UTC | A bunch of micro-fixes before going 2.18 final Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2018, 17:20:42 UTC |
| 4898dd2 | Changwoo Ryu | 18 June 2018, 17:07:46 UTC | l10n: ko.po: Update Korean translation Update the Korean translation and change the team leader to Gwan-gyeong Mun. Signed-off-by: Gwan-gyeong Mun <elongbug@gmail.com> Signed-off-by: Changwoo Ryu <cwryu@debian.org> Reviewed-by: Gwan-gyeong Mun <elongbug@gmail.com> | 18 June 2018, 17:19:42 UTC |
| 698eb03 | Junio C Hamano | 18 June 2018, 17:18:45 UTC | Merge branch 'sb/blame-color' Leakfix. * sb/blame-color: blame: release string_list after use in parse_color_fields() | 18 June 2018, 17:18:45 UTC |
| 23fc55a | Junio C Hamano | 18 June 2018, 17:18:45 UTC | Merge branch 'mw/doc-merge-enumfix' Fix old merge glitch in Documentation during v2.13-rc0 era. * mw/doc-merge-enumfix: doc: update the order of the syntax `git merge --continue` | 18 June 2018, 17:18:45 UTC |
| f72432d | Junio C Hamano | 18 June 2018, 17:18:44 UTC | Merge branch 'en/rename-directory-detection' Newly added codepath in merge-recursive had potential buffer overrun, which has been fixed. * en/rename-directory-detection: merge-recursive: use xstrdup() instead of fixed buffer | 18 June 2018, 17:18:44 UTC |
| 929c097 | Junio C Hamano | 18 June 2018, 17:18:43 UTC | Merge branch 'rd/doc-remote-tracking-with-hyphen' Doc update. * rd/doc-remote-tracking-with-hyphen: Use hyphenated "remote-tracking branch" (docs and comments) | 18 June 2018, 17:18:43 UTC |
| faff812 | Junio C Hamano | 18 June 2018, 17:18:43 UTC | Merge branch 'jl/zlib-restore-nul-termination' Make zlib inflate codepath more robust against versions of zlib that clobber unused portion of outbuf. * jl/zlib-restore-nul-termination: packfile: correct zlib buffer handling | 18 June 2018, 17:18:43 UTC |
| 094381e | Junio C Hamano | 18 June 2018, 17:18:42 UTC | Merge branch 'ab/cred-netrc-no-autodie' Hotfix for contrib/ stuff broken by this cycle. * ab/cred-netrc-no-autodie: git-credential-netrc: remove use of "autodie" | 18 June 2018, 17:18:42 UTC |
| a626082 | Junio C Hamano | 18 June 2018, 17:18:42 UTC | Merge branch 'km/doc-workflows-typofix' Typofix. * km/doc-workflows-typofix: gitworkflows: fix grammar in 'Merge upwards' rule | 18 June 2018, 17:18:42 UTC |
| e638899 | Junio C Hamano | 18 June 2018, 17:18:41 UTC | Merge branch 'ld/git-p4-updates' "git p4" updates. * ld/git-p4-updates: git-p4: auto-size the block git-p4: narrow the scope of exceptions caught when parsing an int git-p4: raise exceptions from p4CmdList based on error from p4 server git-p4: better error reporting when p4 fails git-p4: add option to disable syncing of p4/master with p4 git-p4: disable-rebase: allow setting this via configuration git-p4: add options --commit and --disable-rebase | 18 June 2018, 17:18:41 UTC |
| d676cc5 | Junio C Hamano | 18 June 2018, 17:18:41 UTC | Merge branch 'rd/diff-options-typofix' Typofix. * rd/diff-options-typofix: diff-options.txt: fix minor typos, font inconsistencies, in docs | 18 June 2018, 17:18:41 UTC |
| 1bd0e67 | Junio C Hamano | 18 June 2018, 17:18:40 UTC | Merge branch 'rd/comment-typofix-in-sha1-file' In code comment typofix * rd/comment-typofix-in-sha1-file: sha1-file.c: correct $GITDIR to $GIT_DIR in a comment | 18 June 2018, 17:18:40 UTC |
| 94eff2b | René Scharfe | 10 June 2018, 10:56:31 UTC | merge-recursive: use xstrdup() instead of fixed buffer Paths can be longer than PATH_MAX. Avoid a buffer overrun in check_dir_renamed() by using xstrdup() to make a private copy safely. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2018, 17:03:38 UTC |
| 2e157d1 | SZEDER Gábor | 18 June 2018, 10:46:09 UTC | RelNotes 2.18: minor fix to entry about dynamically loading completions It was not "newer versions of bash" but newer versions of bash-completion that made commit 085e2ee0e6 (completion: load completion file for external subcommand, 2018-04-29) both necessary and possible. Update the corresponding RelNotes entry accordingly. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2018, 16:50:56 UTC |
| 8de19d6 | SZEDER Gábor | 16 June 2018, 20:33:19 UTC | t7406-submodule-update: fix broken &&-chains Three tests in 't7406-submodule-update' contain broken &&-chains, but since they are all in subshells, chain-lint couldn't notice them. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2018, 16:48:10 UTC |
| 76fda6e | Johannes Schindelin | 16 June 2018, 19:00:38 UTC | rebase --root: fix amending root commit messages The code path that triggered that "BUG" really does not want to run without an explicit commit message. In the case where we want to amend a commit message, we have an *implicit* commit message, though: the one of the commit to amend. Therefore, this code path should not even be entered. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2018, 16:36:58 UTC |
| 3a36ca0 | Todd Zullinger | 15 June 2018, 04:31:11 UTC | rebase --root: demonstrate a bug while amending root commit messages When splitting a repository, running `git rebase -i --root` to reword the initial commit, Git dies with BUG: sequencer.c:795: root commit without message. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2018, 16:22:18 UTC |
| 1140bf0 | Jeff King | 15 June 2018, 03:44:43 UTC | ewah: adjust callers of ewah_read_mmap() The return value of ewah_read_mmap() is now an ssize_t, since we could (in theory) process up to 32GB of data. This would never happen in practice, but a corrupt or malicious .bitmap or index file could convince us to do so. Let's make sure that we don't stuff the value into an int, which would cause us to incorrectly move our pointer forward. We'd always move too little, since negative values are used for reporting errors. So the worst case is just that we end up reporting a corrupt file, not an out-of-bounds read. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2018, 16:13:57 UTC |
| 9d2e330 | Jeff King | 15 June 2018, 03:31:13 UTC | ewah_read_mmap: bounds-check mmap reads The on-disk ewah format tells us how big the ewah data is, and we blindly read that much from the buffer without considering whether the mmap'd data is long enough, which can lead to out-of-bound reads. Let's make sure we have data available before reading it, both for the ewah header/footer as well as for the bit data itself. In particular: - keep our ptr/len pair in sync as we move through the buffer, and check it before each read - check the size for integer overflow (this should be impossible on 64-bit, as the size is given as a 32-bit count of 8-byte words, but is possible on a 32-bit system) - return the number of bytes read as an ssize_t instead of an int, again to prevent integer overflow - compute the return value using a pointer difference; this should yield the same result as the existing code, but makes it more obvious that we got our computations right The included test is far from comprehensive, as it just picks a static point at which to truncate the generated bitmap. But in practice this will hit in the middle of an ewah and make sure we're at least exercising this code. Reported-by: Luat Nguyen <root@l4w.io> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2018, 16:13:57 UTC |
| cf31787 | Kaartic Sivaraam | 17 June 2018, 11:56:27 UTC | t3200: clarify description of --set-upstream test Support for the --set-upstream option was removed in 52668846ea (builtin/branch: stop supporting the "--set-upstream" option, 2017-08-17). The change did not completely remove the command due to an issue noted in the commit's log message. So, a test was added to ensure that a command which uses the '--set-upstream' option fails instead of silently acting as an alias for the '--set-upstream-to' option due to option parsing features. To avoid confusion, clarify that the option is disabled intentionally in the corresponding test description. The test is expected to be around as long as we intentionally fail on seeing the '--set-upstream' option which in turn we expect to do for a period of time after which we can be sure that existing users of '--set-upstream' are aware that the option is no longer supported. Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2018, 15:54:40 UTC |
| fd8cb37 | Jiang Xin | 28 May 2018, 01:11:57 UTC | l10n: zh_CN: for git v2.18.0 l10n round 1 to 3 Translate 251 new messages (3608t0f0u) for git 2.18.0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 17 June 2018, 16:31:45 UTC |
| 6484659 | Jiang Xin | 17 June 2018, 14:44:08 UTC | Merge branch 'master' of git://github.com/nafmo/git-l10n-sv * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (3608t0f0u) l10n: sv.po: Update Swedish translation (3470t0f0u) | 17 June 2018, 14:44:08 UTC |
| cc9ab5b | Jiang Xin | 17 June 2018, 14:41:43 UTC | Merge branch 'master' of https://github.com/vnwildman/git * 'master' of https://github.com/vnwildman/git: l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round 3 | 17 June 2018, 14:41:43 UTC |
| 1f764f0 | Jiang Xin | 17 June 2018, 14:37:53 UTC | Merge branch 'master' of git://github.com/alshopov/git-po * 'master' of git://github.com/alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (3608t) | 17 June 2018, 14:37:53 UTC |
| ee4286e | Jiang Xin | 17 June 2018, 14:36:41 UTC | Merge branch 'fr_2.18_rnd3' of git://github.com/jnavila/git * 'fr_2.18_rnd3' of git://github.com/jnavila/git: l10n: fr.po v2.18.0 round 3 | 17 June 2018, 14:36:41 UTC |
| e530425 | Alexander Shopov | 17 June 2018, 11:16:40 UTC | l10n: bg.po: Updated Bulgarian translation (3608t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 17 June 2018, 11:16:40 UTC |
| 09dba14 | Tran Ngoc Quan | 17 June 2018, 00:06:44 UTC | l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round 3 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 17 June 2018, 00:06:44 UTC |
| 3509754 | Jean-Noël Avila | 16 June 2018, 18:35:01 UTC | l10n: fr.po v2.18.0 round 3 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 16 June 2018, 18:43:07 UTC |
| 3b1110a | Christopher Diaz Riveros | 16 June 2018, 14:58:53 UTC | l10n: es.po: Spanish update for v2.18.0 round 3 Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org> | 16 June 2018, 14:58:53 UTC |
| 90d4bec | Jiang Xin | 16 June 2018, 14:06:45 UTC | l10n: git.pot: v2.18.0 round 3 (1 new, 1 removed) Generate po/git.pot from v2.18.0-rc2 for git v2.18.0 l10n round 3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 16 June 2018, 14:06:45 UTC |
| 1992635 | Jiang Xin | 16 June 2018, 14:05:21 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2 l10n: bg.po: Updated Bulgarian translation (3608t) l10n: es.po: Spanish update for v2.18.0 round 2 l10n: git.pot: v2.18.0 round 2 (144 new, 6 removed) l10n: fr.po v2.18 round 1 l10n: vi(3470t): Updated Vietnamese translation for v2.18.0 l10n: es.po: Spanish update for v2.18.0 round 1 l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed) l10n: TEAMS: remove inactive de team members l10n: de.po: fix typos l10n: Update Catalan translation | 16 June 2018, 14:05:21 UTC |
| fdb1fbb | Eric Sunshine | 15 June 2018, 02:25:03 UTC | Makefile: make NO_ICONV really mean "no iconv" The Makefile tweak NO_ICONV is meant to allow Git to be built without iconv in case iconv is not installed or is otherwise dysfunctional. However, NO_ICONV's disabling of iconv is incomplete and can incorrectly allow "-liconv" to slip into the linker flags when NEEDS_LIBICONV is defined, which breaks the build when iconv is not installed. On some platforms, iconv lives directly in libc, whereas, on others it resides in libiconv. For the latter case, NEEDS_LIBICONV instructs the Makefile to add "-liconv" to the linker flags. config.mak.uname automatically defines NEEDS_LIBICONV for platforms which require it. The adding of "-liconv" is done unconditionally, despite NO_ICONV. Work around this problem by making NO_ICONV take precedence over NEEDS_LIBICONV. Reported by: Mahmoud Al-Qudsi <mqudsi@neosmart.net> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 June 2018, 19:50:45 UTC |
| f448ec1 | Jiang Xin | 15 June 2018, 02:04:25 UTC | Merge branch 'master' of https://github.com/vnwildman/git * 'master' of https://github.com/vnwildman/git: l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2 | 15 June 2018, 02:04:25 UTC |
| 28cb060 | Meng-Sung Wu | 14 June 2018, 01:33:34 UTC | doc: update the order of the syntax `git merge --continue` The syntax "git merge <message> HEAD <commit>" has been removed. The order of the syntax should also be updated. Signed-off-by: Meng-Sung Wu <mengsungwu@fortunewhite.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 June 2018, 16:15:55 UTC |
| 297bdf0 | René Scharfe | 09 June 2018, 11:26:53 UTC | blame: release string_list after use in parse_color_fields() Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 June 2018, 15:59:36 UTC |
| 9da2d03 | René Scharfe | 10 June 2018, 10:56:31 UTC | merge-recursive: use xstrdup() instead of fixed buffer Paths can be longer than PATH_MAX. Avoid a buffer overrun in check_dir_renamed() by using xstrdup() to make a private copy safely. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 June 2018, 15:56:35 UTC |
| 56c0bfb | Tran Ngoc Quan | 14 June 2018, 07:19:56 UTC | l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 14 June 2018, 07:19:56 UTC |
| 68372c8 | Junio C Hamano | 13 June 2018, 19:57:07 UTC | Git 2.18-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 June 2018, 19:57:07 UTC |
| 549ca8a | Junio C Hamano | 13 June 2018, 19:50:46 UTC | Merge branch 'jk/index-pack-maint' "index-pack --strict" has been taught to make sure that it runs the final object integrity checks after making the freshly indexed packfile available to itself. * jk/index-pack-maint: index-pack: correct install_packed_git() args index-pack: handle --strict checks of non-repo packs prepare_commit_graft: treat non-repository as a noop | 13 June 2018, 19:50:46 UTC |
| 4d605b0 | Junio C Hamano | 13 June 2018, 19:50:45 UTC | Merge branch 'sg/completion-zsh-workaround' Work around zsh segfaulting when loading git-completion.zsh * sg/completion-zsh-workaround: completion: correct zsh detection when run from git-completion.zsh | 13 June 2018, 19:50:45 UTC |
| 8d0d53a | Junio C Hamano | 13 June 2018, 19:50:44 UTC | Merge branch 'sb/submodule-merge-in-merge-recursive' Finishing touches to a topic that already is in 'master'. * sb/submodule-merge-in-merge-recursive: merge-submodule: reduce output verbosity | 13 June 2018, 19:50:45 UTC |
| fb6ac9e | Junio C Hamano | 13 June 2018, 19:50:44 UTC | Merge branch 'jk/submodule-fsck-loose-fixup' Finishing touches to a topic that already is in 'maint'. * jk/submodule-fsck-loose-fixup: fsck: avoid looking at NULL blob->object t7415: don't bother creating commit for symlink test | 13 June 2018, 19:50:44 UTC |
| b611396 | Jeremy Linton | 13 June 2018, 14:22:07 UTC | packfile: correct zlib buffer handling The buffer being passed to zlib includes a NUL terminator that git needs to keep in place. unpack_compressed_entry() attempts to detect the case that the source buffer hasn't been fully consumed by checking to see if the destination buffer has been over consumed. This causes a problem, that more recent zlib patches have been poisoning the unconsumed portions of the buffer which overwrites the NUL byte, while correctly returning length and status. Let's place the NUL at the end of the buffer after inflate returns to assure that it doesn't result in problems for git even if its been overwritten by zlib. Signed-off-by: Jeremy Linton <lintonrjeremy@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 June 2018, 18:34:27 UTC |
| b2453d3 | Elijah Newren | 12 June 2018, 23:57:55 UTC | RelNotes 2.18: clarify where directory rename detection applies Mention that this feature works with some commands (merge and cherry-pick, implying that it also works with commands that build on these like rebase -m and rebase -i). Explicitly mentioning two commands hopefully implies that it may not always work with other commands (am, and rebase without flags that imply either -m or -i). Also, since the directory rename detection from this cycle was specifically added in merge-recursive and not diffcore-rename, remove the 'in "diff" family" phrase from the note. (Folks have requested in the past that `git diff` detect directory renames and somehow simplify its output, so it may be helpful to avoid implying that diff has any new capability here.) Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 June 2018, 17:47:13 UTC |
| 30aa96c | Robert P. J. Day | 07 June 2018, 11:53:36 UTC | Use hyphenated "remote-tracking branch" (docs and comments) Use the obvious consensus of hyphenated "remote-tracking branch", and fix an obvious typo, all in documentation and comments. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 June 2018, 16:57:09 UTC |
| 627be15 | Ævar Arnfjörð Bjarmason | 13 June 2018, 07:48:10 UTC | git-credential-netrc: remove use of "autodie" The "autodie" module was added in Perl 5.10.1, but our INSTALL document says "version 5.8 or later is needed". As discussed in <87efhfvxzu.fsf@evledraar.gmail.com> this script is in contrib/, so we might not want to apply that policy, however in this case "autodie" was recently added as a "gratuitous safeguard" in 786ef50a23 ("git-credential-netrc: accept gpg option", 2018-05-12) (see <CAHqJXRE8OKSKcck1APHAHccLZhox+tZi8nNu2RA74RErX8s3Pg@mail.gmail.com>). Looking at it more carefully the addition of "autodie" inadvertently introduced a logic error, since having it is equivalent to this patch: @@ -245,10 +244,10 @@ sub load_netrc { if ($gpgmode) { my @cmd = ($options{'gpg'}, qw(--decrypt), $file); log_verbose("Using GPG to open $file: [@cmd]"); - open $io, "-|", @cmd; + open $io, "-|", @cmd or die "@cmd: $!"; } else { log_verbose("Opening $file..."); - open $io, '<', $file; + open $io, '<', $file or die "$file: $!$!; } # nothing to do if the open failed (we log the error later) As shown in the context the intent of that code is not do die but to log the error later. Per my reading of the file this was the only thing autodie was doing in this file (there was no other code it altered). So let's remove it, both to fix the logic error and to get rid of the dependency. 1. <87efhfvxzu.fsf@evledraar.gmail.com> (https://public-inbox.org/git/87efhfvxzu.fsf@evledraar.gmail.com/) 2. <CAHqJXRE8OKSKcck1APHAHccLZhox+tZi8nNu2RA74RErX8s3Pg@mail.gmail.com> (https://public-inbox.org/git/CAHqJXRE8OKSKcck1APHAHccLZhox+tZi8nNu2RA74RErX8s3Pg@mail.gmail.com/) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 June 2018, 16:49:50 UTC |
| 3deed5e | Luke Diamand | 08 June 2018, 20:32:48 UTC | git-p4: auto-size the block git-p4 originally would fetch changes in one query. On large repos this could fail because of the limits that Perforce imposes on the number of items returned and the number of queries in the database. To fix this, git-p4 learned to query changes in blocks of 512 changes, However, this can be very slow - if you have a few million changes, with each chunk taking about a second, it can be an hour or so. Although it's possible to tune this value manually with the "--changes-block-size" option, it's far from obvious to ordinary users that this is what needs doing. This change alters the block size dynamically by looking for the specific error messages returned from the Perforce server, and reducing the block size if the error is seen, either to the limit reported by the server, or to half the current block size. That means we can start out with a very large block size, and then let it automatically drop down to a value that works without error, while still failing correctly if some other error occurs. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 June 2018, 21:46:09 UTC |
| 8fa0abf | Luke Diamand | 08 June 2018, 20:32:47 UTC | git-p4: narrow the scope of exceptions caught when parsing an int The current code traps all exceptions around some code which parses an integer, and then talks to Perforce. That can result in errors from Perforce being ignored. Change the code to only catch the integer conversion exceptions. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 June 2018, 21:46:09 UTC |
| 55bb3e3 | Luke Diamand | 08 June 2018, 20:32:46 UTC | git-p4: raise exceptions from p4CmdList based on error from p4 server This change lays some groundwork for better handling of rowcount errors from the server, where it fails to send us results because we requested too many. It adds an option to p4CmdList() to return errors as a Python exception. The exceptions are derived from P4Exception (something went wrong), P4ServerException (the server sent us an error code) and P4RequestSizeException (we requested too many rows/results from the server database). This makes the code that handles the errors a bit easier. The default behavior is unchanged; the new code is enabled with a flag. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 June 2018, 21:46:09 UTC |
| 0ef67ac | Luke Diamand | 08 June 2018, 20:32:45 UTC | git-p4: better error reporting when p4 fails Currently when p4 fails to run, git-p4 just crashes with an obscure error message. For example, if the P4 ticket has expired, you get: Error: Cannot locate perforce checkout of <path> in client view This change checks whether git-p4 can talk to the Perforce server when the first P4 operation is attempted, and tries to print a meaningful error message if it fails. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 June 2018, 21:46:09 UTC |
| b9d34db | Luke Diamand | 08 June 2018, 20:32:44 UTC | git-p4: add option to disable syncing of p4/master with p4 Add an option to the git-p4 submit command to disable syncing with Perforce. This is useful for the case where a git-p4 mirror has been setup on a server somewhere, running from (e.g.) cron, and developers then clone from this. Having the local cloned copy also sync from Perforce just isn't useful. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 June 2018, 21:46:08 UTC |
| 3b3477e | Luke Diamand | 08 June 2018, 20:32:43 UTC | git-p4: disable-rebase: allow setting this via configuration This just lets you set the --disable-rebase option with the git configuration options git-p4.disableRebase. If you're using this option, you probably want to set it all the time for a given repo. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 June 2018, 21:46:08 UTC |
| f55b87c | Romain Merland | 01 June 2018, 07:46:14 UTC | git-p4: add options --commit and --disable-rebase On a daily work with multiple local git branches, the usual way to submit only a specified commit was to cherry-pick the commit on master then run git-p4 submit. It can be very annoying to switch between local branches and master, only to submit one commit. The proposed new way is to select directly the commit you want to submit. Add option --commit to command 'git-p4 submit' in order to submit only specified commit(s) in p4. On a daily work developping software with big compilation time, one may not want to rebase on his local git tree, in order to avoid long recompilation. Add option --disable-rebase to command 'git-p4 submit' in order to disable rebase after submission. Thanks-to: Cedric Borgese <cedric.borgese@gmail.com> Reviewed-by: Luke Diamand <luke@diamand.org> Signed-off-by: Romain Merland <merlorom@yahoo.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 June 2018, 21:45:16 UTC |
| 58ebd93 | Kyle Meyer | 09 June 2018, 15:19:43 UTC | gitworkflows: fix grammar in 'Merge upwards' rule Signed-off-by: Kyle Meyer <kyle@kyleam.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 June 2018, 17:19:48 UTC |
| 61d48c6 | SZEDER Gábor | 11 June 2018, 18:20:53 UTC | completion: correct zsh detection when run from git-completion.zsh v2.18.0-rc0~90^2 (completion: reduce overhead of clearing cached --options, 2018-04-18) worked around a bug in bash's "set" builtin on MacOS by using compgen instead. It was careful to avoid breaking zsh by guarding this workaround with if [[ -n ${ZSH_VERSION-}} ]] Alas, this interacts poorly with git-completion.zsh's bash emulation: ZSH_VERSION='' . "$script" Correct it by instead using a new GIT_SOURCING_ZSH_COMPLETION shell variable to detect whether git-completion.bash is being sourced from git-completion.zsh. This way, the zsh variant is used both when run from zsh directly and when run via git-completion.zsh. Reproduction recipe: 1. cd git/contrib/completion && cp git-completion.zsh _git 2. Put the following in a new ~/.zshrc file: autoload -U compinit; compinit autoload -U bashcompinit; bashcompinit fpath=(~/src/git/contrib/completion $fpath) 3. Open zsh and "git <TAB>". With this patch: Triggers nice git-completion.bash based tab completion Without: contrib/completion/git-completion.bash:354: read-only variable: QISUFFIX zsh:12: command not found: ___main zsh:15: _default: function definition file not found _dispatch:70: bad math expression: operand expected at `/usr/bin/g...' Segmentation fault Reported-by: Rick van Hattem <wolph@wol.ph> Reported-by: Dave Borowitz <dborowitz@google.com> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 June 2018, 17:13:44 UTC |
| 2904c25 | Alexander Shopov | 12 June 2018, 07:35:27 UTC | l10n: bg.po: Updated Bulgarian translation (3608t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 12 June 2018, 07:38:49 UTC |
| 3737746 | Junio C Hamano | 11 June 2018, 22:09:18 UTC | index-pack: correct install_packed_git() args The function does not start taking the repository object as a parameter before v2.18 track. Make the topic mergeable to v2.17 maintenance track by dropping it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 June 2018, 22:09:18 UTC |
| 7eedad1 | Robert P. J. Day | 11 June 2018, 13:56:13 UTC | diff-options.txt: fix minor typos, font inconsistencies, in docs Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 June 2018, 20:11:09 UTC |
| 40aac22 | Leif Middelschulte | 11 June 2018, 17:31:28 UTC | merge-submodule: reduce output verbosity The output shall behave more similar to ordinary file merges' output to provide a more consistent user experience. Signed-off-by: Leif Middelschulte <Leif.Middelschulte@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 June 2018, 18:03:55 UTC |
| 47cc913 | Jeff King | 11 June 2018, 08:35:45 UTC | fsck: avoid looking at NULL blob->object Commit 159e7b080b (fsck: detect gitmodules files, 2018-05-02) taught fsck to look at the content of .gitmodules files. If the object turns out not to be a blob at all, we just complain and punt on checking the content. And since this was such an obvious and trivial code path, I didn't even bother to add a test. Except it _does_ do one non-trivial thing, which is call the report() function, which wants us to pass a pointer to a "struct object". Which we don't have (we have only a "struct object_id"). So we erroneously pass a NULL object to report(), which gets dereferenced and causes a segfault. It seems like we could refactor report() to just take the object_id itself. But we pass the object pointer along to a callback function, and indeed this ends up in builtin/fsck.c's objreport() which does want to look at other parts of the object (like the type). So instead, let's just use lookup_unknown_object() to get the real "struct object", and pass that. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 June 2018, 17:56:06 UTC |
| 431acd2 | Jeff King | 11 June 2018, 08:35:40 UTC | t7415: don't bother creating commit for symlink test Early versions of the fsck .gitmodules detection code actually required a tree to be at the root of a commit for it to be checked for .gitmodules. What we ended up with in 159e7b080b (fsck: detect gitmodules files, 2018-05-02), though, finds a .gitmodules file in _any_ tree (see that commit for more discussion). As a result, there's no need to create a commit in our tests. Let's drop it in the name of simplicity. And since that was the only thing referencing $tree, we can pull our tree creation out of a command substitution. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 June 2018, 17:56:04 UTC |
| 6f333ff | Junio C Hamano | 11 June 2018, 16:15:34 UTC | RelNotes 2.18: typofixes Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 June 2018, 16:15:34 UTC |
| 425e504 | Christopher Diaz Riveros | 10 June 2018, 19:08:26 UTC | l10n: es.po: Spanish update for v2.18.0 round 2 Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org> | 10 June 2018, 19:08:26 UTC |
| e93f5ec | Peter Krefting | 08 June 2018, 21:53:44 UTC | l10n: sv.po: Update Swedish translation (3608t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 08 June 2018, 21:53:44 UTC |
| cdd9311 | Peter Krefting | 01 June 2018, 13:45:34 UTC | l10n: sv.po: Update Swedish translation (3470t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 08 June 2018, 20:37:32 UTC |
| 5589271 | Jiang Xin | 08 June 2018, 01:17:29 UTC | l10n: git.pot: v2.18.0 round 2 (144 new, 6 removed) Generate po/git.pot from v2.18.0-rc1 for git v2.18.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 08 June 2018, 01:17:29 UTC |
| 098a3ff | Jiang Xin | 08 June 2018, 01:01:56 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: fr.po v2.18 round 1 l10n: vi(3470t): Updated Vietnamese translation for v2.18.0 l10n: es.po: Spanish update for v2.18.0 round 1 l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed) l10n: TEAMS: remove inactive de team members l10n: de.po: fix typos l10n: Update Catalan translation | 08 June 2018, 01:01:56 UTC |
| 3e55249 | Junio C Hamano | 04 June 2018, 12:41:41 UTC | Git 2.18-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2018, 12:41:41 UTC |
| e66e8f9 | Junio C Hamano | 04 June 2018, 12:39:50 UTC | Merge branch 'bc/t3430-fixup' Test fix. * bc/t3430-fixup: t3430: test clean-up | 04 June 2018, 12:39:50 UTC |
| 01cbd9e | Junio C Hamano | 04 June 2018, 12:39:50 UTC | Merge branch 'bw/refspec-api' Hotfix. * bw/refspec-api: refspec-api: avoid uninitialized field in refspec item | 04 June 2018, 12:39:50 UTC |
| 7fe48cb | Junio C Hamano | 04 June 2018, 12:39:49 UTC | Merge branch 'tg/doc-sec-list' Doc update. * tg/doc-sec-list: note git-security@googlegroups.com in more places SubmittingPatches: replace numbered attributes with names | 04 June 2018, 12:39:49 UTC |
| c45505d | Junio C Hamano | 04 June 2018, 12:39:49 UTC | Merge branch 'rd/p4-doc-markup-env' Doc markup update. * rd/p4-doc-markup-env: p4.txt: Use backquotes for variable names | 04 June 2018, 12:39:49 UTC |
| 643a9ea | Junio C Hamano | 04 June 2018, 12:39:48 UTC | Merge branch 'nd/remote-update-doc' "git remote update" can take both a single remote nickname and a nickname for remote groups, but only one of them was documented. * nd/remote-update-doc: remote: doc typofix remote.txt: update documentation for 'update' command | 04 June 2018, 12:39:49 UTC |
