| 7ecec52 | Junio C Hamano | 25 June 2015, 18:08:39 UTC | Git 2.5.0-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 June 2015, 18:08:39 UTC |
| c82b6d3 | Junio C Hamano | 25 June 2015, 18:08:08 UTC | Merge branch 'cn/cvsimport-perl-update' * cn/cvsimport-perl-update: cvsimport: silence regex warning appearing in Perl 5.22. | 25 June 2015, 18:08:08 UTC |
| 5416f8a | Junio C Hamano | 25 June 2015, 18:07:42 UTC | Merge branch 'cb/array-size' * cb/array-size: Fix definition of ARRAY_SIZE for non-gcc builds | 25 June 2015, 18:07:42 UTC |
| a6a1ad9 | Junio C Hamano | 25 June 2015, 18:04:30 UTC | Sync with 2.4.5 | 25 June 2015, 18:04:30 UTC |
| 0df0541 | Junio C Hamano | 25 June 2015, 18:03:05 UTC | Git 2.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 June 2015, 18:03:05 UTC |
| ebf4fc9 | Junio C Hamano | 25 June 2015, 18:02:16 UTC | Merge branch 'sg/merge-summary-config' into maint Doc updates. * sg/merge-summary-config: Documentation: include 'merge.branchdesc' for merge and config as well | 25 June 2015, 18:02:17 UTC |
| 5fd7227 | Junio C Hamano | 25 June 2015, 18:02:15 UTC | Merge branch 'jk/make-fix-dependencies' into maint Build clean-up. * jk/make-fix-dependencies: Makefile: silence perl/PM.stamp recipe Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS Makefile: drop dependency between git-instaweb and gitweb | 25 June 2015, 18:02:16 UTC |
| 68538cf | Junio C Hamano | 25 June 2015, 18:02:14 UTC | Merge branch 'sb/pack-protocol-mention-smart-http' into maint Doc updates. * sb/pack-protocol-mention-smart-http: Documentation/technical/pack-protocol: mention http as possible protocol | 25 June 2015, 18:02:14 UTC |
| f2bd231 | Junio C Hamano | 25 June 2015, 18:02:13 UTC | Merge branch 'jk/die-on-bogus-worktree-late' into maint The setup code used to die when core.bare and core.worktree are set inconsistently, even for commands that do not need working tree. * jk/die-on-bogus-worktree-late: setup_git_directory: delay core.bare/core.worktree errors | 25 June 2015, 18:02:13 UTC |
| 6356003 | Junio C Hamano | 25 June 2015, 18:02:12 UTC | Merge branch 'pt/pull-tags-error-diag' into maint There was a dead code that used to handle "git pull --tags" and show special-cased error message, which was made irrelevant when the semantics of the option changed back in Git 1.9 days. * pt/pull-tags-error-diag: pull: remove --tags error in no merge candidates case | 25 June 2015, 18:02:12 UTC |
| 6998d89 | Junio C Hamano | 25 June 2015, 18:02:11 UTC | Merge branch 'jk/color-diff-plain-is-context' into maint "color.diff.plain" was a misnomer; give it 'color.diff.context' as a more logical synonym. * jk/color-diff-plain-is-context: diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT diff: accept color.diff.context as a synonym for "plain" | 25 June 2015, 18:02:11 UTC |
| c5baf18 | Junio C Hamano | 25 June 2015, 18:02:10 UTC | Merge branch 'jk/diagnose-config-mmap-failure' into maint The configuration reader/writer uses mmap(2) interface to access the files; when we find a directory, it barfed with "Out of memory?". * jk/diagnose-config-mmap-failure: xmmap(): drop "Out of memory?" config.c: rewrite ENODEV into EISDIR when mmap fails config.c: avoid xmmap error messages config.c: fix mmap leak when writing config read-cache.c: drop PROT_WRITE from mmap of index | 25 June 2015, 18:02:11 UTC |
| c533125 | Junio C Hamano | 25 June 2015, 18:02:09 UTC | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' into maint Recent "git prune" traverses young unreachable objects to safekeep old objects in the reachability chain from them, which sometimes caused error messages that are unnecessarily alarming. * jk/squelch-missing-link-warning-for-unreachable: suppress errors on missing UNINTERESTING links silence broken link warnings with revs->ignore_missing_links add quieter versions of parse_{tree,commit} | 25 June 2015, 18:02:10 UTC |
| f249409 | Junio C Hamano | 25 June 2015, 18:02:09 UTC | Merge branch 'mm/rebase-i-post-rewrite-exec' into maint "git rebase -i" fired post-rewrite hook when it shouldn't (namely, when it was told to stop sequencing with 'exec' insn). * mm/rebase-i-post-rewrite-exec: t5407: use <<- to align the expected output rebase -i: fix post-rewrite hook with failed exec command rebase -i: demonstrate incorrect behavior of post-rewrite | 25 June 2015, 18:02:09 UTC |
| b5496cb | Junio C Hamano | 25 June 2015, 17:47:46 UTC | Merge branch 'nd/diff-i-t-a' * nd/diff-i-t-a: Revert "diff-lib.c: adjust position of i-t-a entries in diff" | 25 June 2015, 17:47:46 UTC |
| 16272c7 | Christian Neukirchen | 24 June 2015, 14:04:20 UTC | cvsimport: silence regex warning appearing in Perl 5.22. Since Perl 5.22, "A literal '{' should now be escaped in a pattern". Silence the recently added warning by using \{ instead. Signed-off-by: Christian Neukirchen <chneukirchen@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 June 2015, 00:14:27 UTC |
| e2c6f7c | Charles Bailey | 24 June 2015, 22:12:07 UTC | Fix definition of ARRAY_SIZE for non-gcc builds The improved ARRAY_SIZE macro uses BARF_UNLESS_AN_ARRAY which expands to a valid check for recent gcc versions and to 0 for older gcc versions but is not defined on non-gcc builds. Non-gcc builds need this macro to expand to 0 as well. The current outer test (defined(__GNUC__) && (__GNUC__ >= 3)) is a strictly weaker condition than the inner test (GIT_GNUC_PREREQ(3, 1)) so we can omit the outer test and cause the BARF_UNLESS_AN_ARRAY macro to be defined correctly on non-gcc builds as well as gcc builds with older versions. Signed-off-by: Charles Bailey <cbailey32@bloomberg.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 June 2015, 00:14:00 UTC |
| df97e5d | Junio C Hamano | 24 June 2015, 19:27:20 UTC | Ninth batch for 2.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 June 2015, 19:27:20 UTC |
| bfb539b | Junio C Hamano | 24 June 2015, 19:21:59 UTC | Merge branch 'jk/stash-require-clean-index' A hotfix for the topic already in 'master'. * jk/stash-require-clean-index: Revert "stash: require a clean index to apply" | 24 June 2015, 19:21:59 UTC |
| 3072ec3 | Junio C Hamano | 24 June 2015, 19:21:58 UTC | Merge branch 'pa/auto-gc-mac-osx' Recent Mac OS X updates breaks the logic to detect that the machine is on the AC power in the sample pre-auto-gc script. * pa/auto-gc-mac-osx: hooks/pre-auto-gc: adjust power checking for newer OS X | 24 June 2015, 19:21:58 UTC |
| b3689ce | Junio C Hamano | 24 June 2015, 19:21:57 UTC | Merge branch 'pt/t0302-needs-sanity' * pt/t0302-needs-sanity: t0302: "unreadable" test needs SANITY prereq | 24 June 2015, 19:21:57 UTC |
| b79bbed | Junio C Hamano | 24 June 2015, 19:21:56 UTC | Merge branch 'ld/p4-changes-block-size' More Perforce row number limit workaround for "git p4". * ld/p4-changes-block-size: git-p4: fixing --changes-block-size handling git-p4: add tests for non-numeric revision range git-p4: test with limited p4 server results git-p4: additional testing of --changes-block-size | 24 June 2015, 19:21:57 UTC |
| 6146179 | Junio C Hamano | 24 June 2015, 19:21:56 UTC | Merge branch 'fk/doc-format-patch-vn' Docfix. * fk/doc-format-patch-vn: doc: format-patch: fix typo | 24 June 2015, 19:21:56 UTC |
| 07528be | Junio C Hamano | 24 June 2015, 19:21:55 UTC | Merge branch 'sg/commit-cleanup-scissors' "git commit --cleanup=scissors" was not careful enough to protect against getting fooled by a line that looked like scissors. * sg/commit-cleanup-scissors: commit: cope with scissors lines in commit message | 24 June 2015, 19:21:55 UTC |
| 712b351 | Junio C Hamano | 24 June 2015, 19:21:54 UTC | Merge branch 'jk/index-pack-reduce-recheck' Disable "have we lost a race with competing repack?" check while receiving a huge object transfer that runs index-pack. * jk/index-pack-reduce-recheck: index-pack: avoid excessive re-reading of pack directory | 24 June 2015, 19:21:54 UTC |
| c595cb9 | Junio C Hamano | 24 June 2015, 19:21:53 UTC | Merge branch 'af/tcsh-completion-noclobber' The tcsh completion writes a bash scriptlet but that would have failed for users with noclobber set. * af/tcsh-completion-noclobber: git-completion.tcsh: fix redirect with noclobber | 24 June 2015, 19:21:53 UTC |
| 9d71c5f | Junio C Hamano | 24 June 2015, 19:21:51 UTC | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' "git for-each-ref" reported "missing object" for 0{40} when it encounters a broken ref. The lack of object whose name is 0{40} is not the problem; the ref being broken is. * mh/reporting-broken-refs-from-for-each-ref: read_loose_refs(): treat NULL_SHA1 loose references as broken read_loose_refs(): simplify function logic for-each-ref: report broken references correctly t6301: new tests of for-each-ref error handling | 24 June 2015, 19:21:52 UTC |
| 54a17cd | Junio C Hamano | 24 June 2015, 19:21:51 UTC | Merge branch 'sg/completion-commit-cleanup' * sg/completion-commit-cleanup: completion: teach 'scissors' mode to 'git commit --cleanup=' | 24 June 2015, 19:21:51 UTC |
| ce5e338 | Junio C Hamano | 24 June 2015, 19:21:49 UTC | Merge branch 'pt/am-abort-fix' Various fixes around "git am" that applies a patch to a history that is not there yet. * pt/am-abort-fix: am --abort: keep unrelated commits on unborn branch am --abort: support aborting to unborn branch am --abort: revert changes introduced by failed 3way merge am --skip: support skipping while on unborn branch am -3: support 3way merge on unborn branch am --skip: revert changes introduced by failed 3way merge | 24 June 2015, 19:21:50 UTC |
| 6f59058 | Junio C Hamano | 24 June 2015, 19:21:49 UTC | Merge branch 'nd/untracked-cache' Hotfix for the 'untracked-cache' topic that is already in 'master'. * nd/untracked-cache: read-cache: fix untracked cache invalidation when split-index is used | 24 June 2015, 19:21:49 UTC |
| 8f61ccf | Junio C Hamano | 24 June 2015, 19:21:48 UTC | Merge branch 'mh/fsck-reflog-entries' "git fsck" used to ignore missing or invalid objects recorded in reflog. * mh/fsck-reflog-entries: fsck: report errors if reflog entries point at invalid objects fsck_handle_reflog_sha1(): new function | 24 June 2015, 19:21:48 UTC |
| 510ab3f | Junio C Hamano | 24 June 2015, 19:21:47 UTC | Merge branch 'js/sleep-without-select' Portability fix. * js/sleep-without-select: lockfile: wait using sleep_millisec() instead of select() lockfile: convert retry timeout computations to millisecond help.c: wrap wait-only poll() invocation in sleep_millisec() lockfile: replace random() by rand() | 24 June 2015, 19:21:47 UTC |
| 5d24b10 | Junio C Hamano | 24 June 2015, 19:21:46 UTC | Merge branch 'es/utf8-stupid-compiler-workaround' A compilation workaround. * es/utf8-stupid-compiler-workaround: utf8: NO_ICONV: silence uninitialized variable warning | 24 June 2015, 19:21:46 UTC |
| 4b64c8a | Junio C Hamano | 24 June 2015, 19:21:45 UTC | Merge branch 'rl/am-3way-config' "git am" learned am.threeWay configuration variable. * rl/am-3way-config: git-am: add am.threeWay config variable t4150-am: refactor am -3 tests git-am.sh: fix initialization of the threeway variable | 24 June 2015, 19:21:45 UTC |
| 49ac735 | Junio C Hamano | 24 June 2015, 19:21:45 UTC | Merge branch 'jc/ll-merge-expose-path' Traditionally, external low-level 3-way merge drivers are expected to produce their results based solely on the contents of the three variants given in temporary files named by %O, %A and %B on their command line. Additionally allow them to look at the final path (given by %P). * jc/ll-merge-expose-path: ll-merge: pass the original path to external drivers | 24 June 2015, 19:21:45 UTC |
| 6da9f88 | Junio C Hamano | 24 June 2015, 19:21:44 UTC | Merge branch 'es/osx-header-pollutes-mask-macro' * es/osx-header-pollutes-mask-macro: ewah: use less generic macro name ewah/bitmap: silence warning about MASK macro redefinition | 24 June 2015, 19:21:44 UTC |
| 3c84c38 | Junio C Hamano | 24 June 2015, 19:21:43 UTC | Merge branch 'es/configure-getdelim' Auto-detect availability of getdelim() that helps optimized version of strbuf_getwholeline(). * es/configure-getdelim: configure: add getdelim() check config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases | 24 June 2015, 19:21:43 UTC |
| a1eaf86 | Junio C Hamano | 24 June 2015, 19:21:42 UTC | Merge branch 'pt/pull-optparse' "git pull" has become more aware of the options meant for underlying "git fetch" and then learned to use parse-options parser. * pt/pull-optparse: pull: use git-rev-parse --parseopt for option parsing pull: handle git-fetch's options as well | 24 June 2015, 19:21:42 UTC |
| 20d16da | Junio C Hamano | 24 June 2015, 19:21:41 UTC | Merge branch 'qn/blame-show-email' "git blame" learned blame.showEmail configuration variable. * qn/blame-show-email: blame: add blame.showEmail configuration | 24 June 2015, 19:21:41 UTC |
| de04706 | Junio C Hamano | 24 June 2015, 19:21:40 UTC | Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' "git format-patch --ignore-if-upstream A..B" did not like to be fed tags as boundary commits. * jc/do-not-feed-tags-to-clear-commit-marks: format-patch: do not feed tags to clear_commit_marks() | 24 June 2015, 19:21:40 UTC |
| 8c17d5a | Junio C Hamano | 24 June 2015, 19:21:39 UTC | Merge branch 'es/send-email-sendmail-alias' "git send-email" learned to handle more forms of sendmail style aliases file. * es/send-email-sendmail-alias: send-email: further warn about unsupported sendmail aliases features t9001: add sendmail aliases line continuation tests t9001: refactor sendmail aliases test infrastructure send-email: implement sendmail aliases line continuation support send-email: simplify sendmail aliases comment and blank line recognizer send-email: refactor sendmail aliases parser send-email: fix style: cuddle 'elsif' and 'else' with closing brace send-email: drop noise comments which merely repeat what code says send-email: visually distinguish sendmail aliases parser warnings send-email: further document missing sendmail aliases functionality | 24 June 2015, 19:21:39 UTC |
| 59c465d | Junio C Hamano | 24 June 2015, 19:21:39 UTC | Merge branch 'jc/apply-reject-noop-hunk' "git apply" cannot diagnose a patch corruption when the breakage is to mark the length of the hunk shorter than it really is on the hunk header line "@@ -l,k +m,n @@"; one special case it could is when the hunk becomes no-op (e.g. k == n == 2 for two-line context patch output), and it learned how to do so. * jc/apply-reject-noop-hunk: apply: reject a hunk that does not do anything | 24 June 2015, 19:21:39 UTC |
| 78cc1a5 | Junio C Hamano | 23 June 2015, 17:27:47 UTC | Revert "diff-lib.c: adjust position of i-t-a entries in diff" This reverts commit d95d728aba06a34394d15466045cbdabdada58a2. It turns out that many other commands that need to interact with the result of running diff-files and diff-index, e.g. "git apply", "git rm", etc., need to be adjusted to the new world order it brings in. For example, it would break this sequence to correct a whitespace breakage in the parts you changed: git add -N file git diff --cached file | git apply --cached --whitespace=fix git checkout file In the old world order, "diff" showed a patch to modify an existing empty file by adding its full contents, and "apply" updated the index by modifying the existing empty blob (which is what an Intent-to-Add entry records in the index) with that patch. In the new world order, "diff" shows a patch to create a new file with its full contents, but because "apply" thinks that the i-t-a entry already exists in the index, it refused to accept a creation. Adjusting "apply" to this new world order is easy, but we need to assess the extent of the damage to the rest of the system the new world order brought in before going forward and adjust them all, after which we can resurrect the commit being reverted here. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 June 2015, 17:37:21 UTC |
| 5b1d901 | Matthieu Moy | 18 June 2015, 08:46:04 UTC | git-multimail: update to release 1.1.0 The changes are described in CHANGES. Contributions-by: Matthieu Moy <Matthieu.Moy@imag.fr> Contributions-by: Richard Hansen <rhansen@rhansen.org> Contributions-by: Michael Haggerty <mhagger@alum.mit.edu> Contributions-by: Elijah Newren <newren@gmail.com> Contributions-by: Luke Mewburn <luke@mewburn.net> Contributions-by: Dave Boutcher <daveboutcher@gmail.com> Contributions-by: Azat Khuzhin <a3at.mail@gmail.com> Contributions-by: Sebastian Schuberth <sschuberth@gmail.com> Contributions-by: Mikko Johannes Koivunalho <mikko.koivunalho@iki.fi> Contributions-by: Elijah Newren <newren@palantir.com> Contributions-by: Benoît Ryder <benoit@ryder.fr> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2015, 17:03:52 UTC |
| 16da57c | Junio C Hamano | 16 June 2015, 21:39:31 UTC | Eighth batch for 2.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 June 2015, 21:39:31 UTC |
| 5c040f5 | Junio C Hamano | 16 June 2015, 21:39:01 UTC | Sync with 2.4.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 June 2015, 21:39:01 UTC |
| f09bd21 | Junio C Hamano | 16 June 2015, 21:38:01 UTC | Git 2.4.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 June 2015, 21:38:01 UTC |
| 37d6f93 | Junio C Hamano | 16 June 2015, 21:33:52 UTC | Merge branch 'jk/clone-dissociate' into maint Code clean-up. * jk/clone-dissociate: clone: reorder --dissociate and --reference options clone: use OPT_STRING_LIST for --reference | 16 June 2015, 21:33:52 UTC |
| 0d9388d | Junio C Hamano | 16 June 2015, 21:33:52 UTC | Merge branch 'sb/submodule-doc-intro' into maint * sb/submodule-doc-intro: submodule doc: reorder introductory paragraphs | 16 June 2015, 21:33:52 UTC |
| 6de4c80 | Junio C Hamano | 16 June 2015, 21:33:51 UTC | Merge branch 'sb/glossary-submodule' into maint * sb/glossary-submodule: glossary: add "remote", "submodule", "superproject" | 16 June 2015, 21:33:51 UTC |
| 6588f82 | Junio C Hamano | 16 June 2015, 21:33:50 UTC | Merge branch 'ah/usage-strings' into maint A few usage string updates. * ah/usage-strings: blame, log: format usage strings similarly to those in documentation | 16 June 2015, 21:33:50 UTC |
| afd647c | Junio C Hamano | 16 June 2015, 21:33:49 UTC | Merge branch 'mc/commit-doc-grammofix' into maint Doc grammar fix. * mc/commit-doc-grammofix: Documentation/git-commit: grammofix | 16 June 2015, 21:33:49 UTC |
| dfb6759 | Junio C Hamano | 16 June 2015, 21:33:47 UTC | Merge branch 'rs/janitorial' into maint Code clean-up. * rs/janitorial: dir: remove unused variable sb clean: remove unused variable buf use file_exists() to check if a file exists in the worktree | 16 June 2015, 21:33:47 UTC |
| 2cd8ebd | Junio C Hamano | 16 June 2015, 21:33:47 UTC | Merge branch 'sb/test-bitmap-free-at-end' into maint An earlier leakfix to bitmap testing code was incomplete. * sb/test-bitmap-free-at-end: test_bitmap_walk: free bitmap with bitmap_free | 16 June 2015, 21:33:47 UTC |
| 6b2c0ea | Junio C Hamano | 16 June 2015, 21:33:46 UTC | Merge branch 'dt/clean-pathspec-filter-then-lstat' into maint "git clean pathspec..." tried to lstat(2) and complain even for paths outside the given pathspec. * dt/clean-pathspec-filter-then-lstat: clean: only lstat files in pathspec | 16 June 2015, 21:33:46 UTC |
| b76b4cd | Junio C Hamano | 16 June 2015, 21:33:45 UTC | Merge branch 'jk/http-backend-deadlock' into maint Communication between the HTTP server and http_backend process can lead to a dead-lock when relaying a large ref negotiation request. Diagnose the situation better, and mitigate it by reading such a request first into core (to a reasonable limit). * jk/http-backend-deadlock: http-backend: spool ref negotiation requests to buffer t5551: factor out tag creation http-backend: fix die recursion with custom handler | 16 June 2015, 21:33:45 UTC |
| 070d276 | Junio C Hamano | 16 June 2015, 21:33:44 UTC | Merge branch 'jh/filter-empty-contents' into maint The clean/smudge interface did not work well when filtering an empty contents (failed and then passed the empty input through). It can be argued that a filter that produces anything but empty for an empty input is nonsense, but if the user wants to do strange things, then why not? * jh/filter-empty-contents: sha1_file: pass empty buffer to index empty file | 16 June 2015, 21:33:44 UTC |
| 659d4c8 | Junio C Hamano | 16 June 2015, 21:33:43 UTC | Merge branch 'jk/stash-options' into maint Make "git stash something --help" error out, so that users can safely say "git stash drop --help". * jk/stash-options: stash: recognize "--help" for subcommands stash: complain about unknown flags | 16 June 2015, 21:33:43 UTC |
| 4be33f7 | Junio C Hamano | 16 June 2015, 21:33:42 UTC | Merge branch 'mm/log-format-raw-doc' into maint Clarify that "log --raw" and "log --format=raw" are unrelated concepts. * mm/log-format-raw-doc: Documentation/log: clarify sha1 non-abbreviation in log --raw Documentation/log: clarify what --raw means | 16 June 2015, 21:33:43 UTC |
| 335f1a7 | Junio C Hamano | 16 June 2015, 21:33:41 UTC | Merge branch 'ep/do-not-feed-a-pointer-to-array-size' into maint Catch a programmer mistake to feed a pointer not an array to ARRAY_SIZE() macro, by using a couple of GCC extensions. * ep/do-not-feed-a-pointer-to-array-size: git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deriving the size of array | 16 June 2015, 21:33:41 UTC |
| c3b1c1e | Junio C Hamano | 16 June 2015, 21:27:08 UTC | Merge branch 'nd/slim-index-pack-memory-usage' An earlier optimization broke index-pack for a large object transfer; this fixes it before the breakage hits any released version. * nd/slim-index-pack-memory-usage: index-pack: fix truncation of off_t in comparison | 16 June 2015, 21:27:08 UTC |
| 486b51b | Junio C Hamano | 16 June 2015, 21:27:07 UTC | Merge branch 'sb/pack-protocol-mention-smart-http' Doc updates. * sb/pack-protocol-mention-smart-http: Documentation/technical/pack-protocol: mention http as possible protocol | 16 June 2015, 21:27:08 UTC |
| 0d5d7db | Junio C Hamano | 16 June 2015, 21:27:06 UTC | Merge branch 'jk/make-fix-dependencies' Build clean-up. * jk/make-fix-dependencies: Makefile: silence perl/PM.stamp recipe Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS Makefile: drop dependency between git-instaweb and gitweb | 16 June 2015, 21:27:07 UTC |
| 103b6f9 | Junio C Hamano | 16 June 2015, 21:27:06 UTC | Merge branch 'jk/die-on-bogus-worktree-late' The setup code used to die when core.bare and core.worktree are set inconsistently, even for commands that do not need working tree. * jk/die-on-bogus-worktree-late: setup_git_directory: delay core.bare/core.worktree errors | 16 June 2015, 21:27:06 UTC |
| c7ca442 | Junio C Hamano | 16 June 2015, 21:27:05 UTC | Merge branch 'sg/merge-summary-config' Doc updates. * sg/merge-summary-config: Documentation: include 'merge.branchdesc' for merge and config as well | 16 June 2015, 21:27:05 UTC |
| 412e63f | Junio C Hamano | 16 June 2015, 21:27:04 UTC | Merge branch 'ah/send-email-sendmail-alias' "git send-email" learned the alias file format used by the sendmail program (in an abbreviated form). * ah/send-email-sendmail-alias: t9001: write $HOME/, not ~/, to help shells without tilde expansion send-email: add sendmail email aliases format | 16 June 2015, 21:27:04 UTC |
| 1937610 | Jeff King | 15 June 2015, 18:27:22 UTC | Revert "stash: require a clean index to apply" This reverts commit ed178ef13a26136d86ff4e33bb7b1afb5033f908. That commit was an attempt to improve the safety of applying a stash, because the application process may create conflicted index entries, after which it is hard to restore the original index state. Unfortunately, this hurts some common workflows around "git stash -k", like: git add -p ;# (1) stage set of proposed changes git stash -k ;# (2) get rid of everything else make test ;# (3) make sure proposal is reasonable git stash apply ;# (4) restore original working tree If you "git commit" between steps (3) and (4), then this just works. However, if these steps are part of a pre-commit hook, you don't have that opportunity (you have to restore the original state regardless of whether the tests passed or failed). It's possible that we could provide better tools for this sort of workflow. In particular, even before ed178ef, it could fail with a conflict if there were conflicting hunks in the working tree and index (since the "stash -k" puts the index version into the working tree, and we then attempt to apply the differences between HEAD and the old working tree on top of that). But the fact remains that people have been using it happily for a while, and the safety provided by ed178ef is simply not that great. Let's revert it for now. In the long run, people can work on improving stash for this sort of workflow, but the safety tradeoff is not worth it in the meantime. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 June 2015, 20:11:17 UTC |
| 2c185f0 | Junio C Hamano | 14 June 2015, 21:24:49 UTC | Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po into maint l10n-2.4-maint-de-updates * tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po: l10n: de.po: translation fix for fall-back to 3way merge l10n: de.po: punctuation fixes l10n: de.po: grammar fix l10n: de.po: change error message from "sagen" to "Meinten Sie" | 14 June 2015, 21:24:49 UTC |
| c54c7b3 | Panagiotis Astithas | 11 June 2015, 14:37:25 UTC | hooks/pre-auto-gc: adjust power checking for newer OS X The output of "pmset -g batt" changed at some point from "Currently drawing from 'AC Power'" to the slightly different "Now drawing from 'AC Power'". Starting the match from "drawing" makes the check work in both old and new versions of OS X. Signed-off-by: Panagiotis Astithas <pastith@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 June 2015, 22:33:39 UTC |
| 329af6c | Paul Tan | 12 June 2015, 13:29:58 UTC | t0302: "unreadable" test needs SANITY prereq The test expects that "chmod -r ~/.git-credentials" would make it unreadable to the user, and thus needs the SANITY prerequisite. Reported-by: Jean-Yves LENHOF <jean-yves@lenhof.eu.org> Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 June 2015, 20:57:51 UTC |
| a9845c5 | Michael J Gruber | 19 May 2015, 08:51:34 UTC | l10n: de.po: translation fix for fall-back to 3way merge The English version is correct, but misleading: It is not the 3way merge that is being patched also, but that is being fallen back to also. The German version translates the former meaning. Make it translate the latter. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 12 June 2015, 18:40:04 UTC |
| 47a1657 | Michael J Gruber | 19 May 2015, 08:51:33 UTC | l10n: de.po: punctuation fixes This respects the ellipsis style used in de.po. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 12 June 2015, 18:40:04 UTC |
| 872b1f2 | Michael J Gruber | 19 May 2015, 08:51:32 UTC | l10n: de.po: grammar fix Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 12 June 2015, 18:40:04 UTC |
| 39f9819 | Phillip Sz | 09 May 2015, 11:28:55 UTC | l10n: de.po: change error message from "sagen" to "Meinten Sie" We should not use "sagen" if someone has written something wrong. Although it's "say" in English, we should not use it in German and instead use our normal error message. Signed-off-by: Phillip Sz <phillip.szelat@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 12 June 2015, 18:39:42 UTC |
| a5fe668 | Junio C Hamano | 11 June 2015, 16:35:25 UTC | Second half of seventh batch Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 June 2015, 16:35:25 UTC |
| e356158 | Junio C Hamano | 11 June 2015, 16:29:59 UTC | Merge branch 'tb/complete-sequencing' The bash completion script (in contrib/) learned a few options that "git revert" takes. * tb/complete-sequencing: completion: suggest sequencer commands for revert | 11 June 2015, 16:29:59 UTC |
| 43262d8 | Junio C Hamano | 11 June 2015, 16:29:58 UTC | Merge branch 'jk/squelch-missing-link-warning-for-unreachable' Recent "git prune" traverses young unreachable objects to safekeep old objects in the reachability chain from them, which sometimes caused error messages that are unnecessarily alarming. * jk/squelch-missing-link-warning-for-unreachable: suppress errors on missing UNINTERESTING links silence broken link warnings with revs->ignore_missing_links add quieter versions of parse_{tree,commit} | 11 June 2015, 16:29:59 UTC |
| 0e04b24 | Junio C Hamano | 11 June 2015, 16:29:58 UTC | Merge branch 'pt/pull-tests' Add more test coverage to "git pull". * pt/pull-tests: t5520: check reflog action in fast-forward merge t5521: test --dry-run does not make any changes t5520: test --rebase failure on unborn branch with index t5520: test --rebase with multiple branches t5520: test work tree fast-forward when fetch updates head t5520: test for failure if index has unresolved entries t5520: test no merge candidates cases t5520: prevent field splitting in content comparisons | 11 June 2015, 16:29:58 UTC |
| c491e9e | Junio C Hamano | 11 June 2015, 16:29:57 UTC | Merge branch 'sb/glossary-submodule' * sb/glossary-submodule: glossary: add "remote", "submodule", "superproject" | 11 June 2015, 16:29:57 UTC |
| 7df5c97 | Junio C Hamano | 11 June 2015, 16:29:56 UTC | Merge branch 'sb/submodule-doc-intro' * sb/submodule-doc-intro: submodule doc: reorder introductory paragraphs | 11 June 2015, 16:29:56 UTC |
| dee4792 | Junio C Hamano | 11 June 2015, 16:29:55 UTC | Merge branch 'jk/diagnose-config-mmap-failure' The configuration reader/writer uses mmap(2) interface to access the files; when we find a directory, it barfed with "Out of memory?". * jk/diagnose-config-mmap-failure: xmmap(): drop "Out of memory?" config.c: rewrite ENODEV into EISDIR when mmap fails config.c: avoid xmmap error messages config.c: fix mmap leak when writing config read-cache.c: drop PROT_WRITE from mmap of index | 11 June 2015, 16:29:55 UTC |
| 8f436d1 | Junio C Hamano | 11 June 2015, 16:29:55 UTC | Merge branch 'mt/p4-depotFile-at-version' * mt/p4-depotFile-at-version: p4: retrieve the right revision of the file in UTF-16 codepath | 11 June 2015, 16:29:55 UTC |
| 829f03e | Junio C Hamano | 11 June 2015, 16:29:54 UTC | Merge branch 'mh/verify-lock-error-report' Bring consistency to error reporting mechanism used in "refs" API. * mh/verify-lock-error-report: ref_transaction_commit(): do not capitalize error messages verify_lock(): do not capitalize error messages verify_lock(): report errors via a strbuf verify_lock(): on errors, let the caller unlock the lock verify_lock(): return 0/-1 rather than struct ref_lock * | 11 June 2015, 16:29:54 UTC |
| db65170 | Junio C Hamano | 11 June 2015, 16:29:53 UTC | Merge branch 'jk/color-diff-plain-is-context' "color.diff.plain" was a misnomer; give it 'color.diff.context' as a more logical synonym. * jk/color-diff-plain-is-context: diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT diff: accept color.diff.context as a synonym for "plain" | 11 June 2015, 16:29:53 UTC |
| 82b416e | Junio C Hamano | 11 June 2015, 16:29:52 UTC | Merge branch 'jk/clone-dissociate' Code clean-up. * jk/clone-dissociate: clone: reorder --dissociate and --reference options clone: use OPT_STRING_LIST for --reference | 11 June 2015, 16:29:52 UTC |
| 709cd91 | Junio C Hamano | 11 June 2015, 16:29:51 UTC | Merge branch 'jc/diff-ws-error-highlight' Allow whitespace breakages in deleted and context lines to be also painted in the output. * jc/diff-ws-error-highlight: diff.c: --ws-error-highlight=<kind> option diff.c: add emit_del_line() and emit_context_line() t4015: separate common setup and per-test expectation t4015: modernise style | 11 June 2015, 16:29:51 UTC |
| d614f07 | Frans Klaver | 10 June 2015, 21:01:14 UTC | doc: format-patch: fix typo reroll count documentation states that v<n> will be pretended to the filename. Judging by the examples that should have been 'prepended'. Signed-off-by: Frans Klaver <fransklaver@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 June 2015, 21:37:04 UTC |
| 1051ef0 | Luke Diamand | 10 June 2015, 07:30:59 UTC | git-p4: fixing --changes-block-size handling The --changes-block-size handling was intended to help when a user has a limited "maxscanrows" (see "p4 group"). It used "p4 changes -m $maxchanges" to limit the number of results. Unfortunately, it turns out that the "maxscanrows" and "maxresults" limits are actually applied *before* the "-m maxchanges" parameter is considered (experimentally). Fix the block-size handling so that it gets blocks of changes limited by revision number ($Start..$Start+$N, etc). This limits the number of results early enough that both sets of tests pass. Note that many other Perforce operations can fail for the same reason (p4 print, p4 files, etc) and it's probably not possible to workaround this. In the real world, this is probably not usually a problem. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 June 2015, 15:29:17 UTC |
| eceafff | Luke Diamand | 10 June 2015, 07:30:58 UTC | git-p4: add tests for non-numeric revision range Test that git-p4 can handle a sync with a non-numeric revision range (e.g. a date). Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 June 2015, 15:29:10 UTC |
| 0eeb077 | Jeff King | 09 June 2015, 17:24:37 UTC | index-pack: avoid excessive re-reading of pack directory Since 45e8a74 (has_sha1_file: re-check pack directory before giving up, 2013-08-30), we spend extra effort for has_sha1_file to give the right answer when somebody else is repacking. Usually this effort does not matter, because after finding that the object does not exist, the next step is usually to die(). However, some code paths make a large number of has_sha1_file checks which are _not_ expected to return 1. The collision test in index-pack.c is such a case. On a local system, this can cause a performance slowdown of around 5%. But on a system with high-latency system calls (like NFS), it can be much worse. This patch introduces a "quick" flag to has_sha1_file which callers can use when they would prefer high performance at the cost of false negatives during repacks. There may be other code paths that can use this, but the index-pack one is the most obviously critical, so we'll start with switching that one. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 June 2015, 19:26:35 UTC |
| fbfa097 | SZEDER Gábor | 09 June 2015, 00:28:34 UTC | commit: cope with scissors lines in commit message The diff and submodule shortlog appended to the commit message template by 'git commit --verbose' are not stripped when the commit message contains an indented scissors line. When cleaning up a commit message with 'git commit --verbose' or '--cleanup=scissors' the code is careful and triggers only on a pure scissors line, i.e. a line containing nothing but a comment character, a space, and the scissors cut. This is good, because people can embed scissors lines in the commit message while using 'git commit --verbose', and the text they write after their indented scissors line doesn't get deleted. While doing so, however, the cleanup function only looks at the first line matching the scissors pattern and if it doesn't start at the beginning of the line, then the function just returns without performing any cleanup. This is wrong, because a "real" scissors line added by 'git commit --verbose' might follow, and in that case the diff and submodule shortlog get included in the commit message. Fix this by changing the scissors pattern to match only at the beginning of the line, yet be careful to catch scissors on the first line as well. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 June 2015, 19:09:44 UTC |
| 0b1f688 | Ariel Faigon | 09 June 2015, 17:25:15 UTC | git-completion.tcsh: fix redirect with noclobber tcsh users who happen to have 'set noclobber' elsewhere in their ~/.tcshrc or ~/.cshrc startup files get a 'File exist' error, and the tcsh completion file doesn't get generated/updated. Adding a `!` in the redirect works correctly for both clobber (default) and 'set noclobber' users. Reviewed-by: Christian Couder <christian.couder@gmail.com> Signed-off-by: Ariel Faigon <github.2009@yendor.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 June 2015, 18:21:15 UTC |
| 6ea3b67 | Paul Tan | 06 June 2015, 11:46:12 UTC | am --abort: keep unrelated commits on unborn branch Since 7b3b7e3 (am --abort: keep unrelated commits since the last failure and warn, 2010-12-21), git-am would refuse to rewind HEAD if commits were made since the last git-am failure. This check was implemented in safe_to_abort(), which checked to see if HEAD's hash matched the abort-safety file. However, this check was skipped if the abort-safety file was empty, which can happen if git-am failed while on an unborn branch. As such, if any commits were made since then, they would be discarded. Fix this by carrying on the abort safety check even if the abort-safety file is empty. Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 June 2015, 20:14:04 UTC |
| e06764c | Paul Tan | 06 June 2015, 11:46:11 UTC | am --abort: support aborting to unborn branch When git-am is first run on an unborn branch, no ORIG_HEAD is created. As such, any applied commits will remain even after a git am --abort. To be consistent with the behavior of git am --abort when it is not run from an unborn branch, we empty the index, and then destroy the branch pointed to by HEAD if there is no ORIG_HEAD. Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 June 2015, 20:10:45 UTC |
| 20c3fe7 | Paul Tan | 06 June 2015, 11:46:10 UTC | am --abort: revert changes introduced by failed 3way merge Even when a merge conflict occurs with am --3way, the index will be modified with the results of any successfully merged files. These changes to the index will not be reverted with a "git read-tree --reset -u HEAD ORIG_HEAD", as git read-tree will not be aware of how the current index differs from HEAD or ORIG_HEAD. To fix this, we first reset any conflicting entries in the index. The resulting index will contain the results of successfully merged files introduced by the failed merge. We write this index to a tree, and then use git read-tree to fast-forward this "index tree" back to ORIG_HEAD, thus undoing all the changes from the failed merge. When we are on an unborn branch, HEAD and ORIG_HEAD will not point to valid trees. In this case, use an empty tree. Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 June 2015, 20:09:20 UTC |
| f8da680 | Paul Tan | 06 June 2015, 11:46:09 UTC | am --skip: support skipping while on unborn branch When git am --skip is run, git am will copy HEAD's tree entries to the index with "git reset HEAD". However, on an unborn branch, HEAD does not point to a tree, so "git reset HEAD" will fail. Fix this by treating HEAD as en empty tree when we are on an unborn branch. Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 June 2015, 20:06:44 UTC |
| 2c970c9 | Paul Tan | 06 June 2015, 11:46:08 UTC | am -3: support 3way merge on unborn branch While on an unborn branch, git am -3 will fail to do a threeway merge as it references HEAD as "our tree", but HEAD does not point to a valid tree. Fix this by using an empty tree as "our tree" when we are on an unborn branch. Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 June 2015, 20:06:09 UTC |
| 88d5072 | Paul Tan | 06 June 2015, 11:46:07 UTC | am --skip: revert changes introduced by failed 3way merge Even when a merge conflict occurs with am --3way, the index will be modified with the results of any succesfully merged files (such as a new file). These changes to the index will not be reverted with a "git read-tree --reset -u HEAD HEAD", as git read-tree will not be aware of how the current index differs from HEAD. To fix this, we first reset any conflicting entries from the index. The resulting index will contain the results of successfully merged files. We write the index to a tree, then use git read-tree -m to fast-forward the "index tree" back to HEAD, thus undoing all the changes from the failed merge. Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 June 2015, 20:05:43 UTC |
| 19bf6c9 | Michael Haggerty | 08 June 2015, 13:40:05 UTC | fsck: report errors if reflog entries point at invalid objects Previously, if a reflog entry's old or new SHA-1 was not resolvable to an object, that SHA-1 was silently ignored. Instead, report such cases as errors. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 June 2015, 19:40:36 UTC |
| d66ae59 | Michael Haggerty | 08 June 2015, 13:40:04 UTC | fsck_handle_reflog_sha1(): new function New function, extracted from fsck_handle_reflog_ent(). The extra is_null_sha1() test for the new reference is currently unnecessary, as reflogs are deleted when the reference itself is deleted. But it doesn't hurt, either. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 June 2015, 19:37:32 UTC |
