| eac2d83 | Junio C Hamano | 06 January 2012, 20:48:17 UTC | Git 1.7.9-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2012, 20:51:09 UTC |
| 5de89d3 | Junio C Hamano | 06 January 2012, 20:44:07 UTC | Merge branch 'jc/show-sig' * jc/show-sig: log --show-signature: reword the common two-head merge case log-tree: show mergetag in log --show-signature output log-tree.c: small refactor in show_signature() commit --amend -S: strip existing gpgsig headers verify_signed_buffer: fix stale comment gpg-interface: allow use of a custom GPG binary pretty: %G[?GS] placeholders test "commit -S" and "log --show-signature" log: --show-signature commit: teach --gpg-sign option Conflicts: builtin/commit-tree.c builtin/commit.c builtin/merge.c notes-cache.c pretty.c | 06 January 2012, 20:44:07 UTC |
| 4a3a1ed | Junio C Hamano | 06 January 2012, 20:44:03 UTC | Merge branch 'jm/stash-diff-disambiguate' * jm/stash-diff-disambiguate: stash: Don't fail if work dir contains file named 'HEAD' | 06 January 2012, 20:44:03 UTC |
| 1067f8d | Junio C Hamano | 06 January 2012, 20:44:01 UTC | Merge branch 'jh/fetch-head-update' * jh/fetch-head-update: write first for-merge ref to FETCH_HEAD first | 06 January 2012, 20:44:01 UTC |
| 8cbfc11 | Junio C Hamano | 06 January 2012, 20:43:59 UTC | Merge branch 'pw/p4-view-updates' * pw/p4-view-updates: git-p4: view spec documentation git-p4: rewrite view handling git-p4: support single file p4 client view maps git-p4: sort client views by reverse View number git-p4: fix test for unsupported P4 Client Views git-p4: test client view handling | 06 January 2012, 20:43:59 UTC |
| 21c6a18 | Junio C Hamano | 06 January 2012, 20:42:48 UTC | Sync with 1.7.8.3 | 06 January 2012, 20:42:48 UTC |
| 5f4d133 | Junio C Hamano | 06 January 2012, 20:41:39 UTC | Git 1.7.8.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2012, 20:41:39 UTC |
| b15840e | Junio C Hamano | 06 January 2012, 20:36:43 UTC | Merge branch 'jn/maint-gitweb-utf8-fix' into maint * jn/maint-gitweb-utf8-fix: gitweb: Fix fallback mode of to_utf8 subroutine gitweb: Output valid utf8 in git_blame_common('data') gitweb: esc_html() site name for title in OPML gitweb: Call to_utf8() on input string in chop_and_escape_str() | 06 January 2012, 20:36:43 UTC |
| cfdfc5a | Junio C Hamano | 06 January 2012, 20:35:12 UTC | Merge branch 'maint-1.7.7' into maint * maint-1.7.7: Documentation: rerere.enabled is the primary way to configure rerere | 06 January 2012, 20:35:12 UTC |
| 8769e93 | Junio C Hamano | 06 January 2012, 20:35:05 UTC | Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: Documentation: rerere.enabled is the primary way to configure rerere | 06 January 2012, 20:35:05 UTC |
| 07b88a0 | Thomas Rast | 06 January 2012, 13:08:02 UTC | Documentation: rerere.enabled is the primary way to configure rerere The wording seems to suggest that creating the directory is needed and the setting of rerere.enabled is only for disabling the feature by setting it to 'false'. But the configuration is meant to be the primary control and setting it to 'true' will enable it; the rr-cache directory will be created as necessary and the user does not have to create it. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2012, 20:27:59 UTC |
| d041ffa | Junio C Hamano | 05 January 2012, 00:23:12 UTC | log --show-signature: reword the common two-head merge case While identifying the commit merged to our history as "parent #2" is technically correct, we will never say "parent #1" (as that is the tip of our history before the merge is made), and we rarely would say "parent #3" (which would mean the merge is an octopus), especially when responding to a request to pull a signed tag. Treat the most common case to merge a single commit specially, and just say "merged tag '<tagname>'" instead. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 21:02:27 UTC |
| 824958e | Junio C Hamano | 04 January 2012, 21:51:28 UTC | log-tree: show mergetag in log --show-signature output A commit object that merges a signed tag records the "mergetag" extended header. Check the validity of the GPG signature on it, and show it in a way similar to how "gpgsig" extended header is shown. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 21:02:27 UTC |
| c6b3ec4 | Junio C Hamano | 04 January 2012, 21:48:45 UTC | log-tree.c: small refactor in show_signature() The next patch needs to show the result of signature verification on a mergetag extended header in a way similar to how embedded signature for the commit object itself is shown. Separate out the logic to go through the message lines and show them in the "error" color (highlighted) or the "correct" color (dim). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 21:02:26 UTC |
| c871a1d | Junio C Hamano | 05 January 2012, 18:54:14 UTC | commit --amend -S: strip existing gpgsig headers Any existing commit signature was made against the contents of the old commit, including its committer date that is about to change, and will become invalid by amending it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 21:02:26 UTC |
| e3f55e0 | Junio C Hamano | 04 January 2012, 20:43:02 UTC | verify_signed_buffer: fix stale comment The function used to take an integer flag to specify where the output should go, but these days we supply a strbuf to receive it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 21:02:26 UTC |
| 9d3d784 | Junio C Hamano | 05 January 2012, 19:00:38 UTC | Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag' They both use the extended headers in commit objects, and the former has necessary infrastructure to show them that is useful to view the result of the latter. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 19:00:49 UTC |
| 247f9d2 | Junio C Hamano | 04 January 2012, 19:21:42 UTC | Merge branch 'maint' * maint: t5550: repack everything into one file Catch invalid --depth option passed to clone or fetch | 04 January 2012, 19:21:42 UTC |
| 1327d83 | Clemens Buchacher | 04 January 2012, 15:55:34 UTC | t5550: repack everything into one file Subsequently we assume that there is only one pack. Currently this is true only by accident. Pass '-a -d' to repack in order to guarantee that assumption to hold true. The prune-packed command is now redundant since repack -d already calls it. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2012, 18:04:59 UTC |
| 6ea9385 | Junio C Hamano | 04 January 2012, 17:43:26 UTC | Merge branch 'nd/maint-parse-depth' into maint * nd/maint-parse-depth: Catch invalid --depth option passed to clone or fetch | 04 January 2012, 17:43:26 UTC |
| e7622ce | Nguyễn Thái Ngọc Duy | 04 January 2012, 10:01:55 UTC | Catch invalid --depth option passed to clone or fetch Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2012, 17:39:36 UTC |
| 96890f4 | Joey Hess | 26 December 2011, 16:16:56 UTC | write first for-merge ref to FETCH_HEAD first The FETCH_HEAD refname is supposed to refer to the ref that was fetched and should be merged. However all fetched refs are written to .git/FETCH_HEAD in an arbitrary order, and resolve_ref_unsafe simply takes the first ref as the FETCH_HEAD, which is often the wrong one, when other branches were also fetched. The solution is to write the for-merge ref(s) to FETCH_HEAD first. Then, unless --append is used, the FETCH_HEAD refname behaves as intended. If the user uses --append, they presumably are doing so in order to preserve the old FETCH_HEAD. While we are at it, update an old example in the read-tree documentation that implied that each entry in FETCH_HEAD only has the object name, which is not true for quite a while. [jc: adjusted tests] Signed-off-by: Joey Hess <joey@kitenet.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2012, 00:13:14 UTC |
| 896a681 | Pete Wyckoff | 02 January 2012, 23:05:54 UTC | git-p4: view spec documentation Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 22:10:03 UTC |
| ecb7cf9 | Pete Wyckoff | 02 January 2012, 23:05:53 UTC | git-p4: rewrite view handling The old code was not very complete or robust. Redo it. This new code should be useful for a few possible additions in the future: - support for * and %%n wildcards - allowing ... inside paths - representing branch specs (not just client specs) - tracking changes to views Mark the remaining 12 tests in t9809 as fixed. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 22:10:03 UTC |
| e3e6864 | Gary Gibbons | 02 January 2012, 23:05:52 UTC | git-p4: support single file p4 client view maps Perforce client views can map individual files, mapping one //depot file path to one //client file path. These mappings contain no meta/masking characters. This patch add support for these file maps to the currently supported '...' view mappings. [pw: one test now suceeds] Signed-off-by: Gary Gibbons <ggibbons@perforce.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 22:10:03 UTC |
| df5ed90 | Gary Gibbons | 02 January 2012, 23:05:51 UTC | git-p4: sort client views by reverse View number Correct view sorting to support the Perforce order, where client views are ordered and later views override earlier view mappings. [pw: one test now succeeds] Signed-off-by: Gary Gibbons <ggibbons@perforce.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 22:10:02 UTC |
| b10048d | Gary Gibbons | 02 January 2012, 23:05:50 UTC | git-p4: fix test for unsupported P4 Client Views Change re method in test for unsupported Client View types (containing %% or *) anywhere in the string rather than at the begining. [pw: two tests now succeed] Signed-off-by: Gary Gibbons <ggibbons@perforce.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 22:10:02 UTC |
| c700b68 | Pete Wyckoff | 02 January 2012, 23:05:49 UTC | git-p4: test client view handling Test many aspects of processing p4 client views with the git-p4 option --use-client-spec. 16 out of 22 tests are currently broken. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 22:10:02 UTC |
| 4570aeb | Junio C Hamano | 03 January 2012, 22:09:28 UTC | Merge branch 'pw/p4-docs-and-tests' * pw/p4-docs-and-tests: git-p4: document and test submit options git-p4: test and document --use-client-spec git-p4: test --keep-path git-p4: test --max-changes git-p4: document and test --import-local git-p4: honor --changesfile option and test git-p4: document and test clone --branch git-p4: test cloning with two dirs, clarify doc git-p4: clone does not use --git-dir git-p4: introduce asciidoc documentation rename git-p4 tests | 03 January 2012, 22:09:28 UTC |
| 228c341 | Junio C Hamano | 03 January 2012, 21:48:00 UTC | Merge branch 'maint' * maint: docs: describe behavior of relative submodule URLs fix hang in git fetch if pointed at a 0 length bundle Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore | 03 January 2012, 21:48:00 UTC |
| bc0fe84 | Junio C Hamano | 03 January 2012, 21:47:46 UTC | Merge branch 'maint-1.7.7' into maint * maint-1.7.7: docs: describe behavior of relative submodule URLs Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore | 03 January 2012, 21:47:46 UTC |
| c07aa5b | Junio C Hamano | 03 January 2012, 21:47:15 UTC | Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore | 03 January 2012, 21:47:15 UTC |
| 9e6ed47 | Jens Lehmann | 01 January 2012, 15:13:16 UTC | docs: describe behavior of relative submodule URLs Since the relative submodule URLs have been introduced in f31a522a2d, they do not conform to the rules for resolving relative URIs but rather to those of relative directories. Document that behavior. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 20:47:58 UTC |
| 54440e1 | Brian Harring | 03 January 2012, 13:46:03 UTC | fix hang in git fetch if pointed at a 0 length bundle git-repo if interupted at the exact wrong time will generate zero length bundles- literal empty files. git-repo is wrong here, but git fetch shouldn't effectively spin loop if pointed at a zero length bundle. Signed-off-by: Brian Harring <ferringb@chromium.org> Helped-by: Johannes Sixt Helped-by: Nguyen Thai Ngoc Duy Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 20:13:28 UTC |
| 5c951ef | Clemens Buchacher | 31 December 2011, 11:50:56 UTC | Documentation: read-tree --prefix works with existing subtrees Since 34110cd4 (Make 'unpack_trees()' have a separate source and destination index) it is no longer true that a subdirectory with the same prefix must not exist. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2012, 09:18:53 UTC |
| 44df2e2 | Jonathon Mah | 31 December 2011, 00:14:01 UTC | stash: Don't fail if work dir contains file named 'HEAD' When performing a plain "git stash" (without --patch), git-diff would fail with "fatal: ambiguous argument 'HEAD': both revision and filename". The output was piped into git-update-index, masking the failed exit status. The output is now sent to a temporary file (which is cleaned up by existing code), and the exit status is checked. The "HEAD" arg to the git-diff invocation has been disambiguated too, of course. In patch mode, "git stash -p" would fail harmlessly, leaving the working dir untouched. Interactive adding is fine, but the resulting tree was diffed with an ambiguous 'HEAD' argument. Use >foo (no space) when redirecting output. In t3904, checks and operations on each file are in the order they'll appear when interactively staging. In t3905, fix a bug in "stash save --include-untracked -q is quiet": The redirected stdout file was considered untracked, and so was removed from the working directory. Use test path helper functions where appropriate. Signed-off-by: Jonathon Mah <me@JonathonMah.com> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2012, 09:11:56 UTC |
| 0eddcbf | Jack Nagel | 29 December 2011, 04:42:05 UTC | Add MYMETA.json to perl/.gitignore ExtUtils::MakeMaker generates MYMETA.json in addition to MYMETA.yml since version 6.57_07. As it suggests, it is just meta information about the build and is cleaned up with 'make clean', so it should be ignored. Signed-off-by: Jack Nagel <jacknagel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2011, 21:08:47 UTC |
| 17b4e93 | Junio C Hamano | 28 December 2011, 20:07:22 UTC | Update draft release notes to 1.7.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2011, 20:07:22 UTC |
| 48de656 | Junio C Hamano | 28 December 2011, 20:04:25 UTC | Sync with 1.7.8.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2011, 20:04:25 UTC |
| f3f778d | Junio C Hamano | 28 December 2011, 19:49:09 UTC | Git 1.7.8.2 Contains accumulated fixes since 1.7.8 that have been merged to the 'master' branch in preparation for the 1.7.9 release. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2011, 20:03:24 UTC |
| 9a8e485 | Junio C Hamano | 28 December 2011, 20:03:19 UTC | Merge branch 'jv/maint-config-set' into maint * jv/maint-config-set: Fix an incorrect reference to --set-all. | 28 December 2011, 20:03:19 UTC |
| 0d57085 | Junio C Hamano | 28 December 2011, 19:49:37 UTC | Merge branch 'jk/follow-rename-score' into maint * jk/follow-rename-score: use custom rename score during --follow | 28 December 2011, 19:49:37 UTC |
| 9b0b0b4 | Junio C Hamano | 28 December 2011, 19:44:54 UTC | Merge branch 'jc/checkout-m-twoway' into maint * jc/checkout-m-twoway: t/t2023-checkout-m.sh: fix use of test_must_fail checkout_merged(): squelch false warning from some gcc Test 'checkout -m -- path' checkout -m: no need to insist on having all 3 stages | 28 December 2011, 19:44:54 UTC |
| 00754b2 | Junio C Hamano | 28 December 2011, 19:42:51 UTC | Merge branch 'tr/doc-sh-setup' into maint * tr/doc-sh-setup: git-sh-setup: make require_clean_work_tree part of the interface | 28 December 2011, 19:42:51 UTC |
| b42e81a | Junio C Hamano | 28 December 2011, 19:42:46 UTC | Merge branch 'jk/maint-strbuf-missing-init' into maint * jk/maint-strbuf-missing-init: commit, merge: initialize static strbuf | 28 December 2011, 19:42:46 UTC |
| 4a242d6 | Junio C Hamano | 28 December 2011, 19:42:42 UTC | Merge branch 'jk/maint-push-v-is-verbose' into maint * jk/maint-push-v-is-verbose: make "git push -v" actually verbose | 28 December 2011, 19:42:42 UTC |
| b5c1279 | Junio C Hamano | 28 December 2011, 19:42:37 UTC | Merge branch 'jk/http-push-to-empty' into maint * jk/http-push-to-empty: remote-curl: don't pass back fake refs Conflicts: remote-curl.c | 28 December 2011, 19:42:37 UTC |
| 81eaa06 | Junio C Hamano | 28 December 2011, 19:42:33 UTC | Merge branch 'jk/doc-fsck' into maint * jk/doc-fsck: docs: brush up obsolete bits of git-fsck manpage | 28 December 2011, 19:42:33 UTC |
| 23838b8 | Junio C Hamano | 28 December 2011, 19:42:27 UTC | Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint * jc/maint-lf-to-crlf-keep-crlf: lf_to_crlf_filter(): resurrect CRLF->CRLF hack | 28 December 2011, 19:42:27 UTC |
| e8f6b51 | Junio C Hamano | 28 December 2011, 19:42:24 UTC | Merge branch 'ef/setenv-putenv' into maint * ef/setenv-putenv: compat/setenv.c: error if name contains '=' compat/setenv.c: update errno when erroring out | 28 December 2011, 19:42:24 UTC |
| 3c06ab6 | Junio C Hamano | 28 December 2011, 19:32:39 UTC | Merge branch 'jc/advice-doc' into maint * jc/advice-doc: advice: Document that they all default to true | 28 December 2011, 19:32:39 UTC |
| 770dd00 | Junio C Hamano | 28 December 2011, 19:32:39 UTC | Merge branch 'jn/maint-sequencer-fixes' into maint * jn/maint-sequencer-fixes: revert: stop creating and removing sequencer-old directory Revert "reset: Make reset remove the sequencer state" revert: do not remove state until sequence is finished revert: allow single-pick in the middle of cherry-pick sequence revert: pass around rev-list args in already-parsed form revert: allow cherry-pick --continue to commit before resuming revert: give --continue handling its own function | 28 December 2011, 19:32:39 UTC |
| 7fc1495 | Junio C Hamano | 28 December 2011, 19:32:38 UTC | Merge branch 'jk/maint-snprintf-va-copy' into maint * jk/maint-snprintf-va-copy: compat/snprintf: don't look at va_list twice | 28 December 2011, 19:32:38 UTC |
| f1c12e1 | Junio C Hamano | 28 December 2011, 19:32:37 UTC | Merge branch 'jk/maint-push-over-dav' into maint * jk/maint-push-over-dav: http-push: enable "proactive auth" t5540: test DAV push with authentication | 28 December 2011, 19:32:37 UTC |
| 699eb54 | Junio C Hamano | 28 December 2011, 19:32:36 UTC | Merge branch 'jk/maint-mv' into maint * jk/maint-mv: mv: be quiet about overwriting mv: improve overwrite warning mv: make non-directory destination error more clear mv: honor --verbose flag docs: mention "-k" for both forms of "git mv" | 28 December 2011, 19:32:36 UTC |
| 7a5638a | Junio C Hamano | 28 December 2011, 19:32:36 UTC | Merge branch 'jk/fetch-no-tail-match-refs' into maint * jk/fetch-no-tail-match-refs: connect.c: drop path_match function fetch-pack: match refs exactly t5500: give fully-qualified refs to fetch-pack drop "match" parameter from get_remote_heads | 28 December 2011, 19:32:36 UTC |
| 2cb1ff9 | Junio C Hamano | 28 December 2011, 19:32:36 UTC | Merge branch 'ew/keepalive' into maint * ew/keepalive: enable SO_KEEPALIVE for connected TCP sockets | 28 December 2011, 19:32:36 UTC |
| 4742949 | Junio C Hamano | 28 December 2011, 19:32:35 UTC | Merge branch 'ci/stripspace-docs' into maint * ci/stripspace-docs: Update documentation for stripspace | 28 December 2011, 19:32:35 UTC |
| 9ddb7ea | Junio C Hamano | 28 December 2011, 19:32:35 UTC | Merge branch 'jh/fast-import-notes' into maint * jh/fast-import-notes: fast-import: Fix incorrect fanout level when modifying existing notes refs t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling t9301: Fix testcase covering up a bug in fast-import's notes fanout handling | 28 December 2011, 19:32:35 UTC |
| d9d73b3 | Junio C Hamano | 28 December 2011, 19:32:34 UTC | Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint * aw/rebase-i-stop-on-failure-to-amend: rebase -i: interrupt rebase when "commit --amend" failed during "reword" | 28 December 2011, 19:32:34 UTC |
| 4df989f | Junio C Hamano | 28 December 2011, 19:32:34 UTC | Merge branch 'tj/maint-imap-send-remove-unused' into maint * tj/maint-imap-send-remove-unused: imap-send: Remove unused 'use_namespace' variable | 28 December 2011, 19:32:34 UTC |
| 7958774 | Junio C Hamano | 28 December 2011, 19:32:33 UTC | Merge branch 'jn/branch-move-to-self' into maint * jn/branch-move-to-self: Allow checkout -B <current-branch> to update the current branch branch: allow a no-op "branch -M <current-branch> HEAD" | 28 December 2011, 19:32:33 UTC |
| e39888b | Junio C Hamano | 28 December 2011, 19:32:33 UTC | Merge branch 'na/strtoimax' into maint * na/strtoimax: Support sizes >=2G in various config options accepting 'g' sizes. Compatibility: declare strtoimax() under NO_STRTOUMAX Add strtoimax() compatibility function. | 28 December 2011, 19:32:33 UTC |
| 786a961 | Junio C Hamano | 28 December 2011, 19:32:32 UTC | Merge branch 'jk/refresh-porcelain-output' into maint * jk/refresh-porcelain-output: refresh_index: make porcelain output more specific refresh_index: rename format variables read-cache: let refresh_cache_ent pass up changed flags | 28 December 2011, 19:32:32 UTC |
| 67e223e | Jelmer Vernooij | 27 December 2011, 02:03:45 UTC | Fix an incorrect reference to --set-all. Signed-off-by: Jelmer Vernooij <jelmer@samba.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2011, 19:14:18 UTC |
| 28755db | Pete Wyckoff | 25 December 2011, 02:07:40 UTC | git-p4: document and test submit options Clarify there is a -M option, but no -C. These are both configurable through variables. Explain that the allowSubmit variable takes a comma-separated list of branch names. Catch earlier an invalid branch name given as an argument to "git p4 clone". Test option --origin, variable allowSubmit, and explicit master branch name. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2011, 18:19:31 UTC |
| 09fca77 | Pete Wyckoff | 25 December 2011, 02:07:39 UTC | git-p4: test and document --use-client-spec The depot path is required, even with this option. Make sure git-p4 fails and exits with non-zero. Contents in the specified depot path will be rearranged according to the client spec. Test this and add a note in the docs. Leave an XXX suggesting that this is somewhat confusing behavior that might be good to fix later. Function stripRepoPath() looks at self.useClientSpec. Make sure this is set both for command-line option --use-client-spec and for configuration variable git-p4.useClientSpec. Test this. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2011, 18:19:31 UTC |
| ae3f41f | Pete Wyckoff | 25 December 2011, 02:07:38 UTC | git-p4: test --keep-path Make sure it leaves the path, below //depot, in git. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2011, 18:19:31 UTC |
| 7fbe1ce | Pete Wyckoff | 25 December 2011, 02:07:37 UTC | git-p4: test --max-changes Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2011, 18:19:30 UTC |
| 5a92a6c | Pete Wyckoff | 25 December 2011, 02:07:36 UTC | git-p4: document and test --import-local Explain that it is needed on future syncs to find p4 branches in refs/heads. Test this behavior. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2011, 18:19:30 UTC |
| 58c8bc7 | Pete Wyckoff | 25 December 2011, 02:07:35 UTC | git-p4: honor --changesfile option and test When an explicit list of changes is given, it makes no sense to use @all or @3,5 or any of the other p4 revision specifiers. Make the code notice when this happens, instead of just ignoring --changesfile. Test it. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2011, 18:19:30 UTC |
| 1471c6b | Pete Wyckoff | 25 December 2011, 02:07:34 UTC | git-p4: document and test clone --branch Clone with --branch will not checkout HEAD, unless the branch happens to be called the default refs/remotes/p4/master. The --branch option is most useful with sync; give an example of that. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2011, 18:19:30 UTC |
| da191d1 | Pete Wyckoff | 25 December 2011, 02:07:33 UTC | git-p4: test cloning with two dirs, clarify doc Document how git-p4 currently works when specifying multiple depot paths: 1. No branches or directories are named. 2. Conflicting files are silently ignored---the last change wins. 2. Option --destination is required, else the last path is construed to be a directory. 3. Revision specifiers must be the same on all paths for them to take effect. Test this behavior. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2011, 18:19:30 UTC |
| ef86890 | Pete Wyckoff | 25 December 2011, 02:07:32 UTC | git-p4: clone does not use --git-dir Complain if --git-dir is given during a clone. It has no effect. Only --destination and --bare can change where the newly cloned git dir will be. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2011, 18:19:30 UTC |
| 6679c34 | Pete Wyckoff | 25 December 2011, 02:07:31 UTC | git-p4: introduce asciidoc documentation Add proper documentation for git-p4. Delete the old .txt documentation from contrib/fast-import. Cc: Frans Klaver <fransklaver@gmail.com> Cc: Luke Diamand <luke@diamand.org> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2011, 18:19:30 UTC |
| 9e602b2 | Pete Wyckoff | 25 December 2011, 02:07:30 UTC | rename git-p4 tests Use consistent naming for all tests: "t98<num>-git-p4-<topic>.sh" Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2011, 18:19:06 UTC |
| ec33015 | Junio C Hamano | 22 December 2011, 23:36:48 UTC | Update draft release notes in preparation for 1.7.9-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2011, 23:36:48 UTC |
| 2b6dd6a | Junio C Hamano | 22 December 2011, 23:30:38 UTC | Merge branch 'tr/bash-read-unescaped' * tr/bash-read-unescaped: bash completion: use read -r everywhere | 22 December 2011, 23:30:38 UTC |
| 3572668 | Junio C Hamano | 22 December 2011, 23:30:33 UTC | Merge branch 'ab/sun-studio-portability' * ab/sun-studio-portability: Appease Sun Studio by renaming "tmpfile" Fix a bitwise negation assignment issue spotted by Sun Studio Fix an enum assignment issue spotted by Sun Studio | 22 December 2011, 23:30:33 UTC |
| f0ede84 | Junio C Hamano | 22 December 2011, 23:30:29 UTC | Merge branch 'tr/doc-sh-setup' * tr/doc-sh-setup: git-sh-setup: make require_clean_work_tree part of the interface | 22 December 2011, 23:30:29 UTC |
| c012943 | Junio C Hamano | 22 December 2011, 23:30:22 UTC | Merge branch 'rr/revert-cherry-pick' * rr/revert-cherry-pick: t3502, t3510: clarify cherry-pick -m failure t3510 (cherry-pick-sequencer): use exit status revert: simplify getting commit subject in format_todo() revert: tolerate extra spaces, tabs in insn sheet revert: make commit subjects in insn sheet optional revert: free msg in format_todo() | 22 December 2011, 23:30:22 UTC |
| 6fee20d | Junio C Hamano | 22 December 2011, 23:30:15 UTC | Merge branch 'tr/pty-all' * tr/pty-all: test-terminal: set output terminals to raw mode | 22 December 2011, 23:30:15 UTC |
| 2b380d8 | Junio C Hamano | 22 December 2011, 23:30:12 UTC | Merge branch 'jn/maint-gitweb-utf8-fix' * jn/maint-gitweb-utf8-fix: gitweb: Fix fallback mode of to_utf8 subroutine gitweb: Output valid utf8 in git_blame_common('data') gitweb: esc_html() site name for title in OPML gitweb: Call to_utf8() on input string in chop_and_escape_str() | 22 December 2011, 23:30:12 UTC |
| 5d6dfc7 | Junio C Hamano | 22 December 2011, 19:43:02 UTC | Update draft release notes to 1.7.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2011, 19:43:02 UTC |
| 1aea303 | Junio C Hamano | 22 December 2011, 19:27:31 UTC | Merge branch 'jk/maint-strbuf-missing-init' * jk/maint-strbuf-missing-init: commit, merge: initialize static strbuf Conflicts: builtin/merge.c | 22 December 2011, 19:27:31 UTC |
| 339aff0 | Junio C Hamano | 22 December 2011, 19:27:29 UTC | Merge branch 'jc/maint-lf-to-crlf-keep-crlf' * jc/maint-lf-to-crlf-keep-crlf: lf_to_crlf_filter(): resurrect CRLF->CRLF hack | 22 December 2011, 19:27:29 UTC |
| e927c16 | Junio C Hamano | 22 December 2011, 19:27:29 UTC | Merge branch 'rs/diff-tree-combined-clean-up' * rs/diff-tree-combined-clean-up: submodule: use diff_tree_combined_merge() instead of diff_tree_combined() pass struct commit to diff_tree_combined_merge() use struct sha1_array in diff_tree_combined() | 22 December 2011, 19:27:29 UTC |
| c735ce4 | Junio C Hamano | 22 December 2011, 19:27:29 UTC | Merge branch 'jk/maint-push-v-is-verbose' * jk/maint-push-v-is-verbose: make "git push -v" actually verbose | 22 December 2011, 19:27:29 UTC |
| ced7469 | Junio C Hamano | 22 December 2011, 19:27:28 UTC | Merge branch 'tr/grep-threading' * tr/grep-threading: grep: disable threading in non-worktree case grep: enable threading with -p and -W using lazy attribute lookup grep: load funcname patterns for -W | 22 December 2011, 19:27:28 UTC |
| adb8676 | Junio C Hamano | 22 December 2011, 19:27:28 UTC | Merge branch 'jk/pretty-reglog-ent' * jk/pretty-reglog-ent: pretty: give placeholders to reflog identity | 22 December 2011, 19:27:28 UTC |
| d5cb31a | Junio C Hamano | 22 December 2011, 19:27:27 UTC | Merge branch 'jk/follow-rename-score' * jk/follow-rename-score: use custom rename score during --follow | 22 December 2011, 19:27:27 UTC |
| a4c628d | Junio C Hamano | 22 December 2011, 19:27:27 UTC | Merge branch 'jk/doc-fsck' * jk/doc-fsck: docs: brush up obsolete bits of git-fsck manpage Conflicts: Documentation/git-fsck.txt | 22 December 2011, 19:27:27 UTC |
| f35ccd9 | Junio C Hamano | 22 December 2011, 19:27:26 UTC | Merge branch 'nd/war-on-nul-in-commit' * nd/war-on-nul-in-commit: commit_tree(): refuse commit messages that contain NULs Convert commit_tree() to take strbuf as message merge: abort if fails to commit Conflicts: builtin/commit.c commit.c commit.h | 22 December 2011, 19:27:26 UTC |
| 52b9d2c | Junio C Hamano | 22 December 2011, 19:27:25 UTC | Merge branch 'jk/maint-do-not-feed-stdin-to-tests' * jk/maint-do-not-feed-stdin-to-tests: test-lib: redirect stdin of tests | 22 December 2011, 19:27:25 UTC |
| c53d1e4 | Junio C Hamano | 22 December 2011, 19:27:24 UTC | Merge branch 'jn/test-cleanup-7006' * jn/test-cleanup-7006: test: errors preparing for a test are not special | 22 December 2011, 19:27:24 UTC |
| 340c54a | Junio C Hamano | 22 December 2011, 19:27:24 UTC | Merge branch 'ef/setenv-putenv' * ef/setenv-putenv: compat/setenv.c: error if name contains '=' compat/setenv.c: update errno when erroring out | 22 December 2011, 19:27:24 UTC |
| ded408f | Junio C Hamano | 22 December 2011, 19:27:23 UTC | Merge branch 'jk/git-prompt' * jk/git-prompt: contrib: add credential helper for OS X Keychain Makefile: OS X has /dev/tty Makefile: linux has /dev/tty credential: use git_prompt instead of git_getpass prompt: use git_terminal_prompt add generic terminal prompt function refactor git_getpass into generic prompt function move git_getpass to its own source file imap-send: don't check return value of git_getpass imap-send: avoid buffer overflow Conflicts: Makefile | 22 December 2011, 19:27:23 UTC |
| 200888e | Junio C Hamano | 22 December 2011, 19:27:22 UTC | Merge branch 'jk/http-push-to-empty' * jk/http-push-to-empty: remote-curl: don't pass back fake refs Conflicts: remote-curl.c | 22 December 2011, 19:27:22 UTC |
| e443bdf | Junio C Hamano | 21 December 2011, 20:02:39 UTC | Sync with v1.7.8.1 | 21 December 2011, 20:02:44 UTC |
| 2ce0edc | Junio C Hamano | 21 December 2011, 20:02:13 UTC | Git 1.7.8.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2011, 20:02:13 UTC |
