| c965c02 | Junio C Hamano | 13 April 2009, 00:05:55 UTC | GIT 1.6.3-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 00:05:55 UTC |
| 54a4749 | Nanako Shiraishi | 10 April 2009, 00:34:40 UTC | Documentation/git.txt: GIT 1.6.2.2 has been out for a while These links inside "stalenotes" section need to be updated on the master branch every time a new stable or maintenance release is made. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 00:04:17 UTC |
| 6f523f6 | Junio C Hamano | 12 April 2009, 23:46:42 UTC | Merge branch 'jk/no-perl' * jk/no-perl: tests: skip perl tests if NO_PERL is defined Makefile: allow building without perl | 12 April 2009, 23:46:42 UTC |
| c736bec | Junio C Hamano | 12 April 2009, 23:46:42 UTC | Merge branch 'sb/doc-upstream-branch' * sb/doc-upstream-branch: Documentation: Introduce "upstream branch" | 12 April 2009, 23:46:42 UTC |
| 3e52eff | Junio C Hamano | 12 April 2009, 23:46:42 UTC | Merge branch 'jk/show-upstream' * jk/show-upstream: branch: show upstream branch when double verbose make get_short_ref a public function for-each-ref: add "upstream" format field for-each-ref: refactor refname handling for-each-ref: refactor get_short_ref function | 12 April 2009, 23:46:42 UTC |
| c276857 | Junio C Hamano | 12 April 2009, 23:46:41 UTC | Merge branch 'fg/remote-prune' * fg/remote-prune: add tests for remote groups git remote update: Fallback to remote if group does not exist remote: New function remote_is_configured() git remote update: Report error for non-existing groups git remote update: New option --prune builtin-remote.c: Split out prune_remote as a separate function. | 12 April 2009, 23:46:41 UTC |
| 07fb030 | Junio C Hamano | 12 April 2009, 23:46:41 UTC | Merge branch 'cc/sha1-bsearch' * cc/sha1-bsearch: sha1-lookup: fix up the assertion message | 12 April 2009, 23:46:41 UTC |
| 6e353a5 | Junio C Hamano | 12 April 2009, 23:46:40 UTC | Merge branch 'cc/bisect-filter' * cc/bisect-filter: (21 commits) rev-list: add "int bisect_show_flags" in "struct rev_list_info" rev-list: remove last static vars used in "show_commit" list-objects: add "void *data" parameter to show functions bisect--helper: string output variables together with "&&" rev-list: pass "int flags" as last argument of "show_bisect_vars" t6030: test bisecting with paths bisect: use "bisect--helper" and remove "filter_skipped" function bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES" bisect--helper: implement "git bisect--helper" bisect: use the new generic "sha1_pos" function to lookup sha1 rev-list: call new "filter_skip" function patch-ids: use the new generic "sha1_pos" function to lookup sha1 sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1 rev-list: pass "revs" to "show_bisect_vars" rev-list: make "show_bisect_vars" non static rev-list: move code to show bisect vars into its own function rev-list: move bisect related code into its own file rev-list: make "bisect_list" variable local to "cmd_rev_list" refs: add "for_each_ref_in" function to refactor "for_each_*_ref" functions quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array ... | 12 April 2009, 23:46:40 UTC |
| a54c4ed | Junio C Hamano | 12 April 2009, 23:01:25 UTC | Merge branch 'maint' * maint: GIT 1.6.2.3 State the effect of filter-branch on graft explicitly process_{tree,blob}: Remove useless xstrdup calls Conflicts: GIT-VERSION-GEN | 12 April 2009, 23:01:25 UTC |
| 3bd1bb3 | Junio C Hamano | 12 April 2009, 22:43:24 UTC | GIT 1.6.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 22:57:58 UTC |
| 1966af8 | Junio C Hamano | 12 April 2009, 22:34:53 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: State the effect of filter-branch on graft explicitly process_{tree,blob}: Remove useless xstrdup calls | 12 April 2009, 22:34:53 UTC |
| bc69776 | Junio C Hamano | 12 April 2009, 22:20:29 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: State the effect of filter-branch on graft explicitly process_{tree,blob}: Remove useless xstrdup calls | 12 April 2009, 22:20:29 UTC |
| c6d8f76 | Daniel Cheng (aka SDiZ) | 10 April 2009, 06:26:49 UTC | State the effect of filter-branch on graft explicitly Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 21:30:40 UTC |
| 2131526 | Linus Torvalds | 10 April 2009, 22:20:18 UTC | process_{tree,blob}: Remove useless xstrdup calls On Wed, 8 Apr 2009, Björn Steinbrink wrote: > > The name of the processed object was duplicated for passing it to > add_object(), but that already calls path_name, which allocates a new > string anyway. So the memory allocated by the xstrdup calls just went > nowhere, leaking memory. Ack, ack. There's another easy 5% or so for the built-in object walker: once we've created the hash from the name, the name isn't interesting any more, and so something trivial like this can help a bit. Does it matter? Probably not on its own. But a few more memory saving tricks and it might all make a difference. Linus Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 21:30:31 UTC |
| ee7ec2f | Ben Walton | 22 March 2009, 13:20:44 UTC | documentation: Makefile accounts for SHELL_PATH setting Ensure that the Makefile that generates and installs the Documentation is aware of any SHELL_PATH setting. Use this value if found or the current setting for SHELL if not. This is an accommodation for systems where sh is not POSIX enough. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 08:35:12 UTC |
| cced5fb | Linus Torvalds | 09 April 2009, 18:46:15 UTC | Allow users to un-configure rename detection I told people on the kernel mailing list to please use "-M" when sending me rename patches, so that I can see what they do while reading email rather than having to apply the patch and then look at the end result. I also told them that if they want to make it the default, they can just add [diff] renames to their ~/.gitconfig file. And while I was thinking about that, I wanted to also check whether you can then mark individual projects to _not_ have that default in the per-repository .git/config file. And you can't. Currently you cannot have a global "enable renames by default" and then a local ".. but not for _this_ project". Why? Because if somebody writes [diff] renames = no we simply ignore it, rather than resetting "diff_detect_rename_default" back to zero. Fixed thusly. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 05:22:00 UTC |
| 519d05b | Mike Hommey | 09 April 2009, 22:25:37 UTC | Replace ",<,>,& with their respective XML entities in DAV requests If the repo url or the user email contain XML special characters, the remote DAV server is likely to reject the LOCK requests because the XML is then malformed. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 05:21:59 UTC |
| d3c9634 | Johannes Schindelin | 09 April 2009, 11:29:57 UTC | git-svn: always initialize with core.autocrlf=false It has been reported time and time again in relation to msysGit that git-svn does not work well when core.autocrlf has any value other than 'false'. So let's make it so by default. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 05:21:59 UTC |
| b6c2991 | Dan McGee | 09 April 2009, 15:45:39 UTC | Update delta compression message to be less misleading In the case of a small repository, pack-objects is smart enough to not start more threads than necessary. However, the output to the user always reports the value of the pack.threads configuration and not the real number of threads to be used. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 05:21:59 UTC |
| 88ec205 | Ben Jackson | 11 April 2009, 17:46:18 UTC | git-svn: Save init/clone --ignore-paths in config The --ignored-paths argument is now stored as "svn-remote.$REMOTE_NAME.ignore-paths" in the config file. [ew: edited subject and message] Signed-off-by: Ben Jackson <ben@ben.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 12 April 2009, 00:55:37 UTC |
| 0d8bee7 | Ben Jackson | 11 April 2009, 17:46:17 UTC | git-svn: Add per-svn-remote ignore-paths config The --ignore-paths option to fetch is very useful for working on a subset of a SVN repository. For proper operation, every command that causes a fetch (explicit or implied) must include a matching --ignore-paths option. This patch adds a persistent svn-remote.$repo_id.ignore-paths config by promoting Fetcher::is_path_ignored to a member function and initializing $self->{ignore_regex} in Fetcher::new. Command line --ignore-paths is still recognized and acts in addition to the config value. Signed-off-by: Ben Jackson <ben@ben.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 12 April 2009, 00:55:37 UTC |
| 6ea4203 | Boris Byk | 10 April 2009, 20:32:41 UTC | git-svn: speed up blame command 'git svn blame' now uses the 'git cat-file --batch' command to speed up resolving SVN revision number out of commit SHA by removing fork+exec overhead. [ew: enforced 80-column line wrap] Signed-off-by: Boris Byk <boris.byk@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 12 April 2009, 00:55:04 UTC |
| c2abd83 | Jason Merrill | 06 April 2009, 20:37:59 UTC | git-svn: add fetch --parent option Signed-off-by: Jason Merrill <jason@redhat.com> Acked-By: Eric Wong <normalperson@yhbt.net> | 12 April 2009, 00:53:52 UTC |
| 27845e9 | Jeff King | 06 April 2009, 20:18:23 UTC | add tests for remote groups This tries to systematically cover existing behavior, and also mark some expect_failure cases for desired behavior. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2009, 08:30:06 UTC |
| e37347b | Junio C Hamano | 09 April 2009, 07:04:17 UTC | Update draft release notes to 1.6.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2009, 07:04:55 UTC |
| 796b137 | Junio C Hamano | 09 April 2009, 06:41:27 UTC | Merge branch 'maint' * maint: Start 1.6.2.3 preparation process_{tree,blob}: Remove useless xstrdup calls git-pull.sh: better warning message for "git pull" on detached head. Conflicts: RelNotes | 09 April 2009, 06:47:23 UTC |
| db12d97 | Junio C Hamano | 09 April 2009, 06:40:33 UTC | Start 1.6.2.3 preparation Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2009, 06:40:33 UTC |
| bff82d0 | Junio C Hamano | 09 April 2009, 06:23:41 UTC | Merge branch 'jc/shared-literally' into maint * jc/shared-literally: t1301: loosen test for forced modes set_shared_perm(): sometimes we know what the final mode bits should look like move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath Move chmod(foo, 0444) into move_temp_to_file() "core.sharedrepository = 0mode" should set, not loosen | 09 April 2009, 06:23:41 UTC |
| 197cf8d | Junio C Hamano | 09 April 2009, 06:23:17 UTC | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint * jc/maint-1.6.0-diff-borrow-carefully: diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged | 09 April 2009, 06:23:17 UTC |
| 0122cf6 | Junio C Hamano | 09 April 2009, 06:22:09 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: process_{tree,blob}: Remove useless xstrdup calls | 09 April 2009, 06:22:09 UTC |
| f7af757 | Junio C Hamano | 09 April 2009, 06:22:05 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: process_{tree,blob}: Remove useless xstrdup calls | 09 April 2009, 06:22:05 UTC |
| c3067cb | Junio C Hamano | 09 April 2009, 06:21:10 UTC | Merge branch 'jc/maint-1.6.0-keep-pack' into maint * jc/maint-1.6.0-keep-pack: pack-objects: don't loosen objects available in alternate or kept packs t7700: demonstrate repack flaw which may loosen objects unnecessarily Remove --kept-pack-only option and associated infrastructure pack-objects: only repack or loosen objects residing in "local" packs git-repack.sh: don't use --kept-pack-only option to pack-objects t7700-repack: add two new tests demonstrating repacking flaws is_kept_pack(): final clean-up Simplify is_kept_pack() Consolidate ignore_packed logic more has_sha1_kept_pack(): take "struct rev_info" has_sha1_pack(): refactor "pretend these packs do not exist" interface git-repack: resist stray environment variable Conflicts: t/t7700-repack.sh | 09 April 2009, 06:21:10 UTC |
| bb11eb3 | Junio C Hamano | 09 April 2009, 06:02:17 UTC | Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1 * jc/maint-1.6.0-blame-s: blame: read custom grafts given by -S before calling setup_revisions() Conflicts: builtin-blame.c | 09 April 2009, 06:02:17 UTC |
| 1c9f544 | Junio C Hamano | 09 April 2009, 06:01:15 UTC | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1 * bc/maint-1.6.1-branch-deleted-was: git-branch: display "was sha1" on branch deletion rather than just "sha1" | 09 April 2009, 06:01:15 UTC |
| 1f398ee | Junio C Hamano | 09 April 2009, 06:01:10 UTC | Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1 * js/maint-1.6.0-exec-path-env: Propagate --exec-path setting to external commands via GIT_EXEC_PATH | 09 April 2009, 06:01:10 UTC |
| 5b841d6 | Junio C Hamano | 09 April 2009, 06:00:21 UTC | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1 * tr/maint-1.6.1-doc-format-patch--root: Documentation: format-patch --root clarifications | 09 April 2009, 06:00:21 UTC |
| de551d4 | Björn Steinbrink | 08 April 2009, 11:28:54 UTC | process_{tree,blob}: Remove useless xstrdup calls The name of the processed object was duplicated for passing it to add_object(), but that already calls path_name, which allocates a new string anyway. So the memory allocated by the xstrdup calls just went nowhere, leaking memory. This reduces the RSS usage for a "rev-list --all --objects" by about 10% on the gentoo repo (fully packed) as well as linux-2.6.git: gentoo: | old | new ----------------|------------------------------- RSS | 1537284 | 1388408 VSZ | 1816852 | 1667952 time elapsed | 1:49.62 | 1:48.99 min. page faults| 417178 | 379919 linux-2.6.git: | old | new ----------------|------------------------------- RSS | 324452 | 292996 VSZ | 491792 | 460376 time elapsed | 0:14.53 | 0:14.28 min. page faults| 89360 | 81613 Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2009, 05:58:43 UTC |
| 1b19ccd | Jeff King | 03 April 2009, 19:33:59 UTC | tests: skip perl tests if NO_PERL is defined These scripts all test git programs that are written in perl, and thus obviously won't work if NO_PERL is defined. We pass NO_PERL to the scripts from the building Makefile via the GIT-BUILD-OPTIONS file. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2009, 05:42:16 UTC |
| 499c293 | Jeff King | 03 April 2009, 19:32:20 UTC | Makefile: allow building without perl For systems with a missing or broken perl, it is nicer to explicitly say "we don't want perl" because: 1. The Makefile knows not to bother with Perl-ish things like Git.pm. 2. We can print a more user-friendly error message than "foo is not a git command" or whatever the broken perl might barf 3. Test scripts that require perl can mark themselves and such and be skipped This patch implements parts (1) and (2). The perl/ subdirectory is skipped entirely, gitweb is not built, and any git commands which rely on perl will print a human-readable message and exit with an error code. This patch is based on one from Robin H. Johnson. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2009, 05:14:56 UTC |
| 61e6108 | Matthieu Moy | 08 April 2009, 07:24:03 UTC | git-pull.sh: better warning message for "git pull" on detached head. Otherwise, git complains about not finding a branch to pull from in 'branch..merge', which is hardly understandable. While we're there, reword the sentences slightly. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 07:39:51 UTC |
| 2d8a7f0 | Jeff King | 07 April 2009, 07:16:56 UTC | branch: show upstream branch when double verbose This information is easily accessible when we are calculating the relationship. The only reason not to print it all the time is that it consumes a fair bit of screen space, and may not be of interest to the user. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 06:22:15 UTC |
| 7c2b302 | Jeff King | 07 April 2009, 07:14:20 UTC | make get_short_ref a public function Often we want to shorten a full ref name to something "prettier" to show a user. For example, "refs/heads/master" is often shown simply as "master", or "refs/remotes/origin/master" is shown as "origin/master". Many places in the code use a very simple formula: skip common prefixes like refs/heads, refs/remotes, etc. This is codified in the prettify_ref function. for-each-ref has a more correct (but more expensive) approach: consider the ref lookup rules, and try shortening as much as possible while remaining unambiguous. This patch makes the latter strategy globally available as shorten_unambiguous_ref. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 06:22:15 UTC |
| 8cae19d | Jeff King | 07 April 2009, 07:09:39 UTC | for-each-ref: add "upstream" format field The logic for determining the upstream ref of a branch is somewhat complex to perform in a shell script. This patch provides a plumbing mechanism for scripts to access the C logic used internally by git-status, git-branch, etc. For example: $ git for-each-ref \ --format='%(refname:short) %(upstream:short)' \ refs/heads/ master origin/master Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 06:22:15 UTC |
| 8db9a4b | Jeff King | 07 April 2009, 07:06:51 UTC | for-each-ref: refactor refname handling This code handles some special magic like *-deref and the :short formatting specifier. The next patch will add another field which outputs a ref and wants to use the same code. This patch splits the "which ref are we outputting" from the actual formatting. There should be no behavioral change. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 06:18:14 UTC |
| 6da14ee | Junio C Hamano | 08 April 2009, 06:05:43 UTC | Merge branch 'maint' * maint: Change double quotes to single quotes in message Documentation: clarify .gitattributes search git-checkout.txt: clarify that <branch> applies when no path is given. git-checkout.txt: fix incorrect statement about HEAD and index Conflicts: Documentation/git-checkout.txt | 08 April 2009, 06:05:43 UTC |
| 747f9d3 | Junio C Hamano | 08 April 2009, 06:05:14 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: Documentation: clarify .gitattributes search git-checkout.txt: clarify that <branch> applies when no path is given. git-checkout.txt: fix incorrect statement about HEAD and index | 08 April 2009, 06:05:14 UTC |
| 714fddf | Jari Aalto | 21 March 2009, 09:00:54 UTC | Change double quotes to single quotes in message Most of the time when we give branch name in the message, we quote it inside a pair of single-quotes. git-checkout uses double-quotes; this patch corrects the inconsistency. Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 06:04:45 UTC |
| aa41cf8 | Junio C Hamano | 08 April 2009, 05:51:14 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: Documentation: clarify .gitattributes search git-checkout.txt: clarify that <branch> applies when no path is given. git-checkout.txt: fix incorrect statement about HEAD and index | 08 April 2009, 05:51:14 UTC |
| 9e36d11 | Junio C Hamano | 08 April 2009, 05:33:13 UTC | Merge branch 'lt/reflog-expire' * lt/reflog-expire: Speed up reflog pruning of unreachable commits Clean up reflog unreachability pruning decision | 08 April 2009, 05:33:13 UTC |
| 00f39fc | Junio C Hamano | 08 April 2009, 05:33:10 UTC | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' * bs/maint-1.6.0-tree-walk-prefix: match_tree_entry(): a pathspec only matches at directory boundaries tree_entry_interesting: a pathspec only matches at directory boundary | 08 April 2009, 05:33:10 UTC |
| fe42fe4 | Junio C Hamano | 08 April 2009, 05:33:05 UTC | Merge branch 'ms/http-auth' * ms/http-auth: Allow curl to rewind the read buffers | 08 April 2009, 05:33:05 UTC |
| a990672 | Junio C Hamano | 08 April 2009, 05:33:02 UTC | Merge branch 'js/maint-submodule-checkout' * js/maint-submodule-checkout: Fix 'git checkout <submodule>' to update the index | 08 April 2009, 05:33:02 UTC |
| 2149e0f | Junio C Hamano | 08 April 2009, 05:32:56 UTC | Merge branch 'cb/maint-merge-recursive-submodule-fix' * cb/maint-merge-recursive-submodule-fix: simplify output of conflicting merge update cache for conflicting submodule entries add tests for merging with submodules | 08 April 2009, 05:32:56 UTC |
| d65279d | Junio C Hamano | 08 April 2009, 05:32:51 UTC | Merge branch 'mh/html-path' * mh/html-path: add --html-path to get the location of installed HTML docs | 08 April 2009, 05:32:51 UTC |
| 13858e5 | Christian Couder | 07 April 2009, 03:08:42 UTC | rev-list: add "int bisect_show_flags" in "struct rev_list_info" This is a cleanup patch to make it easier to use the "show_bisect_vars" function and take advantage of the rev_list_info struct. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 05:12:44 UTC |
| d797257 | Christian Couder | 06 April 2009, 20:28:00 UTC | rev-list: remove last static vars used in "show_commit" This patch removes the last static variables that were used in the "show_commit" function. To do that, we create a new "rev_list_info" struct that we will pass in the "void *data" argument to "show_commit". This means that we have to change the first argument to "show_bisect_vars" too. While at it, we also remove a "struct commit_list *list" variable in "cmd_rev_list" that is not really needed. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 05:12:41 UTC |
| 11c211f | Christian Couder | 06 April 2009, 19:28:36 UTC | list-objects: add "void *data" parameter to show functions The goal of this patch is to get rid of the "static struct rev_info revs" static variable in "builtin-rev-list.c". To do that, we need to pass the revs to the "show_commit" function in "builtin-rev-list.c" and this in turn means that the "traverse_commit_list" function in "list-objects.c" must be passed functions pointers to functions with 2 parameters instead of one. So we have to change all the callers and all the functions passed to "traverse_commit_list". Anyway this makes the code more clean and more generic, so it should be a good thing in the long run. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 05:12:38 UTC |
| 982962c | Matthieu Moy | 07 April 2009, 17:24:33 UTC | git-rev-list.txt: make ascii markup uniform with other pages. Other pages use --option=<argument>, not --option='argument', do the same here. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 05:08:13 UTC |
| 4c0fe0a | Matthieu Moy | 07 April 2009, 17:24:32 UTC | git-send-email.txt: clarify which options take an argument. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 05:07:58 UTC |
| 3d4ecc0 | Jeff King | 07 April 2009, 07:05:01 UTC | for-each-ref: refactor get_short_ref function This function took a "refinfo" object which is unnecessarily restrictive; it only ever looked at the refname field. This patch refactors it to take just the ref name as a string. While we're touching the relevant lines, let's give it consistent memory semantics. Previously, some code paths would return an allocated string and some would return the original string; now it will always return a malloc'd string. This doesn't actually fix a bug or a leak, because for-each-ref doesn't clean up its memory, but it makes the function a lot less surprising for reuse (which will happen in a later patch). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 05:06:12 UTC |
| e892dc7 | Santi Béjar | 06 April 2009, 23:24:30 UTC | Documentation: Introduce "upstream branch" Signed-off-by: Santi Béjar <santi@agolina.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 05:04:41 UTC |
| 20ff3ec | Jason Merrill | 06 April 2009, 15:03:36 UTC | Documentation: clarify .gitattributes search Use the term "toplevel of the work tree" in gitattributes.txt and gitignore.txt to define the limits of the search for those files. Signed-off-by: Jason Merrill <jason@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 04:58:25 UTC |
| 39470cf | Matthieu Moy | 07 April 2009, 12:43:53 UTC | git-checkout.txt: clarify that <branch> applies when no path is given. Otherwise, the sentence "Defaults to HEAD." can be mis-read to mean that "git checkout -- hello.c" checks-out from HEAD. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 04:57:12 UTC |
| ce8936c | Matthieu Moy | 06 April 2009, 20:45:21 UTC | git-checkout.txt: fix incorrect statement about HEAD and index The command "git checkout" checks out from the index by default, not HEAD (the introducing comment were correct, but the detailled explanation added below were not). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 04:56:41 UTC |
| b344e16 | Finn Arne Gangstad | 06 April 2009, 13:41:02 UTC | git remote update: Fallback to remote if group does not exist Previously, git remote update <remote> would fail unless there was a remote group configured with the same name as the remote. git remote update will now fall back to using the remote if no matching group can be found. This enables "git remote update -p <remote>..." to fetch and prune one or more remotes, for example. Signed-off-by: Finn Arne Gangstad <finnag@pvv.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 04:52:26 UTC |
| 9a23ba3 | Finn Arne Gangstad | 06 April 2009, 13:41:01 UTC | remote: New function remote_is_configured() Previously, there was no easy way to check for the existence of a configured remote. remote_get for example would always create the remote "on demand". This new function returns 1 if the remote is configured, 0 otherwise. Signed-off-by: Finn Arne Gangstad <finnag@pvv.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 04:51:59 UTC |
| bed5d42 | Finn Arne Gangstad | 06 April 2009, 13:41:00 UTC | git remote update: Report error for non-existing groups Previosly, git remote update <non-existing-group> would just silently fail and do nothing. Now it will report an error saying that the group does not exist. Signed-off-by: Finn Arne Gangstad <finnag@pvv.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 04:51:19 UTC |
| 1a7b1f6 | Junio C Hamano | 06 April 2009, 07:48:49 UTC | sha1-lookup: fix up the assertion message Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 April 2009, 07:56:27 UTC |
| fbdc056 | Junio C Hamano | 06 April 2009, 07:43:44 UTC | Merge branch 'jc/name-branch' * jc/name-branch: Don't permit ref/branch names to end with ".lock" check_ref_format(): tighten refname rules strbuf_check_branch_ref(): a helper to check a refname for a branch Fix branch -m @{-1} newname check-ref-format --branch: give Porcelain a way to grok branch shorthand strbuf_branchname(): a wrapper for branch name shorthands Rename interpret/substitute nth_last_branch functions Conflicts: Documentation/git-check-ref-format.txt | 06 April 2009, 07:43:44 UTC |
| 03a39a9 | Junio C Hamano | 06 April 2009, 07:42:52 UTC | Merge branch 'jc/shared-literally' * jc/shared-literally: t1301: loosen test for forced modes set_shared_perm(): sometimes we know what the final mode bits should look like move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath Move chmod(foo, 0444) into move_temp_to_file() "core.sharedrepository = 0mode" should set, not loosen | 06 April 2009, 07:42:52 UTC |
| ccc852c | Junio C Hamano | 06 April 2009, 07:42:31 UTC | Merge branch 'mg/tracked-local-branches' * mg/tracked-local-branches: Make local branches behave like remote branches when --tracked Test for local branches being followed with --track | 06 April 2009, 07:42:31 UTC |
| 87d2062 | Junio C Hamano | 06 April 2009, 07:42:23 UTC | Merge branch 'sb/format-patch-patchname' * sb/format-patch-patchname: format_sanitized_subject: Don't trim past initial length of strbuf log-tree: fix patch filename computation in "git format-patch" format-patch: --numbered-files and --stdout aren't mutually exclusive format-patch: --attach/inline uses filename instead of SHA1 format-patch: move get_patch_filename() into log-tree format-patch: pass a commit to reopen_stdout() format-patch: construct patch filename in one function pretty.c: add %f format specifier to format_commit_message() | 06 April 2009, 07:42:23 UTC |
| a6e5ef7 | Felipe Contreras | 04 April 2009, 09:38:27 UTC | user-manual: the name of the hash function is SHA-1, not sha1 Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 April 2009, 07:37:34 UTC |
| a3df1e4 | Felipe Contreras | 04 April 2009, 09:38:24 UTC | docbook: change css style A handful of random personal preference: - Force sans-serif for the text. - Quote code sample literal inside a single-quote pair. - Show emphasis in blue-green italics. - Do not use itarlics for term definition, but show them in navy. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 April 2009, 07:27:09 UTC |
| 6127c08 | Felipe Contreras | 04 April 2009, 09:38:23 UTC | user-manual: remove some git-foo usage Also, use `git foo` when it make sense. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 April 2009, 07:15:58 UTC |
| 5c9c990 | Santi Béjar | 30 March 2009, 10:11:42 UTC | Documentation: branch.*.merge can also affect 'git-push' Signed-off-by: Santi Béjar <santi@agolina.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 April 2009, 07:14:55 UTC |
| 1d1876e | Heiko Voigt | 01 April 2009, 17:51:54 UTC | Add configuration variable for sign-off to format-patch If you regularly create patches which require a Signed-off: line you may want to make it your default to add that line. It also helps you not to forget to add the -s/--signoff switch. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 April 2009, 07:12:32 UTC |
| 43acdf2 | Todd Zullinger | 05 April 2009, 16:33:38 UTC | bash completion: Update 'git am' options This adds --committer-date-is-author-date, --ignore-date, and --no-utf8 options. The --binary option is removed, as it was made a no-op by cb3a160. The option list is also sorted alphabetically. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 19:04:22 UTC |
| efa5480 | Finn Arne Gangstad | 03 April 2009, 09:03:44 UTC | git remote update: New option --prune With the --prune (or -p) option, git remote update will also prune all the remotes that it fetches. Previously, you had to do a manual git remote prune <remote> for each of the remotes you wanted to prune, and this could be tedious with many remotes. A single command will now update a set of remotes, and remove all stale branches: git remote update -p [group] Signed-off-by: Finn Arne Gangstad <finnag@pvv.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 08:52:38 UTC |
| b92c5f2 | Finn Arne Gangstad | 03 April 2009, 09:02:37 UTC | builtin-remote.c: Split out prune_remote as a separate function. prune_remote will be used in update(), so this function was split out to avoid code duplication. Signed-off-by: Finn Arne Gangstad <finnag@pvv.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 08:52:33 UTC |
| e89aa6d | Christian Couder | 30 March 2009, 04:59:59 UTC | bisect--helper: string output variables together with "&&" When doing: eval "git bisect--helper --next-vars" | { while read line do echo "$line &&" done echo ':' } the result code comes from the last "echo ':'", not from running "git bisect--helper --next-vars". This patch gets rid of the need to string together the line from the output of "git bisect--helper" with "&&" in the calling script by making "git bisect--helper --next-vars" return output variables already in that format. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 08:29:45 UTC |
| 37c4c38 | Christian Couder | 29 March 2009, 09:55:43 UTC | rev-list: pass "int flags" as last argument of "show_bisect_vars" Instead of "int show_all, int show_tried" we now only pass "int flags", because we will add one more flag in a later patch. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 08:29:45 UTC |
| b74d7ef | Christian Couder | 29 March 2009, 09:45:01 UTC | t6030: test bisecting with paths This patch adds some tests to check that "git bisect" works fine when passing paths to "git bisect start" to reduce the number of bisection steps. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 08:29:45 UTC |
| 23b5f18 | Christian Couder | 26 March 2009, 04:56:02 UTC | bisect: use "bisect--helper" and remove "filter_skipped" function Use the new "git bisect--helper" builtin. It should be faster and safer instead of the old "filter_skipped" shell function. And it is a first step to move more shell code to C. As the output is a little bit different we have to change the code that interpret the results. But these changes improve code clarity. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 08:29:44 UTC |
| 3b437b0 | Christian Couder | 26 March 2009, 04:55:59 UTC | bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES" This is needed because "git bisect--helper" must read bisect paths in "$GIT_DIR/BISECT_NAMES", so that a bisection can be performed only on commits that touches paths in this file. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 08:29:44 UTC |
| 1bf072e | Christian Couder | 26 March 2009, 04:55:54 UTC | bisect--helper: implement "git bisect--helper" This patch implements a new "git bisect--helper" builtin plumbing command that will be used to migrate "git-bisect.sh" to C. We start by implementing only the "--next-vars" option that will read bisect refs from "refs/bisect/", and then compute the next bisect step, and output shell variables ready to be eval'ed by the shell. At this step, "git bisect--helper" ignores the paths that may have been put in "$GIT_DIR/BISECT_NAMES". This will be fixed in a later patch. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 08:29:44 UTC |
| 4eb5b64 | Christian Couder | 04 April 2009, 20:59:36 UTC | bisect: use the new generic "sha1_pos" function to lookup sha1 instead of the specific one that was simpler but less efficient. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 08:29:44 UTC |
| 9518864 | Christian Couder | 26 March 2009, 04:55:49 UTC | rev-list: call new "filter_skip" function This patch implements a new "filter_skip" function in C in "bisect.c" that will later replace the existing implementation in shell in "git-bisect.sh". An array is used to store the skipped commits. But the array is not yet fed anything. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 08:29:35 UTC |
| 81aa964 | Junio C Hamano | 05 April 2009, 08:17:08 UTC | Merge branch 'maint' * maint: git submodule: fix usage line doc/git-pack-refs: fix two grammar issues commit: abort commit if interactive add failed git-repack: use non-dashed update-server-info | 05 April 2009, 08:17:08 UTC |
| 835a3ee | Julien Danjou | 31 March 2009, 15:50:12 UTC | git submodule: fix usage line Actually, you have to set the -b option after the add command. Signed-off-by: Julien Danjou <julien@danjou.info> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 08:16:31 UTC |
| be18f4b | Junio C Hamano | 05 April 2009, 08:04:54 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: commit: abort commit if interactive add failed git-repack: use non-dashed update-server-info | 05 April 2009, 08:04:54 UTC |
| acb0b7b | Junio C Hamano | 05 April 2009, 08:04:38 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: commit: abort commit if interactive add failed git-repack: use non-dashed update-server-info Conflicts: builtin-commit.c | 05 April 2009, 08:04:38 UTC |
| 38b7ccb | Markus Heidelberg | 04 April 2009, 10:35:22 UTC | doc/git-pack-refs: fix two grammar issues Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:39:37 UTC |
| 5dba359 | Jeff King | 03 April 2009, 19:31:10 UTC | tests: remove exit after test_done call test_done always exits, so this line is never executed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:38:26 UTC |
| 4f6a32f | Jeff King | 03 April 2009, 19:28:56 UTC | commit: abort commit if interactive add failed Previously we ignored the result of calling add_interactive, which meant that if an error occurred we simply committed whatever happened to be in the index. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:37:32 UTC |
| 39d8e27 | Clemens Buchacher | 05 April 2009, 00:47:00 UTC | simplify output of conflicting merge This simplifies the code without changing the semantics and removes the unhelpful "needs $sha1" part of the conflicting submodule message. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:26:33 UTC |
| 0eb6574 | Clemens Buchacher | 05 April 2009, 00:46:59 UTC | update cache for conflicting submodule entries When merging merge bases during a recursive merge we do not want to leave any unmerged entries. Otherwise we cannot create a temporary tree for the recursive merge to work with. We failed to do so in case of a submodule conflict between merge bases, causing a NULL pointer dereference in the next step of the recursive merge. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:26:32 UTC |
| f37ae35 | Clemens Buchacher | 05 April 2009, 00:46:58 UTC | add tests for merging with submodules Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:26:30 UTC |
| f3a186f | Christian Couder | 04 April 2009, 20:02:26 UTC | bisect: improve error message when branch checkout fails In "git-bisect.sh" the "git checkout" command is only used to change the current branch, but it is used like this: git checkout "$branch" which will output the following misleading error message when it fails: error: pathspec 'foo' did not match any file(s) known to git. This patch change the way we use "git checkout" like this: git checkout "$branch" -- so that we will get the following error message: fatal: invalid reference: foo which is better. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:25:08 UTC |
| e1dc49b | Dan McGee | 04 April 2009, 16:59:55 UTC | git-repack: use non-dashed update-server-info Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:08:49 UTC |
