| 744437f | Stefan Beller | 23 September 2014, 12:54:46 UTC | l10n: de.po: Fixup one translation English grammar with German words doesn't make it a German translation. ;) Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 15 November 2014, 17:21:58 UTC |
| 99474b6 | David Aguilar | 14 November 2014, 21:33:55 UTC | difftool: honor --trust-exit-code for builtin tools run_merge_tool() was not setting $status, which prevented the exit code for builtin tools from being forwarded to the caller. Capture the exit status and add a test to guarantee the behavior. Reported-by: Adria Farres <14farresa@gmail.com> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 November 2014, 21:40:38 UTC |
| 49e0c5a | Junio C Hamano | 14 November 2014, 21:31:15 UTC | Git 2.2.0-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 November 2014, 21:31:15 UTC |
| c616d84 | Ralf Thielow | 19 September 2014, 16:38:13 UTC | l10n: de.po: use imperative form for command options Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 14 November 2014, 18:21:52 UTC |
| d372395 | Jeff King | 13 November 2014, 21:43:31 UTC | approxidate: allow ISO-like dates far in the future When we are parsing approxidate strings and we find three numbers separate by one of ":/-.", we guess that it may be a date. We feed the numbers to match_multi_number, which checks whether it makes sense as a date in various orderings (e.g., dd/mm/yy or mm/dd/yy, etc). One of the checks we do is to see whether it is a date more than 10 days in the future. This was added in 38035cf (date parsing: be friendlier to our European friends., 2006-04-05), and lets us guess that if it is currently April 2014, then "10/03/2014" is probably March 10th, not October 3rd. This has a downside, though; if you want to be overly generous with your "--until" date specification, we may wrongly parse "2014-12-01" as "2014-01-12" (because the latter is an in-the-past date). If the year is a future year (i.e., both are future dates), it gets even weirder. Due to the vagaries of approxidate, months _after_ the current date (no matter the year) get flipped, but ones before do not. This patch drops the "in the future" check for dates of this form, letting us treat them always as yyyy-mm-dd, even if they are in the future. This does not affect the normal dd/mm/yyyy versus mm/dd/yyyy lookup, because this code path only kicks in when the first number is greater than 70 (i.e., it must be a year, and cannot be either a date or a month). The one possible casualty is that "yyyy-dd-mm" is less likely to be chosen over "yyyy-mm-dd". That's probably OK, though because: 1. The difference happens only when the date is in the future. Already we prefer yyyy-mm-dd for dates in the past. 2. It's unclear whether anybody even uses yyyy-dd-mm regularly. It does not appear in lists of common date formats in Wikipedia[1,2]. 3. Even if (2) is wrong, it is better to prefer ISO-like dates, as that is consistent with what we use elsewhere in git. [1] http://en.wikipedia.org/wiki/Date_and_time_representation_by_country [2] http://en.wikipedia.org/wiki/Calendar_date Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 November 2014, 22:40:47 UTC |
| c5326bd | Jeff King | 13 November 2014, 18:30:34 UTC | checkout $tree: do not throw away unchanged index entries When we "git checkout $tree", we pull paths from $tree into the index, and then check the resulting entries out to the worktree. Our method for the first step is rather heavy-handed, though; it clobbers the entire existing index entry, even if the content is the same. This means we lose our stat information, leading checkout_entry to later rewrite the entire file with identical content. Instead, let's see if we have the identical entry already in the index, in which case we leave it in place. That lets checkout_entry do the right thing. Our tests cover two interesting cases: 1. We make sure that a file which has no changes is not rewritten. 2. We make sure that we do update a file that is unchanged in the index (versus $tree), but has working tree changes. We keep the old index entry, and checkout_entry is able to realize that our stat information is out of date. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 November 2014, 22:35:41 UTC |
| 073281e | Jeff King | 13 November 2014, 11:04:52 UTC | pass TIME_DATE_NOW to approxidate future-check The approxidate functions accept an extra "now" parameter to avoid calling time() themselves. We use this in our test suite to make sure we have a consistent time for computing relative dates. However, deep in the bowels of approxidate, we also call time() to check whether possible dates are far in the future. Let's make sure that the "now" override makes it to that spot, too, so we can consistently test that feature. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 November 2014, 20:57:28 UTC |
| 8942821 | Stefan Naewe | 13 November 2014, 10:40:07 UTC | gittutorial: fix output of 'git status' 'git status' doesn't output leading '#'s these days. Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 November 2014, 18:53:50 UTC |
| f904f66 | Torsten Bögershausen | 13 November 2014, 07:36:07 UTC | t5705: the file:// URL should be absolute The test misused a URL "file://." to mean "relative to here", which we no longer accept. In a file:// URL, typically there is no host, and RFC1738 says that file:///<path> should be used. Update t5705 to use a working URL. Reported-by: Michael Blume <blume.mike@gmail.com> Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 November 2014, 18:41:56 UTC |
| faa8fac | Slavomir Vlcek | 12 November 2014, 23:18:39 UTC | SubmittingPatches: final submission is To: maintainer and CC: list In an earlier part there is: "re-send it with "To:" set to the maintainer [*1*] and "cc:" the list [*2*]" for the final submission, but later we see "Send it to the list and cc the maintainer." Fix the later one to match the previous. Signed-off-by: Slavomir Vlcek <svlc@inventati.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 November 2014, 18:39:24 UTC |
| f570943 | Junio C Hamano | 12 November 2014, 20:12:50 UTC | Update draft release notes to 2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 November 2014, 20:13:39 UTC |
| 9c70e2c | Junio C Hamano | 12 November 2014, 20:13:25 UTC | Sync with 'maint' | 12 November 2014, 20:13:25 UTC |
| 7fa1365 | Junio C Hamano | 12 November 2014, 20:13:11 UTC | Merge branch 'nd/gitignore-trailing-whitespace' into maint * nd/gitignore-trailing-whitespace: gitignore.txt: fix spelling of "backslash" | 12 November 2014, 20:13:12 UTC |
| bbebdc1 | Junio C Hamano | 12 November 2014, 19:59:58 UTC | Merge branch 'jk/fetch-reflog-df-conflict' Fix-up a test for portability. * jk/fetch-reflog-df-conflict: t1410: fix breakage on case-insensitive filesystems | 12 November 2014, 19:59:58 UTC |
| 2672671 | Max Horn | 11 November 2014, 20:17:07 UTC | doc: add some crossrefs between manual pages In particular, git-fast-import and -export link to each other, and gitremote-helpers links to existing remote helpers, and vice versa. Also link to fast-import from the remote helper spec, as this is relevant for remote helpers using the fast-import format. Signed-off-by: Max Horn <max@quendi.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 November 2014, 22:47:04 UTC |
| 022cf2b | Thomas Ackermann | 11 November 2014, 19:13:36 UTC | gittutorial.txt: remove reference to ancient Git version Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 November 2014, 22:46:08 UTC |
| f6f61cb | Junio C Hamano | 11 November 2014, 20:45:48 UTC | Sync with maint * maint: | 11 November 2014, 20:45:48 UTC |
| caea1a2 | Junio C Hamano | 11 November 2014, 18:20:13 UTC | Merge branch 'rs/clean-menu-item-defn' into maint * rs/clean-menu-item-defn: clean: use f(void) instead of f() to declare a pointer to a function without arguments | 11 November 2014, 18:20:13 UTC |
| 6066a7e | René Scharfe | 10 November 2014, 21:17:00 UTC | run-command: use void to declare that functions take no parameters Explicitly declare that git_atexit_dispatch() and git_atexit_clear() take no parameters instead of leaving their parameter list empty and thus unspecified. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 November 2014, 22:43:19 UTC |
| 80b581d | Junio C Hamano | 10 November 2014, 19:59:30 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: Updated Bulgarian translation of git (2296t,0f,0u) l10n: zh_CN: translations for git v2.2.0-rc0 l10n: sv.po: Update Swedish translation (2296t0f0u) l10n: fr.po (2296t) update for version 2.2.0 l10n: vi.po: Update new message strings l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed) | 10 November 2014, 19:59:30 UTC |
| a4c4708 | Junio C Hamano | 10 November 2014, 19:26:18 UTC | Sync with maint * maint: Documentation/config.txt: fix minor typo config.txt: fix typo | 10 November 2014, 19:26:18 UTC |
| bd51886 | Junio C Hamano | 10 November 2014, 19:26:09 UTC | Merge branch 'js/diff-highlight-avoid-sigpipe' * js/diff-highlight-avoid-sigpipe: diff-highlight: exit when a pipe is broken | 10 November 2014, 19:26:09 UTC |
| a79c3a1 | Thomas Quinot | 08 November 2014, 10:45:39 UTC | Documentation/config.txt: fix minor typo Add a missing article at the beginning of a sentence, and rephrase slightly. Signed-off-by: Thomas Quinot <thomas@quinot.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 November 2014, 19:25:26 UTC |
| 71069cd | Nicolas Dermine | 09 November 2014, 16:19:33 UTC | config.txt: fix typo Signed-off-by: Nicolas Dermine <nicolas.dermine@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 November 2014, 18:06:25 UTC |
| b226293 | René Scharfe | 09 November 2014, 13:49:58 UTC | trailer: use CHILD_PROCESS_INIT in apply_command() Initialize the struct child_process variable cp at declaration time. This is shorter, saves a function call and prevents using the variable before initialization by mistake. Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 November 2014, 18:03:39 UTC |
| d52adf1 | Christian Couder | 09 November 2014, 09:23:40 UTC | trailer: display a trailer without its trailing newline Trailers passed to the parse_trailer() function often have a trailing newline. When erroring out, we should display the invalid trailer properly, that means without any trailing newline. Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 November 2014, 17:43:59 UTC |
| 2887103 | Christian Couder | 09 November 2014, 09:23:39 UTC | trailer: ignore comment lines inside the trailers Otherwise trailers that are commented out might be processed. We would also error out if the comment line char is also a separator. This means that comments inside a trailer block will disappear, but that was already the case anyway. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 November 2014, 17:43:16 UTC |
| aae828b | Jeff King | 09 November 2014, 01:59:18 UTC | t1410: fix breakage on case-insensitive filesystems Two tests recently added to t1410 create branches "a" and "a/b" to test d/f conflicts on reflogs. Earlier, unrelated tests in that script create the path "A/B" in the working tree. There's no conflict on a case-sensitive filesystem, but on a case-insensitive one, "git log" will complain that "a/b" is both a revision and a working tree path. We could fix this by using a "--" to disambiguate, but we are probably better off using names that are less confusing to make it more clear that they are unrelated to the working tree files. This patch turns "a/b" into "one/two". Reported-by: Michael Blume <blume.mike@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 November 2014, 17:38:53 UTC |
| 66edfe9 | Junio C Hamano | 07 November 2014, 20:01:01 UTC | Git 2.2.0-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 November 2014, 20:01:01 UTC |
| d956a20 | Junio C Hamano | 07 November 2014, 19:55:40 UTC | Documentation/git-commit: clarify that --only/--include records the working tree contents With the original phrasing, it is possible to misunderstand as if the contents in the index for only the specified paths are made into the new commit. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 November 2014, 19:57:57 UTC |
| a1ad247 | Junio C Hamano | 06 November 2014, 18:52:51 UTC | Merge branch 'maint' * maint: docs/credential-store: s/--store/--file/ | 06 November 2014, 18:52:51 UTC |
| 32da67b | Junio C Hamano | 06 November 2014, 18:52:40 UTC | Merge branch 'nd/gitignore-trailing-whitespace' Documentation update. * nd/gitignore-trailing-whitespace: gitignore.txt: fix spelling of "backslash" | 06 November 2014, 18:52:40 UTC |
| 64b9326 | Junio C Hamano | 06 November 2014, 18:52:36 UTC | Merge branch 'tm/line-log-first-parent' "git log --first-parent -L..." used to crash. * tm/line-log-first-parent: line-log: fix crash when --first-parent is used | 06 November 2014, 18:52:37 UTC |
| a1671dd | Junio C Hamano | 06 November 2014, 18:52:31 UTC | Merge branch 'jk/fetch-reflog-df-conflict' Corner-case bugfixes for "git fetch" around reflog handling. * jk/fetch-reflog-df-conflict: ignore stale directories when checking reflog existence fetch: load all default config at startup | 06 November 2014, 18:52:32 UTC |
| 6b55f8b | Junio C Hamano | 06 November 2014, 18:52:23 UTC | Merge branch 'rs/use-child-process-init-more' * rs/use-child-process-init-more: bundle: split out ref writing from bundle_create bundle: split out a helper function to compute and write prerequisites bundle: split out a helper function to create pack data use child_process_init() to initialize struct child_process variables | 06 November 2014, 18:52:23 UTC |
| e44da1b | Junio C Hamano | 06 November 2014, 18:51:35 UTC | Merge branch 'jk/cache-tree-protect-from-broken-libgit2' The code to use cache-tree trusted the on-disk data too much and fell into an infinite loop. * jk/cache-tree-protect-from-broken-libgit2: cache-tree: avoid infinite loop on zero-entry tree | 06 November 2014, 18:51:35 UTC |
| e50cd67 | Jeff King | 06 November 2014, 07:40:32 UTC | docs/credential-store: s/--store/--file/ The option name "--store" was used early in development, but never even made it into an applied patch, let alone a released version of git. I forgot to update the matching documentation at the time, though. Noticed-by: Jesse Hopkins <jesse.hopkins@lmco.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 November 2014, 17:51:08 UTC |
| 03af7cd | Ben North | 04 November 2014, 22:18:33 UTC | gitignore.txt: fix spelling of "backslash" Signed-off-by: Ben North <ben@redfrontdoor.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 November 2014, 22:44:47 UTC |
| 251e7da | John Szakmeister | 04 November 2014, 20:01:12 UTC | diff-highlight: exit when a pipe is broken While using diff-highlight with other tools, I have discovered that Python ignores SIGPIPE by default. Unfortunately, this also means that tools attempting to launch a pager under Python--and don't realize this is happening--means that the subprocess inherits this setting. In this case, it means diff-highlight will be launched with SIGPIPE being ignored. Let's work with those broken scripts by restoring the default SIGPIPE handler. Signed-off-by: John Szakmeister <john@szakmeister.net> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 November 2014, 21:18:35 UTC |
| f745acb | Thomas Ackermann | 03 November 2014, 20:37:07 UTC | Documentation: typofixes In addition to fixing trivial and obvious typos, be careful about the following points: - Spell ASCII, URL and CRC in ALL CAPS; - Spell Linux as Capitalized; - Do not omit periods in "i.e." and "e.g.". Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 November 2014, 21:14:44 UTC |
| a8787c5 | Tzvetan Mikov | 04 November 2014, 20:33:37 UTC | line-log: fix crash when --first-parent is used line-log tries to access all parents of a commit, but only the first parent has been loaded if "--first-parent" is specified, resulting in a crash. Limit the number of parents to one if "--first-parent" is specified. Reported-by: Eric N. Vander Weele <ericvw@gmail.com> Signed-off-by: Tzvetan Mikov <tmikov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 November 2014, 20:47:35 UTC |
| 9233887 | Jeff King | 04 November 2014, 13:24:53 UTC | ignore stale directories when checking reflog existence When we update a ref, we have two rules for whether or not we actually update the reflog: 1. If the reflog already exists, we will always append to it. 2. If log_all_ref_updates is set, we will create a new reflog file if necessary. We do the existence check by trying to open the reflog file, either with or without O_CREAT (depending on log_all_ref_updates). If it fails, then we check errno to see what happened. If we were not using O_CREAT and we got ENOENT, the file doesn't exist, and we return success (there isn't a reflog already, and we were not told to make a new one). If we get EISDIR, then there is likely a stale directory that needs to be removed (e.g., there used to be "foo/bar", it was deleted, and the directory "foo" was left. Now we want to create the ref "foo"). If O_CREAT is set, then we catch this case, try to remove the directory, and retry our open. So far so good. But if we get EISDIR and O_CREAT is not set, then we treat this as any other error, which is not right. Like ENOENT, EISDIR is an indication that we do not have a reflog, and we should silently return success (we were not told to create it). Instead, the current code reports this as an error, and we fail to update the ref at all. Note that this is relatively unlikely to happen, as you would have to have had reflogs turned on, and then later turned them off (it could also happen due to a bug in fetch, but that was fixed in the previous commit). However, it's quite easy to fix: we just need to treat EISDIR like ENOENT for the non-O_CREAT case, and silently return (note that this early return means we can also simplify the O_CREAT case). Our new tests cover both cases (O_CREAT and non-O_CREAT). The first one already worked, of course. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 November 2014, 20:18:44 UTC |
| 72549df | Jeff King | 04 November 2014, 13:11:19 UTC | fetch: load all default config at startup When we start the git-fetch program, we call git_config to load all config, but our callback only processes the fetch.prune option; we do not chain to git_default_config at all. This means that we may not load some core configuration which will have an effect. For instance, we do not load core.logAllRefUpdates, which impacts whether or not we create reflogs in a bare repository. Note that I said "may" above. It gets even more exciting. If we have to transfer actual objects as part of the fetch, then we call fetch_pack as part of the same process. That function loads its own config, which does chain to git_default_config, impacting global variables which are used by the rest of fetch. But if the fetch is a pure ref update (e.g., a new ref which is a copy of an old one), we skip fetch_pack entirely. So we get inconsistent results depending on whether or not we have actual objects to transfer or not! Let's just load the core config at the start of fetch, so we know we have it (we may also load it again as part of fetch_pack, but that's OK; it's designed to be idempotent). Our tests check both cases (with and without a pack). We also check similar behavior for push for good measure, but it already works as expected. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 November 2014, 20:13:46 UTC |
| dd83521 | Matthieu Moy | 03 November 2014, 15:12:00 UTC | RelNotes/2.2.0.txt: fix minor typos Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 November 2014, 19:29:10 UTC |
| 6c31a5e | Alexander Shopov | 17 October 2014, 19:39:45 UTC | l10n: Updated Bulgarian translation of git (2296t,0f,0u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 02 November 2014, 17:11:08 UTC |
| 220c313 | Jiang Xin | 08 October 2014, 02:55:14 UTC | l10n: zh_CN: translations for git v2.2.0-rc0 Translate 62 new messages (2296t0f0u) for git v2.2.0-rc0. Also changed the translation of bare (repository). Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 02 November 2014, 02:59:00 UTC |
| 94dd79e | Jiang Xin | 02 November 2014, 02:12:29 UTC | Merge branch 'fr_2.2.0' of git://github.com/jnavila/git * 'fr_2.2.0' of git://github.com/jnavila/git: l10n: fr.po (2296t) update for version 2.2.0 | 02 November 2014, 02:12:29 UTC |
| ac4a73d | Jiang Xin | 02 November 2014, 02:11:27 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 (2296t0f0u) | 02 November 2014, 02:11:27 UTC |
| 5331bfd | Peter Krefting | 01 November 2014, 19:17:37 UTC | l10n: sv.po: Update Swedish translation (2296t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 01 November 2014, 19:17:37 UTC |
| f507e5d | Jean-Noel Avila | 01 November 2014, 15:29:19 UTC | l10n: fr.po (2296t) update for version 2.2.0 Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Grégoire Paris <gparis@universcine.com> | 01 November 2014, 15:51:49 UTC |
| 4dcd03e | Tran Ngoc Quan | 01 November 2014, 02:07:24 UTC | l10n: vi.po: Update new message strings Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 01 November 2014, 02:07:24 UTC |
| d07a63e | Jiang Xin | 31 October 2014, 23:47:46 UTC | l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed) Generate po/git.pot from v2.2.0-rc0 for git v2.2.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 31 October 2014, 23:47:46 UTC |
| 4ace7ff | Junio C Hamano | 31 October 2014, 18:57:23 UTC | Git 2.2.0-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2014, 18:57:23 UTC |
| ef59f32 | Junio C Hamano | 31 October 2014, 18:50:20 UTC | Merge branch 'for-junio' of git://bogomips.org/git-svn * 'for-junio' of git://bogomips.org/git-svn: git-svn: use SVN::Ra::get_dir2 when possible git-svn: add space after "W:" prefix in warning git-svn: (cleanup) remove editor param passing git-svn: prepare SVN::Ra config pieces once Git.pm: add specified name to tempfile template git-svn: disable _rev_list memoization git-svn: save a little memory as fetch progresses git-svn: remove unnecessary DESTROY override git-svn: reload RA every log-window-size git-svn.txt: advertise pushurl with dcommit git-svn: remove mergeinfo rev caching git-svn: cache only mergeinfo revisions git-svn: reduce check_cherry_pick cache overhead git-svn: only look at the root path for svn:mergeinfo git-svn: only look at the new parts of svn:mergeinfo | 31 October 2014, 18:50:20 UTC |
| 1d42cf3 | Junio C Hamano | 31 October 2014, 18:49:53 UTC | Merge branch 'jc/push-cert' * jc/push-cert: receive-pack: avoid minor leak in case start_async() fails | 31 October 2014, 18:49:55 UTC |
| 598d7eb | Junio C Hamano | 31 October 2014, 18:49:48 UTC | Merge branch 'rs/child-process-init' * rs/child-process-init: api-run-command: add missing list item marker | 31 October 2014, 18:49:49 UTC |
| bf1f639 | Junio C Hamano | 31 October 2014, 18:49:37 UTC | Merge branch 'rs/grep-color-words' Allow painting or not painting (partial) matches in context lines when showing "grep -C<num>" output in color. * rs/grep-color-words: grep: add color.grep.matchcontext and color.grep.matchselected | 31 October 2014, 18:49:47 UTC |
| 7ffa35b | Eric Wong | 31 October 2014, 10:34:03 UTC | git-svn: use SVN::Ra::get_dir2 when possible This avoids the following failure with normal "get_dir" on newer versions of SVN (tested with SVN 1.8.8-1ubuntu3.1): Incorrect parameters given: Could not convert '%ld' into a number get_dir2 also has the potential to be more efficient by requesting less data. ref: <1414636504.45506.YahooMailBasic@web172304.mail.ir2.yahoo.com> ref: <1414722617.89476.YahooMailBasic@web172305.mail.ir2.yahoo.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Cc: Hin-Tak Leung <htl10@users.sourceforge.net> | 31 October 2014, 10:34:54 UTC |
| d9362ef | Jeff King | 30 October 2014, 21:35:24 UTC | bundle: split out ref writing from bundle_create The bundle_create() function has a number of logical steps: process the input, write the refs, and write the packfile. Recent commits split the first and third into separate sub-functions. It's worth splitting the middle step out, too, if only because it makes the progression of the steps more obvious. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 October 2014, 21:52:45 UTC |
| e8eb251 | Junio C Hamano | 30 October 2014, 18:01:37 UTC | bundle: split out a helper function to compute and write prerequisites The new helper compute_and_write_prerequistes() is ugly, but it cannot be avoided. Ideally we should avoid a function that computes and does I/O at the same time, but the prerequisites lines in the output needs the human readable title only to help the recipient of the bundle. The code copies them straight from the rev-list output and immediately discards as no other internal computation needs that information. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 October 2014, 21:51:47 UTC |
| 5e626b9 | Junio C Hamano | 30 October 2014, 17:45:41 UTC | bundle: split out a helper function to create pack data The create_bundle() function, while it does one single logical thing, takes a rather large implementation to do so. Let's start separating what it does into smaller steps to make it easier to see what is going on. This is a first step to separate out the actual pack-data generation, after the earlier part of the function figures out which part of the history to place in the bundle. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 October 2014, 21:45:52 UTC |
| 729dbbd | Jeff King | 29 October 2014, 17:11:58 UTC | cache-tree: avoid infinite loop on zero-entry tree The loop in cache-tree's update_one iterates over all the entries in the index. For each one, we find the cache-tree subtree which represents our path (creating it if necessary), and then recurse into update_one again. The return value we get is the number of index entries that belonged in that subtree. So for example, with entries: a/one a/two b/one We start by processing the first entry, "a/one". We would find the subtree for "a" and recurse into update_one. That would then handle "a/one" and "a/two", and return the value 2. The parent function then skips past the 2 handled entries, and we continue by processing "b/one". If the recursed-into update_one ever returns 0, then we make no forward progress in our loop. We would process "a/one" over and over, infinitely. This should not happen normally. Any subtree we create must have at least one path in it (the one that we are processing!). However, we may also reuse a cache-tree entry we found in the on-disk index. For the same reason, this should also never have zero entries. However, certain buggy versions of libgit2 could produce such bogus cache-tree records. The libgit2 bug has since been fixed, but it does not hurt to protect ourselves against bogus input coming from the on-disk data structures. Note that this is not a die("BUG") or assert, because it is not an internal bug, but rather a corrupted on-disk structure. It's possible that we could even recover from it (by throwing out the bogus cache-tree entry), but it is not worth the effort; the important thing is that we report an error instead of looping infinitely. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 October 2014, 18:17:51 UTC |
| 81d645d | Junio C Hamano | 30 October 2014, 17:07:33 UTC | Merge git://ozlabs.org/~paulus/gitk * git://ozlabs.org/~paulus/gitk: gitk: Remove boilerplate for configuration variables gitk: Show detached HEAD if --all is specified gitk: Do not depend on Cygwin's "kill" command on Windows | 30 October 2014, 17:07:33 UTC |
| da0bc94 | Eric Wong | 30 October 2014, 08:31:28 UTC | git-svn: add space after "W:" prefix in warning And minor reformatting while we're in the area. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 30 October 2014, 08:31:28 UTC |
| 4ae9a7b | Eric Wong | 29 October 2014, 20:10:29 UTC | git-svn: (cleanup) remove editor param passing Neither find_extra_svk_parents or find_extra_svn_parents ever used the `$ed' parameter. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 30 October 2014, 08:29:43 UTC |
| 9fabefb | Max Kirillov | 14 September 2014, 20:35:57 UTC | gitk: Remove boilerplate for configuration variables Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Paul Mackerras <paulus@samba.org> | 29 October 2014, 22:43:15 UTC |
| 4d5e1b1 | Max Kirillov | 09 September 2014, 07:29:16 UTC | gitk: Show detached HEAD if --all is specified If HEAD is detached, 'gitk --all' does not show it. This is inconvenient for frontend program, and for example git log does show the detached HEAD. gitk uses git rev-parse to find a list of branches to show. Apparently, the command does not include detached HEAD to output if --all argument is specified. This has been discussed in [1] and stated as expected behavior. So rev-parse's parameters should be tuned in gitk. [1] http://thread.gmane.org/gmane.comp.version-control.git/255996 Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Paul Mackerras <paulus@samba.org> | 29 October 2014, 22:43:15 UTC |
| 7b68b0e | Sebastian Schuberth | 23 October 2014, 19:30:54 UTC | gitk: Do not depend on Cygwin's "kill" command on Windows Windows does not necessarily mean Cygwin, it could also be MSYS. The latter ships with a version of "kill" that does not understand "-f". In msysgit this was addressed by shipping Cygwin's version of kill. Properly fix this by using the stock Windows "taskkill" command instead, which is available since Windows XP Professional. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 29 October 2014, 22:43:11 UTC |
| 835e3dd | Eric Wong | 29 October 2014, 19:55:02 UTC | git-svn: prepare SVN::Ra config pieces once Memoizing these initialization functions saves some memory for long fetches which require scanning many unwanted revisions before any wanted revisions happen. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 29 October 2014, 19:59:25 UTC |
| 822aaf0 | Eric Wong | 29 October 2014, 19:31:55 UTC | Git.pm: add specified name to tempfile template This should help me track down errors in git-svn more easily: write .git/Git_XXXXXX: Bad file descriptor at /usr/lib/perl5/SVN/Ra.pm line 623 Signed-off-by: Eric Wong <normalperson@yhbt.net> | 29 October 2014, 19:59:23 UTC |
| 36666ce | Junio C Hamano | 29 October 2014, 17:49:54 UTC | Sync with Git 2.1.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 October 2014, 17:50:17 UTC |
| 49c3e92 | Junio C Hamano | 29 October 2014, 17:48:38 UTC | Git 2.1.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 October 2014, 17:48:45 UTC |
| ebc2e5a | Junio C Hamano | 29 October 2014, 17:35:17 UTC | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint * jk/pack-objects-no-bitmap-when-splitting: pack-objects: turn off bitmaps when we split packs | 29 October 2014, 17:35:17 UTC |
| 9db1838 | Junio C Hamano | 29 October 2014, 17:35:16 UTC | Merge branch 'da/mergetool-meld' into maint * da/mergetool-meld: mergetools/meld: make usage of `--output` configurable and more robust | 29 October 2014, 17:35:16 UTC |
| af1b4e3 | Junio C Hamano | 29 October 2014, 17:35:16 UTC | Merge branch 'rm/gitweb-start-form' into maint * rm/gitweb-start-form: gitweb: use start_form, not startform that was removed in CGI.pm 4.04 | 29 October 2014, 17:35:16 UTC |
| 27c31d2 | Junio C Hamano | 29 October 2014, 17:35:10 UTC | Merge branch 'bc/asciidoc-pretty-formats-fix' into maint * bc/asciidoc-pretty-formats-fix: Documentation: fix misrender of pretty-formats in Asciidoctor | 29 October 2014, 17:35:10 UTC |
| a8f01f8 | Junio C Hamano | 29 October 2014, 17:35:09 UTC | Merge branch 'rs/daemon-fixes' into maint * rs/daemon-fixes: daemon: remove write-only variable maxfd daemon: fix error message after bind() daemon: handle gethostbyname() error | 29 October 2014, 17:35:09 UTC |
| 5b509df | Junio C Hamano | 29 October 2014, 17:18:31 UTC | Update draft release notes to 2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 October 2014, 17:18:31 UTC |
| 9ce57f1 | Junio C Hamano | 29 October 2014, 17:09:35 UTC | Merge branch 'da/difftool' Allow diff tool backend to stop early by exiting with a non-zero status. * da/difftool: difftool: add support for --trust-exit-code difftool--helper: exit when reading a prompt answer fails | 29 October 2014, 17:09:35 UTC |
| e82935d | Junio C Hamano | 29 October 2014, 17:09:31 UTC | Merge branch 'rb/pack-window-memory-config-doc' * rb/pack-window-memory-config-doc: config.txt: pack.windowmemory limit applies per-thread | 29 October 2014, 17:09:31 UTC |
| 7654ca6 | Junio C Hamano | 29 October 2014, 17:08:15 UTC | Merge branch 'mg/lib-gpg-ro-safety' In a tarball extract whose files are all read-only, running GPG tests would have failed due to unwritable files. * mg/lib-gpg-ro-safety: t/lib-gpg: make gpghome files writable | 29 October 2014, 17:08:16 UTC |
| ce71c1f | Junio C Hamano | 29 October 2014, 17:08:06 UTC | Merge branch 'dm/port2zos' z/OS port * dm/port2zos: compat/bswap.h: detect endianness from XL C compiler macros Makefile: reorder linker flags in the git executable rule git-compat-util.h: support variadic macros with the XL C compiler | 29 October 2014, 17:08:07 UTC |
| c1777a2 | Junio C Hamano | 29 October 2014, 17:08:03 UTC | Merge branch 'oc/mergetools-beyondcompare' * oc/mergetools-beyondcompare: mergetool: rename bc3 to bc | 29 October 2014, 17:08:04 UTC |
| d70e331 | Junio C Hamano | 29 October 2014, 17:07:56 UTC | Merge branch 'jk/prune-mtime' Tighten the logic to decide that an unreachable cruft is sufficiently old by covering corner cases such as an ancient object becoming reachable and then going unreachable again, in which case its retention period should be prolonged. * jk/prune-mtime: (28 commits) drop add_object_array_with_mode revision: remove definition of unused 'add_object' function pack-objects: double-check options before discarding objects repack: pack objects mentioned by the index pack-objects: use argv_array reachable: use revision machinery's --indexed-objects code rev-list: add --indexed-objects option rev-list: document --reflog option t5516: test pushing a tag of an otherwise unreferenced blob traverse_commit_list: support pending blobs/trees with paths make add_object_array_with_context interface more sane write_sha1_file: freshen existing objects pack-objects: match prune logic for discarding objects pack-objects: refactor unpack-unreachable expiration check prune: keep objects reachable from recent objects sha1_file: add for_each iterators for loose and packed objects count-objects: use for_each_loose_file_in_objdir count-objects: do not use xsize_t when counting object size prune-packed: use for_each_loose_file_in_objdir reachable: mark index blobs as SEEN ... | 29 October 2014, 17:07:56 UTC |
| 853878d | Junio C Hamano | 29 October 2014, 17:07:39 UTC | Merge branch 'bc/asciidoctor' Add machinery to alternatively use AsciiDoctor to format our documentation. * bc/asciidoctor: Documentation: remove Asciidoctor linkgit macro Documentation: refactor common operations into variables Documentation: implement linkgit macro for Asciidoctor Documentation: move some AsciiDoc parameters into variables | 29 October 2014, 17:07:40 UTC |
| 96ef1bd | René Scharfe | 28 October 2014, 22:09:53 UTC | api-run-command: add missing list item marker Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 October 2014, 22:25:25 UTC |
| 8828f29 | René Scharfe | 28 October 2014, 20:52:34 UTC | use child_process_init() to initialize struct child_process variables Call child_process_init() instead of zeroing the memory of variables of type struct child_process by hand before use because the former is both clearer and shorter. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 October 2014, 21:56:17 UTC |
| 5d222c0 | René Scharfe | 28 October 2014, 20:27:54 UTC | receive-pack: avoid minor leak in case start_async() fails If the asynchronous start of copy_to_sideband() fails, then any env_array entries added to struct child_process proc by prepare_push_cert_sha1() are leaked. Call the latter function only after start_async() succeeded so that the allocated entries are cleaned up automatically by start_command() or finish_command(). Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 October 2014, 21:55:15 UTC |
| 2b52123 | David Aguilar | 27 October 2014, 01:15:42 UTC | difftool: add support for --trust-exit-code Teach difftool to exit when a diff tool returns a non-zero exit code when either --trust-exit-code is specified or difftool.trustExitCode is true. Forward exit codes from invoked diff tools to the caller when --trust-exit-code is used. Suggested-by: Adri Farr <14farresa@gmail.com> Helped-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 October 2014, 17:36:57 UTC |
| 79a7710 | René Scharfe | 27 October 2014, 18:23:05 UTC | grep: add color.grep.matchcontext and color.grep.matchselected The config option color.grep.match can be used to specify the highlighting color for matching strings. Add the options matchContext and matchSelected to allow different colors to be specified for matching strings in the context vs. in selected lines. This is similar to the ms and mc specifiers in GNU grep's environment variable GREP_COLORS. Tests are from Zoltan Klinger's earlier attempt to solve the same issue in a different way. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 October 2014, 17:33:50 UTC |
| f4694a8 | Robert de Bath | 24 October 2014, 07:43:27 UTC | config.txt: pack.windowmemory limit applies per-thread It took me a long time to notice the rider on the pack.threads configuration option that it would multiple the memory consumption by the number of CPUs in the machine. Clarify that the limit applies per-thread. Signed-off-by: Robert de Bath <rdebath@tvisiontech.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 October 2014, 16:59:41 UTC |
| e7f224f | Michael J Gruber | 24 October 2014, 15:23:32 UTC | t/lib-gpg: make gpghome files writable t/lib-gpg.sh copies the test environment's gpg home to the trash directory and makes sure the directoty is writable. Make sure the copied files are writable, too. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2014, 19:09:36 UTC |
| c6c3e0d | brian m. carlson | 27 October 2014, 00:13:43 UTC | Documentation: remove Asciidoctor linkgit macro Asciidoctor provides an extension implementing a backend-independent macro for dealing with manpage links just like the linkgit macro. As this is more likely to be up-to-date with future changes in Asciidoctor, prefer using it over reimplementing in Git. This reverts commit 773ee47c2b9c691d9758b2bea6cac10e3f0c4e12. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2014, 18:52:29 UTC |
| da8a366 | brian m. carlson | 27 October 2014, 00:13:42 UTC | Documentation: refactor common operations into variables The Makefile performs several very similar tasks to convert AsciiDoc files into either HTML or DocBook. Move these items into variables to reduce the duplication. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2014, 18:52:27 UTC |
| bfb0e6f | David Michael | 26 October 2014, 17:34:26 UTC | compat/bswap.h: detect endianness from XL C compiler macros There is no /usr/include/endian.h equivalent on z/OS, but the compiler will define macros to indicate endianness on host and target hardware. This adds a test for these macros as a last resort for determining byte order. Signed-off-by: David Michael <fedora.dm0@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2014, 18:51:12 UTC |
| 48a031a | David Michael | 26 October 2014, 17:33:53 UTC | Makefile: reorder linker flags in the git executable rule The XL C compiler can fail due to mixing library path and object file arguments, for example when linking git while building with "gmake LDFLAGS=-L$prefix/lib". Move the ALL_LDFLAGS variable expansion in the git executable rule to be consistent with all the other linking rules, namely to have LDFLAGS such as -L$where before the object files *.o being linked together. Signed-off-by: David Michael <fedora.dm0@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2014, 18:49:18 UTC |
| f51140c | David Michael | 26 October 2014, 17:33:12 UTC | git-compat-util.h: support variadic macros with the XL C compiler When the XL C compiler is run with an appropriate language level or suboption, it defines a feature test macro to indicate support for variadic macros by defining __C99_MACRO_WITH_VA_ARGS C preprocessor macro. This was tested on z/OS, but it should also work on AIX according to IBM documentation. Signed-off-by: David Michael <fedora.dm0@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2014, 18:48:37 UTC |
| 2509869 | Johannes Sixt | 26 October 2014, 08:09:20 UTC | difftool--helper: exit when reading a prompt answer fails An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does not quit it, but is treated as if 'yes' was answered to the prompt and all following prompts, which is contrary to the user's intent. Fix the error check. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2014, 18:17:56 UTC |
| 7676aff | Eric Wong | 27 October 2014, 01:39:39 UTC | git-svn: disable _rev_list memoization This memoization appears unneeded as the check_cherry_pick2 cache is in front of it does enough. With this change applied, importing from local svn+ssh and http copies of the R repo[1] takes only 2:00 (2 hours) on my system and the git-svn process never uses more than 60MB RSS on my x86-64 GNU/Linux system[2]. This 60M measurement is only for the git-svn Perl process itself and does not include memory used by git subprocesses accessing large packs (subprocess memory usage _is_ measured by my time(1) tool). Before this change, an import took longer (2:20) on svn+ssh:// but git-svn used around 240MB during the imports. Worse yet, git-svn ballooned to over 400M when writing out the cache to the filesystem. I also tried removing memoization for `has_no_changes', too, but a local copy of the R repository(*) was not close to finishing within 10 hours on my system. [1] http://svn.r-project.org/R [2] file:// repos causes libsvn to use more memory internally Signed-off-by: Eric Wong <normalperson@yhbt.net> Cc: Hin-Tak Leung <htl10@users.sourceforge.net> | 27 October 2014, 01:39:39 UTC |
| aee7d04 | Eric Wong | 25 October 2014, 07:56:12 UTC | git-svn: save a little memory as fetch progresses There is no reason to keep entries in the %revs hash after we're done processing a revision, so allow entries become freed as processing continues. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 25 October 2014, 07:56:33 UTC |
