Commits

Author Commit Message Labels Comments Date
Linus Torvalds
Fix tree-walking compare_entry() in the presense of --prefix When we make the "root" tree-walk info entry have a pathname in it, we need to have a ->prev pointer so that compare_entry will actually notice and traverse into the root. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Linus Torvalds
Move 'unpack_trees()' over to 'traverse_trees()' interface This not only deletes more code than it adds, it gets rid of a singularly hard-to-understand function (unpack_trees_rec()), and replaces it with a set of smaller and simpler functions that use the generic tree traversal mechanism to walk over one or more git trees in parallel. It's still not the most wonderful interface, and by no means is the new code easy to understand either, but it's at least…
Linus Torvalds
Make 'traverse_trees()' traverse conflicting DF entries in parallel This makes the traverse_trees() entry comparator routine use the more relaxed form of name comparison that considers files and directories with the same name identical. We pass in a separate mask for just the directory entries, so that the callback routine can decide (if it wants to) to only handle one or the other type, but generally most (all?) users are expected to really want to see the case …
Linus Torvalds
Add return value to 'traverse_tree()' callback This allows the callback to return an error value, but it can also specify which of the tree entries that it actually used up by returning a positive mask value. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Linus Torvalds
Make 'traverse_tree()' use linked structure rather than 'const char *base' This makes the calling convention a bit less obvious, but a lot more flexible. Instead of allocating and extending a new 'base' string, we just link the top-most name into a linked list of the 'info' structure when traversing a subdirectory, and we can generate the basename by following the list. Perhaps even more importantly, the linked list of info structures also gives us a place to naturally…
Linus Torvalds
Add 'df_name_compare()' helper function This new helper is identical to base_name_compare(), except it compares conflicting directory/file entries as equal in order to help handling DF conflicts (thus the name). Note that while a directory name compares as equal to a regular file with the new helper, they then individually compare _differently_ to a filename that has a dot after the basename (because '\0' < '.' < '/'). So a directory …
Johannes Schindelin
builtin remote rm: remove symbolic refs, too "git remote add" can add a symbolic ref "HEAD", and "rm" should delete it, too. Noticed by Teemu Likonen. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
Add a test for read-tree -u --reset with a D/F conflict Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'ph/parseopt' * ph/parseopt: parse-options: new option type to treat an option-like parameter as an argument. parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseopt
Junio C Hamano
Merge branch 'dp/clean-fix' * dp/clean-fix: git-clean: add tests for relative path git-clean: correct printing relative path Make private quote_path() in wt-status.c available as quote_path_relative() Revert part of d089eba (setup: sanitize absolute and funny paths in get_pathspec()) Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes) Revert part of 744dacd (builtin-mv: minimum fix to avoid los…
Junio C Hamano
Merge branch 'ml/submodule-add-existing' * ml/submodule-add-existing: git-submodule - Allow adding a submodule in-place
Junio C Hamano
Merge branch 'mr/compat-snprintf' * mr/compat-snprintf: Add compat/snprintf.c for systems that return bogus
Junio C Hamano
Merge branch 'sp/fetch-optim' * sp/fetch-optim: Teach git-fetch to exploit server side automatic tag following Teach fetch-pack/upload-pack about --include-tag git-pack-objects: Automatically pack annotated tags if object was packed Teach git-fetch to grab a tag at the same time as a commit Make git-fetch follow tags we already have objects for sooner Teach upload-pack to log the received need lines to an fd Free…
Junio C Hamano
Merge branch 'jc/describe-always' * jc/describe-always: describe --always: fall back to showing an abbreviated object name
Junio C Hamano
Merge branch 'jc/am' * jc/am: am: --rebasing am: remove support for -d .dotest am: read from the right mailbox when started from a subdirectory
Junio C Hamano
Merge branch 'cr/reset-parseopt' * cr/reset-parseopt: Make builtin-reset.c use parse_options.
Junio C Hamano
Merge branch 'jn/gitweb-pickaxe' * jn/gitweb-pickaxe: gitweb: Fix and simplify pickaxe search
Junio C Hamano
Merge branch 'kb/maint-filter-branch-disappear' * kb/maint-filter-branch-disappear: filter-branch: handle "disappearing tree" case correctly in subdir filter
Junio C Hamano
Merge branch 'maint' to sync with 1.5.4.4 * maint: GIT 1.5.4.4 ident.c: reword error message when the user name cannot be determined Fix dcommit, rebase when rewriteRoot is in use Really make the LF after reset in fast-import optional
Junio C Hamano
GIT 1.5.4.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.5.4.4
Santi Béjar
ident.c: reword error message when the user name cannot be determined The "config --global" suggested in the message is a valid one-shot fix, and hopefully one-shot across machines that NFS mounts the home directories. This knowledge can hopefully be reused when you are forced to use git on Windows, but the fix based on GECOS would not be applicable, so it is not such a useful hint to mention the exact reason why the name cannot be determined. Signed-off-by: Santi…
John Goerzen
Fix dcommit, rebase when rewriteRoot is in use When the rewriteRoot setting is used with git-svn, it causes the svn IDs added to commit messages to bear a different URL than is actually used to retrieve Subversion data. It is common for Subversion repositories to be available multiple ways: for instance, HTTP to the public, and svn+ssh to people with commit access. The need to switch URLs for access is fairly common as well -- perhaps someon…
Junio C Hamano
filter-branch: handle "disappearing tree" case correctly in subdir filter The subdirectory filter had a bug to notice that the commit in question did not have anything in the path-limited part of the tree. $commit:$path does not name an empty tree when $path does not appear in $commit. This should fix it. The additional test in t7003 is originally from Kevin Ballard but with fixups. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Charles Bailey
merge-tool documentation: describe custom command usage The configuration variables for custom merge tools were documented only in config.txt but there was no reference to the functionality in git-mergetool.txt. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Charles Bailey
git-mergetool documentaiton: show toolnames in typewriter font Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dato Simó
Really make the LF after reset in fast-import optional cmd_from() ends with a call to read_next_command(), which is needed when using cmd_from() from commands where from is not the last element. With reset, however, "from" is the last command, after which the flow returns to the main loop, which calls read_next_command() again. Because of this, always set unread_command_buf in cmd_reset_branch(), even if cmd_from() was successful. Add a test case f…
Junio C Hamano
Merge branch 'aw/maint-shortlog-blank-lines' * aw/maint-shortlog-blank-lines: shortlog: take the first populated line of the description
Junio C Hamano
Merge branch 'mh/maint-http-proxy-fix' into maint * mh/maint-http-proxy-fix: Set proxy override with http_init()
Junio C Hamano
Merge branch 'js/maint-daemon' into maint * js/maint-daemon: daemon: ensure that base-path is an existing directory daemon: send more error messages to the syslog
Junio C Hamano
Merge branch 'js/maint-cvsexport' into maint * js/maint-cvsexport: cvsexportcommit: be graceful when "cvs status" reorders the arguments Conflicts: t/t9200-git-cvsexportcommit.sh
  1. Prev
  2. Next