Skip to main content

Browse the archive

swh:1:snp:bb8853bfef8fcf2b1d37fd6404912c7606c98e48
sort by:
Revision Author Date Message Commit Date
79fcbf7 Junio C Hamano 17 January 2014, 20:30:14 UTC Git 1.9-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 January 2014, 20:30:14 UTC
d98c916 Junio C Hamano 17 January 2014, 20:21:39 UTC Merge branch 'maint' * maint: git-svn: workaround for a bug in svn serf backend 17 January 2014, 20:21:39 UTC
1aeb10a Junio C Hamano 17 January 2014, 20:21:20 UTC Merge branch 'fp/submodule-checkout-mode' "submodule.*.update=checkout", when propagated from .gitmodules to .git/config, turned into a "submodule.*.update=none", which did not make much sense. * fp/submodule-checkout-mode: git-submodule.sh: 'checkout' is a valid update mode 17 January 2014, 20:21:20 UTC
92251b1 Junio C Hamano 17 January 2014, 20:21:14 UTC Merge branch 'nd/shallow-clone' Fetching from a shallow-cloned repository used to be forbidden, primarily because the codepaths involved were not carefully vetted and we did not bother supporting such usage. This attempts to allow object transfer out of a shallow-cloned repository in a controlled way (i.e. the receiver become a shallow repository with truncated history). * nd/shallow-clone: (31 commits) t5537: fix incorrect expectation in test case 10 shallow: remove unused code send-pack.c: mark a file-local function static git-clone.txt: remove shallow clone limitations prune: clean .git/shallow after pruning objects clone: use git protocol for cloning shallow repo locally send-pack: support pushing from a shallow clone via http receive-pack: support pushing to a shallow clone via http smart-http: support shallow fetch/clone remote-curl: pass ref SHA-1 to fetch-pack as well send-pack: support pushing to a shallow clone receive-pack: allow pushes that update .git/shallow connected.c: add new variant that runs with --shallow-file add GIT_SHALLOW_FILE to propagate --shallow-file to subprocesses receive/send-pack: support pushing from a shallow clone receive-pack: reorder some code in unpack() fetch: add --update-shallow to accept refs that update .git/shallow upload-pack: make sure deepening preserves shallow roots fetch: support fetching from a shallow repository clone: support remote shallow repository ... 17 January 2014, 20:21:20 UTC
d8cf714 Junio C Hamano 17 January 2014, 20:04:29 UTC Merge branch 'jk/pull-rebase-using-fork-point' Finishing touches so that an expected error message will not leak to the UI. * jk/pull-rebase-using-fork-point: pull: suppress error when no remoteref is found 17 January 2014, 20:04:29 UTC
ffc2b48 John Keeping 17 January 2014, 20:00:20 UTC pull: suppress error when no remoteref is found Commit 48059e4 (pull: use merge-base --fork-point when appropriate, 2013-12-08) incorrectly assumes that get_remote_merge_branch will either yield a non-empty string or return an error, but there are circumstances where it will yield an empty string. The previous code then invoked git-rev-list with no arguments, which results in an error suppressed by redirecting stderr to /dev/null. Now we invoke git-merge-base with an empty branch name, which also results in an error. Suppress this in the same way. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 January 2014, 20:03:32 UTC
ac93028 Roman Kagan 27 December 2013, 08:05:15 UTC git-svn: workaround for a bug in svn serf backend Subversion serf backend in versions 1.8.5 and below has a bug(*) that the function creating the descriptor of a file change -- add_file() -- doesn't make a copy of its third argument when storing it on the returned descriptor. As a result, by the time this field is used (in transactions of file copying or renaming) it may well be released, and the memory reused. One of its possible manifestations is the svn assertion triggering on an invalid path, with a message svn_fspath__skip_ancestor: Assertion `svn_fspath__is_canonical(child_fspath)' failed. This patch works around this bug, by storing the value to be passed as the third argument to add_file() in a local variable with the same scope as the file change descriptor, making sure their lifetime is the same. * [ew: fixed in Subversion r1553376 as noted by Jonathan Nieder] Cc: Benjamin Pabst <benjamin.pabst85@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Roman Kagan <rkagan@mail.ru> 17 January 2014, 19:24:30 UTC
14598b9 Junio C Hamano 13 January 2014, 19:39:38 UTC Sync with 1.8.5.3 * maint: Git 1.8.5.3 pack-heuristics.txt: mark up the file header properly 13 January 2014, 19:39:38 UTC
864085a Junio C Hamano 13 January 2014, 19:39:09 UTC Update draft release notes to 1.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 January 2014, 19:39:09 UTC
e8a2f5f Junio C Hamano 13 January 2014, 19:35:10 UTC Merge branch 'jk/t5531-prepare-to-default-to-non-matching' * jk/t5531-prepare-to-default-to-non-matching: t5531: further "matching" fixups 13 January 2014, 19:35:10 UTC
7fe5e63 Junio C Hamano 13 January 2014, 19:34:11 UTC Merge branch 'sb/diff-orderfile-config' Finishing touches to avoid casting unnecessary detail in stone. * sb/diff-orderfile-config: diff test: reading a directory as a file need not error out 13 January 2014, 19:34:54 UTC
540cc75 Junio C Hamano 13 January 2014, 19:34:08 UTC Merge branch 'mh/shorten-unambigous-ref' * mh/shorten-unambigous-ref: shorten_unambiguous_ref(): tighten up pointer arithmetic gen_scanf_fmt(): delete function and use snprintf() instead shorten_unambiguous_ref(): introduce a new local variable 13 January 2014, 19:34:08 UTC
272220f Junio C Hamano 13 January 2014, 19:33:51 UTC Merge branch 'mm/mv-file-to-no-such-dir-with-slash' Finishing touches to do the same on windows. * mm/mv-file-to-no-such-dir-with-slash: mv: let 'git mv file no-such-dir/' error out on Windows, too 13 January 2014, 19:33:51 UTC
a65a53b Junio C Hamano 13 January 2014, 19:33:47 UTC Merge branch 'jl/submodule-mv-checkout-caveat' With a submodule that was initialized in an old fashioned way without gitlinks, switching branches in the superproject between the one with and without the submodule may leave the submodule working tree with its embedded repository behind, as there may be unexpendable state there. Document and warn users about this. * jl/submodule-mv-checkout-caveat: rm: better document side effects when removing a submodule mv: better document side effects when moving a submodule 13 January 2014, 19:33:47 UTC
5e72e71 Junio C Hamano 13 January 2014, 19:33:39 UTC Merge branch 'jk/pull-rebase-using-fork-point' Finishing touches. * jk/pull-rebase-using-fork-point: rebase: fix fork-point with zero arguments 13 January 2014, 19:33:40 UTC
ca46578 Junio C Hamano 13 January 2014, 19:33:38 UTC Merge branch 'rr/completion-format-coverletter' The bash/zsh completion code did not know about format.coverLetter among many format.* configuration variables. * rr/completion-format-coverletter: completion: complete format.coverLetter 13 January 2014, 19:33:38 UTC
ff72427 Junio C Hamano 13 January 2014, 19:33:36 UTC Merge branch 'ow/stash-with-ifs' The implementation of 'git stash $cmd "stash@{...}"' did not quote the stash argument properly and left it split at IFS whitespace. * ow/stash-with-ifs: stash: handle specifying stashes with $IFS 13 January 2014, 19:33:37 UTC
9fac077 Junio C Hamano 13 January 2014, 19:33:34 UTC Merge branch 'jn/pager-lv-default-env' Just like we give a reasonable default for "less" via the LESS environment variable, specify a reasonable default for "lv" via the "LV" environment variable when spawning the pager. * jn/pager-lv-default-env: pager: set LV=-c alongside LESS=FRSX 13 January 2014, 19:33:35 UTC
0a8cb03 Junio C Hamano 13 January 2014, 19:33:29 UTC Merge branch 'br/sha1-name-40-hex-no-disambiguation' When parsing a 40-hex string into the object name, the string is checked to see if it can be interpreted as a ref so that a warning can be given for ambiguity. The code kicked in even when the core.warnambiguousrefs is set to false to squelch this warning, in which case the cycles spent to look at the ref namespace were an expensive no-op, as the result was discarded without being used. * br/sha1-name-40-hex-no-disambiguation: sha1_name: don't resolve refs when core.warnambiguousrefs is false 13 January 2014, 19:33:29 UTC
4224916 Junio C Hamano 13 January 2014, 19:28:26 UTC Git 1.8.5.3 13 January 2014, 19:28:26 UTC
7fd90e0 Junio C Hamano 13 January 2014, 19:23:07 UTC Merge branch 'nd/daemon-informative-errors-typofix' into maint The "--[no-]informative-errors" options to "git daemon" were parsed a bit too loosely, allowing any other string after these option names. * nd/daemon-informative-errors-typofix: daemon: be strict at parsing parameters --[no-]informative-errors 13 January 2014, 19:23:07 UTC
3b72885 Junio C Hamano 13 January 2014, 19:23:04 UTC Merge branch 'km/gc-eperm' into maint A "gc" process running as a different user should be able to stop a new "gc" process from starting. * km/gc-eperm: gc: notice gc processes run by other users 13 January 2014, 19:23:04 UTC
f5678f1 Junio C Hamano 13 January 2014, 19:23:01 UTC Merge branch 'jk/credential-plug-leak' into maint An earlier "clean-up" introduced an unnecessary memory leak. * jk/credential-plug-leak: Revert "prompt: clean up strbuf usage" 13 January 2014, 19:23:01 UTC
ada6ebb Junio C Hamano 13 January 2014, 19:22:48 UTC Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maint "git mv A B/", when B does not exist as a directory, should error out, but it didn't. * mm/mv-file-to-no-such-dir-with-slash: mv: let 'git mv file no-such-dir/' error out on Windows, too mv: let 'git mv file no-such-dir/' error out 13 January 2014, 19:22:48 UTC
be941a2 Junio C Hamano 13 January 2014, 19:22:38 UTC Merge branch 'jk/rev-parse-double-dashes' into maint "git rev-parse <revs> -- <paths>" did not implement the usual disambiguation rules the commands in the "git log" family used in the same way. * jk/rev-parse-double-dashes: rev-parse: be more careful with munging arguments rev-parse: correctly diagnose revision errors before "--" 13 January 2014, 19:22:38 UTC
6845e8a Junio C Hamano 13 January 2014, 19:22:21 UTC Merge branch 'jk/cat-file-regression-fix' into maint "git cat-file --batch=", an admittedly useless command, did not behave very well. * jk/cat-file-regression-fix: cat-file: handle --batch format with missing type/size cat-file: pass expand_data to print_object_or_die 13 January 2014, 19:22:21 UTC
ebba6c0 Thomas Ackermann 11 January 2014, 16:28:25 UTC pack-heuristics.txt: mark up the file header properly AsciiDoc wants these header-lines left-aligned. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 January 2014, 19:18:34 UTC
0b19850 Jeff King 08 January 2014, 10:47:56 UTC t5531: further "matching" fixups Commit 43eb920 switched one of the sub-repository in this test to matching to prepare for a world where the default becomes "simple". However, the main repository needs a similar change. We did not notice any test failure when merged with b2ed944 (push: switch default from "matching" to "simple", 2013-01-04) because t5531.6 is trying to provoke a failure of "git push" due to a submodule check. When combined with b2ed944 the push still fails, but for the wrong reason (because our upstream setup does not exist, not because of the submodule). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 January 2014, 17:35:45 UTC
0df49be Jonathan Nieder 10 January 2014, 20:10:31 UTC diff test: reading a directory as a file need not error out There is no guarantee that strbuf_read_file must error out for directories. On some operating systems (e.g., Debian GNU/kFreeBSD wheezy), reading a directory gives its raw content: $ head -c5 < / | cat -A ^AM-|^_^@^L$ As a result, 'git diff -O/' succeeds instead of erroring out on these systems, causing t4056.5 "orderfile is a directory" to fail. On some weird OS it might even make sense to pass a directory to the -O option and this is not a common user mistake that needs catching. Remove the test. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 January 2014, 23:30:45 UTC
a893346 Johannes Sixt 08 January 2014, 16:33:44 UTC mv: let 'git mv file no-such-dir/' error out on Windows, too The previous commit c57f628 (mv: let 'git mv file no-such-dir/' error out) relies on that rename("file", "no-such-dir/") fails if the directory does not exist (note the trailing slash). This does not work as expected on Windows: This rename() call does not fail, but renames "file" to "no-such-dir" (not to "no-such-dir/file"). Insert an explicit check for this case to force an error. This changes the error message from $ git mv file no-such-dir/ fatal: renaming 'file' failed: Not a directory to $ git mv file no-such-dir/ fatal: destination directory does not exist, source=file, destination=no-such-dir/ Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 January 2014, 19:28:12 UTC
a25014b Junio C Hamano 10 January 2014, 19:25:01 UTC Update draft release notes to 1.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> 10 January 2014, 19:25:01 UTC
74ca493 Junio C Hamano 10 January 2014, 18:33:47 UTC Merge branch 'ss/builtin-cleanup' "git help $cmd" unnecessarily enumerated potential command names from the filesystem, even when $cmd is known to be a built-in. Ideas for further optimization, primarily by killing the use of is_in_cmdlist(), were suggested in the discussion, but they can come as follow-ups on top of this series. * ss/builtin-cleanup: builtin/help.c: speed up is_git_command() by checking for builtin commands first builtin/help.c: call load_command_list() only when it is needed git.c: consistently use the term "builtin" instead of "internal command" 10 January 2014, 18:33:48 UTC
4243b2d Junio C Hamano 10 January 2014, 18:33:45 UTC Merge branch 'vm/octopus-merge-bases-simplify' * vm/octopus-merge-bases-simplify: get_octopus_merge_bases(): cleanup redundant variable 10 January 2014, 18:33:45 UTC
2b28497 Junio C Hamano 10 January 2014, 18:33:43 UTC Merge branch 'ta/format-user-manual-as-an-article' Update the way the user-manual is formatted via AsciiDoc to save trees. * ta/format-user-manual-as-an-article: user-manual: improve html and pdf formatting 10 January 2014, 18:33:43 UTC
30159e5 Junio C Hamano 10 January 2014, 18:33:39 UTC Merge branch 'rr/completion-branch-config' Two-level configuration variable names in "branch.*" and "remote.*" hierarchies whose variables are predominantly three-level where not completed by hitting a <TAB> in bash and zsh completions. * rr/completion-branch-config: completion: fix remote.pushdefault completion: fix branch.autosetup(merge|rebase) completion: introduce __gitcomp_nl_append () zsh completion: find matching custom bash completion 10 January 2014, 18:33:39 UTC
3b9d69e Junio C Hamano 10 January 2014, 18:33:36 UTC Merge branch 'js/lift-parent-count-limit' There is no reason to have a hardcoded upper limit of the number of parents for an octopus merge, created via the graft mechanism. * js/lift-parent-count-limit: Remove the line length limit for graft files 10 January 2014, 18:33:36 UTC
f0f493e Junio C Hamano 10 January 2014, 18:33:34 UTC Merge branch 'jk/test-framework-updates' The basic test used to leave unnecessary trash directories in the t/ directory. * jk/test-framework-updates: t0000: drop "known breakage" test t0000: simplify HARNESS_ACTIVE hack t0000: set TEST_OUTPUT_DIRECTORY for sub-tests 10 January 2014, 18:33:34 UTC
d5d1678 Junio C Hamano 10 January 2014, 18:33:32 UTC Merge branch 'bm/merge-base-octopus-dedup' "git merge-base --octopus" used to leave cleaning up suboptimal result to the caller, but now it does the clean-up itself. * bm/merge-base-octopus-dedup: merge-base --octopus: reduce the result from get_octopus_merge_bases() merge-base: separate "--independent" codepath into its own helper 10 January 2014, 18:33:33 UTC
5586968 Junio C Hamano 10 January 2014, 18:33:30 UTC Merge branch 'km/gc-eperm' A "gc" process running as a different user should be able to stop a new "gc" process from starting. * km/gc-eperm: gc: notice gc processes run by other users 10 January 2014, 18:33:30 UTC
35a116d Junio C Hamano 10 January 2014, 18:33:18 UTC Merge branch 'jk/http-auth-tests-robustify' Using the same username and password during the tests would not catch a potential breakage of sending one when we should be sending the other. * jk/http-auth-tests-robustify: use distinct username/password for http auth tests 10 January 2014, 18:33:19 UTC
56e648e Junio C Hamano 10 January 2014, 18:33:16 UTC Merge branch 'jk/credential-plug-leak' An earlier "clean-up" introduced an unnecessary memory leak. * jk/credential-plug-leak: Revert "prompt: clean up strbuf usage" 10 January 2014, 18:33:16 UTC
962fa65 Junio C Hamano 10 January 2014, 18:33:14 UTC Merge branch 'bs/mirbsd' * bs/mirbsd: Add MirBSD support to the build system. 10 January 2014, 18:33:14 UTC
34aacf3 Junio C Hamano 10 January 2014, 18:33:13 UTC Merge branch 'nd/commit-tree-constness' Code clean-up. * nd/commit-tree-constness: commit.c: make "tree" a const pointer in commit_tree*() 10 January 2014, 18:33:13 UTC
b213206 Junio C Hamano 10 January 2014, 18:33:11 UTC Merge branch 'jk/oi-delta-base' Teach "cat-file --batch" to show delta-base object name for a packed object that is represented as a delta. * jk/oi-delta-base: cat-file: provide %(deltabase) batch format sha1_object_info_extended: provide delta base sha1s 10 January 2014, 18:33:11 UTC
f06a5e6 Junio C Hamano 10 January 2014, 18:33:09 UTC Merge branch 'jk/sha1write-void' Code clean-up. * jk/sha1write-void: do not pretend sha1write returns errors 10 January 2014, 18:33:09 UTC
4ba46c2 Junio C Hamano 10 January 2014, 18:33:03 UTC Merge branch 'nd/add-empty-fix' "git add -A" (no other arguments) in a totally empty working tree used to emit an error. * nd/add-empty-fix: add: don't complain when adding empty project root 10 January 2014, 18:33:03 UTC
0c52457 Junio C Hamano 10 January 2014, 18:32:59 UTC Merge branch 'nd/daemon-informative-errors-typofix' * nd/daemon-informative-errors-typofix: daemon: be strict at parsing parameters --[no-]informative-errors 10 January 2014, 18:32:59 UTC
666b4c2 Junio C Hamano 10 January 2014, 18:32:50 UTC Merge branch 'tm/fetch-prune' Fetching 'frotz' branch with "git fetch", while having 'frotz/nitfol' remote-tracking branch from an earlier fetch, would error out, primarily because the command has not been told to remove anything on our side. In such a case, "git fetch --prune" can be used to remove 'frotz/nitfol' to make room to fetch and store 'frotz' remote-tracking branch. * tm/fetch-prune: fetch --prune: Run prune before fetching fetch --prune: always print header url 10 January 2014, 18:32:50 UTC
2da5cbd Junio C Hamano 10 January 2014, 18:32:42 UTC Merge branch 'sb/diff-orderfile-config' Allow "git diff -O<file>" to be configured with a new configuration variable. * sb/diff-orderfile-config: diff: add diff.orderfile configuration variable diff: let "git diff -O" read orderfile from any file and fail properly t4056: add new tests for "git diff -O" 10 January 2014, 18:32:42 UTC
f8c2e3f Junio C Hamano 10 January 2014, 18:32:39 UTC Merge branch 'bc/log-decoration' "git log --decorate" did not handle a tag pointed by another tag nicely. * bc/log-decoration: log: properly handle decorations with chained tags 10 January 2014, 18:32:39 UTC
c4bccea Junio C Hamano 10 January 2014, 18:32:28 UTC Merge branch 'jh/rlimit-nofile-fallback' When we figure out how many file descriptors to allocate for keeping packfiles open, a system with non-working getrlimit() could cause us to die(), but because we make this call only to get a rough estimate of how many is available and we do not even attempt to use up all file descriptors available ourselves, it is nicer to fall back to a reasonable low value rather than dying. * jh/rlimit-nofile-fallback: get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure 10 January 2014, 18:32:28 UTC
8a33472 Junio C Hamano 10 January 2014, 18:32:25 UTC Merge branch 'rt/bfg-ad-in-filter-branch-doc' * rt/bfg-ad-in-filter-branch-doc: docs: add filter-branch notes on The BFG 10 January 2014, 18:32:25 UTC
061614b Junio C Hamano 10 January 2014, 18:32:21 UTC Merge branch 'mh/path-max' A few places where we relied on a fixed length buffer to hold pathnames in these two programs have been converted to use strbuf. * mh/path-max: builtin/prune.c: use strbuf to avoid having to worry about PATH_MAX prune-packed: use strbuf to avoid having to worry about PATH_MAX 10 January 2014, 18:32:21 UTC
273c54f Junio C Hamano 10 January 2014, 18:32:18 UTC Merge branch 'ap/path-max' * ap/path-max: Prevent buffer overflows when path is too long 10 January 2014, 18:32:18 UTC
b0504a9 Junio C Hamano 10 January 2014, 18:32:10 UTC Merge branch 'cc/replace-object-info' read_sha1_file() that is the workhorse to read the contents given an object name honoured object replacements, but there is no corresponding mechanism to sha1_object_info() that is used to obtain the metainfo (e.g. type & size) about the object, leading callers to weird inconsistencies. * cc/replace-object-info: replace info: rename 'full' to 'long' and clarify in-code symbols Documentation/git-replace: describe --format option builtin/replace: unset read_replace_refs t6050: add tests for listing with --format builtin/replace: teach listing using short, medium or full formats sha1_file: perform object replacement in sha1_object_info_extended() t6050: show that git cat-file --batch fails with replace objects sha1_object_info_extended(): add an "unsigned flags" parameter sha1_file.c: add lookup_replace_object_extended() to pass flags replace_object: don't check read_replace_refs twice rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT 10 January 2014, 18:32:10 UTC
010d81a Junio C Hamano 10 January 2014, 18:31:48 UTC Merge branch 'nd/negative-pathspec' Introduce "negative pathspec" magic, to allow "git log -- . ':!dir'" to tell us "I am interested in everything but 'dir' directory". * nd/negative-pathspec: pathspec.c: support adding prefix magic to a pathspec with mnemonic magic Support pathspec magic :(exclude) and its short form :! glossary-content.txt: rephrase magic signature part 10 January 2014, 18:31:48 UTC
bb3f458 John Keeping 09 January 2014, 19:47:34 UTC rebase: fix fork-point with zero arguments When no arguments are specified, $switch_to is empty so we end up passing the empty string to "git merge-base --fork-point", which causes an error. git-rebase carries on at this point, but in fact we have failed to apply the fork-point operation. It turns out that the test in t3400 that was meant to test this didn't actually need the fork-point behaviour, so enhance it to make sure that the fork-point is applied correctly. The modified test fails without the change to git-rebase.sh in this patch. Reported-by: Andreas Krey <a.krey@gmx.de> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 January 2014, 23:05:26 UTC
7902fe0 Michael Haggerty 08 January 2014, 14:43:40 UTC shorten_unambiguous_ref(): tighten up pointer arithmetic As long as we're being pathologically stingy with mallocs, we might as well do the math right and save 6 (!) bytes. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 January 2014, 23:02:36 UTC
4346663 Michael Haggerty 08 January 2014, 14:43:39 UTC gen_scanf_fmt(): delete function and use snprintf() instead To replace "%.*s" with "%s", all we have to do is use snprintf() to interpolate "%s" into the pattern. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 January 2014, 22:56:06 UTC
84d5633 Michael Haggerty 08 January 2014, 14:43:38 UTC shorten_unambiguous_ref(): introduce a new local variable When filling the scanf_fmts array, use a separate variable to keep track of the offset to avoid clobbering total_len (which we will need in the next commit). Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 January 2014, 22:52:44 UTC
3b32a7c Nguyễn Thái Ngọc Duy 08 January 2014, 12:13:19 UTC t5537: fix incorrect expectation in test case 10 Commit 48d25ca adds a new commit "7" to the repo that the next test case in commit 1609488 clones from. But the next test case does not expect this commit. For these tests, it's the bottom that's important, not the top. Fix the expected commit list. While at it, fix the default http port number to 5537. Otherwise when t5536 learns to test httpd, running test in parallel may fail. References: 48d25ca fetch: add --update-shallow to accept... - 2013-12-05 1609488 smart-http: support shallow fetch/clone - 2013-12-05 Noticed-by: Jeff King <peff@peff.net> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 January 2014, 19:54:12 UTC
bbad9f9 Jens Lehmann 07 January 2014, 21:32:37 UTC rm: better document side effects when removing a submodule The "Submodules" section of the "git rm" documentation mentions what will happen when a submodule with a gitfile gets removed with newer git. But it doesn't talk about what happens when the user changes between commits before and after the removal, which does not remove the submodule from the work tree like using the rm command did the first time. Explain what happens and what the user has to do manually to fix that in the new BUGS section. Also document this behavior in a new test. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 January 2014, 22:34:06 UTC
1cbd183 Jens Lehmann 07 January 2014, 21:31:32 UTC mv: better document side effects when moving a submodule The "Submodules" section of the "git mv" documentation mentions what will happen when a submodule with a gitfile gets moved with newer git. But it doesn't talk about what happens when the user changes between commits before and after the move, which does not update the work tree like using the mv command did the first time. Explain what happens and what the user has to do manually to fix that in the new BUGS section. Also document this behavior in a new test. Reported-by: George Papanikolaou <g3orge.app@gmail.com> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 January 2014, 22:33:04 UTC
2a07e43 Øystein Walle 07 January 2014, 08:22:15 UTC stash: handle specifying stashes with $IFS When trying to pop/apply a stash specified with an argument containing IFS whitespace, git-stash will throw an error: $ git stash pop 'stash@{two hours ago}' Too many revisions specified: stash@{two hours ago} This happens because word splitting is used to count non-option arguments. Make use of rev-parse's --sq option to quote the arguments for us to ensure a correct count. Add quotes where necessary. Also add a test that verifies correct behaviour. Helped-by: Thomas Rast <tr@thomasrast.ch> Signed-off-by: Øystein Walle <oystwa@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 January 2014, 18:51:04 UTC
de06c13 Ramkumar Ramachandra 06 January 2014, 17:18:51 UTC completion: complete format.coverLetter Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 January 2014, 17:59:25 UTC
832cf74 Brodie Rao 07 January 2014, 03:32:01 UTC sha1_name: don't resolve refs when core.warnambiguousrefs is false When seeing a full 40-hex object name, get_sha1_basic() unconditionally checks if the string can also be interpreted as a refname, but the result will not be used unless warn_ambiguous_refs is in effect. Omitting this unnecessary ref resolution provides a substantial performance improvement, especially when passing many hashes to a command (like "git rev-list --stdin") and core.warnambiguousrefs is set to false. The check incurs 6 stat()s for every hash supplied, which can be costly over NFS. Signed-off-by: Brodie Rao <brodie@sf.io> Acked-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 January 2014, 17:51:56 UTC
e54c1f2 Jonathan Nieder 07 January 2014, 02:14:05 UTC pager: set LV=-c alongside LESS=FRSX On systems with lv configured as the preferred pager (i.e., DEFAULT_PAGER=lv at build time, or PAGER=lv exported in the environment) git commands that use color show control codes instead of color in the pager: $ git diff ^[[1mdiff --git a/.mailfilter b/.mailfilter^[[m ^[[1mindex aa4f0b2..17e113e 100644^[[m ^[[1m--- a/.mailfilter^[[m ^[[1m+++ b/.mailfilter^[[m ^[[36m@@ -1,11 +1,58 @@^[[m "less" avoids this problem because git uses the LESS environment variable to pass the -R option ('output ANSI color escapes in raw form') by default. Use the LV environment variable to pass 'lv' the -c option ('allow ANSI escape sequences for text decoration / color') to fix it for lv, too. Noticed when the default value for color.ui flipped to 'auto' in v1.8.4-rc0~36^2~1 (2013-06-10). Reported-by: Olaf Meeuwissen <olaf.meeuwissen@avasys.jp> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 January 2014, 17:23:41 UTC
efa8fd7 Francesco Pretto 05 January 2014, 02:50:48 UTC git-submodule.sh: 'checkout' is a valid update mode 'checkout' is documented as one of the valid values for the 'submodule.<name>.update' variable, and in a repository with the variable set to 'checkout', "git submodule update" command does update using the 'checkout' mode. However, it has been an accident that the implementation works this way; any unknown value would trigger the same codepath and update using the 'checkout' mode. Explicitly list 'checkout' as one of the known update modes, and error out when an unknown update mode is used. Teach the codepath that initializes the configuration variable from an in-tree .gitmodules that 'checkout' is one of the valid values. The code since ac1fbbda (submodule: do not copy unknown update mode from .gitmodules, 2013-12-02) used to treat the value 'checkout' as unknown and mapped it to 'none', which made little sense. With this change, 'checkout' specified in .gitmodules will stay to be 'checkout'. Signed-off-by: Francesco Pretto <ceztko@gmail.com> Signed-off-by: Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 January 2014, 17:20:59 UTC
145e073 Thomas Ackermann 04 January 2014, 09:07:51 UTC user-manual: improve html and pdf formatting Use asciidoc style 'article' instead of 'book' and change asciidoc title level. This removes blank first page and superfluous "Part I" page (there is no "Part II") in pdf output. Also pdf size is decreased by this from 77 to 67 pages. In html output this removes unnecessary sub-tocs and chapter numbering. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 January 2014, 19:30:17 UTC
c6127fa Sebastian Schuberth 02 January 2014, 16:17:11 UTC builtin/help.c: speed up is_git_command() by checking for builtin commands first Since 2dce956 is_git_command() is a bit slow as it does file I/O in the call to list_commands_in_dir(). Avoid the file I/O by adding an early check for the builtin commands. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 January 2014, 19:26:31 UTC
a3c5263 Sebastian Schuberth 02 January 2014, 16:16:30 UTC builtin/help.c: call load_command_list() only when it is needed This avoids list_commands_in_dir() being called when not needed which is quite slow due to file I/O in order to list matching files in a directory. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 January 2014, 19:26:10 UTC
3f784a4 Sebastian Schuberth 02 January 2014, 16:15:44 UTC git.c: consistently use the term "builtin" instead of "internal command" Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 January 2014, 19:25:50 UTC
932f7e4 Junio C Hamano 06 January 2014, 18:39:07 UTC Merge branch 'maint' * maint: Documentation/gitmodules: Only 'update' and 'url' are required l10n: de.po: fix translation of 'prefix' 06 January 2014, 18:39:07 UTC
c39a2f1 Ramkumar Ramachandra 05 January 2014, 10:18:05 UTC completion: fix remote.pushdefault When attempting to complete $ git config remote.push<TAB> 'pushdefault' doesn't come up. This is because "$cur" is matched with "remote.*" and a list of remotes are completed. Add 'pushdefault' as a candidate for completion too, using __gitcomp_nl_append (). Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 January 2014, 17:17:25 UTC
422553d Ramkumar Ramachandra 05 January 2014, 10:18:04 UTC completion: fix branch.autosetup(merge|rebase) When attempting to complete $ git config branch.auto<TAB> 'autosetupmerge' and 'autosetuprebase' don't come up. This is because "$cur" is matched with "branch.*" and a list of branches are completed. Add 'autosetupmerge', 'autosetuprebase' as candidates for completion too, using __gitcomp_nl_append (). Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 January 2014, 17:17:05 UTC
f33c2c0 Ramkumar Ramachandra 05 January 2014, 10:18:03 UTC completion: introduce __gitcomp_nl_append () There are situations where multiple classes of completions possible. For example branch.<TAB> should try to complete branch.master. branch.autosetupmerge branch.autosetuprebase The first candidate has the suffix ".", and the second/ third candidates have the suffix " ". To facilitate completions of this kind, create a variation of __gitcomp_nl () that appends to the existing list of completion candidates, COMPREPLY. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 January 2014, 17:14:48 UTC
d028b89 Ramkumar Ramachandra 05 January 2014, 10:18:02 UTC zsh completion: find matching custom bash completion If zsh completion is being read from a location that is different from system-wide default, it is likely that the user is trying to use a custom version, perhaps closer to the bleeding edge, installed in her own directory. We will more likely to find the matching bash completion script in the same directory than in those system default places. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 January 2014, 17:14:29 UTC
c90d3db Junio C Hamano 06 January 2014, 17:10:09 UTC Merge branch 'maint' of git://github.com/git-l10n/git-po into maint * 'maint' of git://github.com/git-l10n/git-po: l10n: de.po: fix translation of 'prefix' 06 January 2014, 17:10:09 UTC
43fda94 W. Trevor King 03 January 2014, 18:31:22 UTC Documentation/gitmodules: Only 'update' and 'url' are required Descriptions for all the settings fell under the initial "Each submodule section also contains the following required keys:". The example shows sections with just 'path' and 'url' entries, which are indeed required, but we should still make the required/optional distinction explicit to clarify that the rest of them are optional. Signed-off-by: W. Trevor King <wking@tremily.us> Reviewed-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 January 2014, 17:08:18 UTC
feefdf6 Ramsay Jones 06 January 2014, 00:00:58 UTC shallow: remove unused code Commit 58babfff ("shallow.c: the 8 steps to select new commits for .git/shallow", 05-12-2013) added a function to implement step 5 of the quoted eight steps, namely 'remove_nonexistent_ours_in_pack()'. This function implements an optional optimization step in the new shallow commit selection algorithm. However, this function has no callers. (The commented out call sites would need to change, in order to provide information required by the function.) Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 January 2014, 17:05:40 UTC
16a2743 Ramsay Jones 05 January 2014, 23:55:01 UTC send-pack.c: mark a file-local function static Commit f2c681cf ("send-pack: support pushing from a shallow clone via http", 05-12-2013) adds the 'advertise_shallow_grafts_buf' function as an external symbol. Noticed by sparse. ("'advertise_shallow_grafts_buf' was not declared. Should it be static?") Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 January 2014, 16:26:36 UTC
6bc7672 Vasily Makarov 03 January 2014, 14:45:46 UTC get_octopus_merge_bases(): cleanup redundant variable pptr is needless. Some related code got cleaned as well. Signed-off-by: Vasily Makarov <einmalfel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 January 2014, 18:29:03 UTC
10a6cc8 Tom Miller 03 January 2014, 02:28:52 UTC fetch --prune: Run prune before fetching When we have a remote-tracking branch named "frotz/nitfol" from a previous fetch, and the upstream now has a branch named "frotz", fetch would fail to remove "frotz/nitfol" with a "git fetch --prune" from the upstream. git would inform the user to use "git remote prune" to fix the problem. Change the way "fetch --prune" works by moving the pruning operation before the fetching operation. This way, instead of warning the user of a conflict, it autmatically fixes it. Signed-off-by: Tom Miller <jackerran@gmail.com> Tested-by: Thomas Rast <tr@thomasrast.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 January 2014, 18:18:40 UTC
4b3b33a Tom Miller 03 January 2014, 02:28:51 UTC fetch --prune: always print header url If "fetch --prune" is run with no new refs to fetch, but it has refs to prune. Then, the header url is not printed as it would if there were new refs to fetch. Output before this patch: $ git fetch --prune remote-with-no-new-refs x [deleted] (none) -> origin/world Output after this patch: $ git fetch --prune remote-with-no-new-refs From https://github.com/git/git x [deleted] (none) -> origin/test Signed-off-by: Tom Miller <jackerran@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 January 2014, 18:13:39 UTC
cb05536 Ralf Thielow 03 January 2014, 17:05:43 UTC l10n: de.po: fix translation of 'prefix' The word 'prefix' is currently translated as 'Prefix' which is not a German word. It should be translated as 'Präfix'. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> 03 January 2014, 17:21:38 UTC
ed7eda8 Kyle J. McKay 31 December 2013, 12:07:39 UTC gc: notice gc processes run by other users Since 64a99eb4 git gc refuses to run without the --force option if another gc process on the same repository is already running. However, if the repository is shared and user A runs git gc on the repository and while that gc is still running user B runs git gc on the same repository the gc process run by user A will not be noticed and the gc run by user B will go ahead and run. The problem is that the kill(pid, 0) test fails with an EPERM error since user B is not allowed to signal processes owned by user A (unless user B is root). Update the test to recognize an EPERM error as meaning the process exists and another gc should not be run (unless --force is given). Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 January 2014, 00:15:29 UTC
738a8be Jeff King 28 December 2013, 09:33:40 UTC t0000: drop "known breakage" test Having a simulated "known breakage" test means that the test suite will always tell us there is a bug to be fixed, even though it is only simulated. The right way to test this is in a sub-test, that can also check that we provide the correct exit status and output. Fortunately, we already have such a test (added much later by 5ebf89e). We could arguably get rid of the simulated success test immediately above, as well, as it is also redundant with the tests added in 5ebf89e. However, it does not have the annoying behavior of the "known breakage" test. It may also be easier to debug if the test suite is truly broken, since it is not a test-within-a-test, as the later tests are. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 January 2014, 22:43:12 UTC
a63c12c Jeff King 28 December 2013, 09:31:49 UTC t0000: simplify HARNESS_ACTIVE hack Commit 517cd55 set HARNESS_ACTIVE unconditionally in sub-tests, because that value affects the output of "--verbose". t0000 needs stable output from its sub-tests, and we may or may not be running under a TAP harness. That commit made the decision to always set the variable, since it has another useful side effect, which is suppressing writes to t/test-results by the sub-tests (which would just pollute the real results). Since the last commit, though, the sub-tests have their own test-results directories, so this is no longer an issue. We can now update a few comments that are no longer accurate nor necessary. We can also revisit the choice of HARNESS_ACTIVE. Since we must choose one value for stability, it's probably saner to have it off. This means that future patches could test things like the test-results writing, or the "--quiet" option, which is currently ignored when run under a harness. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 January 2014, 22:43:11 UTC
6883047 Jeff King 28 December 2013, 09:29:15 UTC t0000: set TEST_OUTPUT_DIRECTORY for sub-tests Running t0000 produces more trash directories than expected and does not clean up after itself: $ ./t0000-basic.sh [...] $ ls -d trash\ directory.* trash directory.failing-cleanup trash directory.mixed-results1 trash directory.mixed-results2 trash directory.partial-pass trash directory.test-verbose trash directory.test-verbose-only-2 These scratch areas for sub-tests should be under the t0000 trash directory, but because TEST_OUTPUT_DIRECTORY defaults to TEST_DIRECTORY, which is exported to help sub-tests find test-lib.sh, the sub-test trash directories are created under the toplevel t/ directory instead. Because some of the sub-tests simulate failures, their trash directories are kept around. Fix it by explicitly setting TEST_OUTPUT_DIRECTORY appropriately for sub-tests. An alternative fix would be to pass the --root parameter that only specifies where to put the trash directories, which would also work. However, using TEST_OUTPUT_DIRECTORY is more futureproof in case tests want to write more output in addition to the test-results/ (which are already suppressed in sub-tests using the HARNESS_ACTIVE setting) and trash directories. This fixes a regression introduced by 38b074d (t/test-lib.sh: fix TRASH_DIRECTORY handling, 2013-04-14). Before that commit, the TEST_OUTPUT_DIRECTORY setting was not respected consistently so most tests did their work in a "trash" subdirectory of the current directory instead of the output dir. Signed-off-by: Jeff King <peff@peff.net> Clarified-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 January 2014, 22:40:03 UTC
afbf5ca Jeff King 02 January 2014, 07:38:35 UTC use distinct username/password for http auth tests The httpd server we set up to test git's http client code knows about a single account, in which both the username and password are "user@host" (the unusual use of the "@" here is to verify that we handle the character correctly when URL escaped). This means that we may miss a certain class of errors in which the username and password are mixed up internally by git. We can make our tests more robust by having distinct values for the username and password. In addition to tweaking the server passwd file and the client URL, we must teach the "askpass" harness to accept multiple values. As a bonus, this makes the setup of some tests more obvious; when we are expecting git to ask only about the password, we can seed the username askpass response with a bogus value. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 January 2014, 18:25:03 UTC
e1c1a32 Jeff King 02 January 2014, 03:03:30 UTC Revert "prompt: clean up strbuf usage" This reverts commit 31b49d9b653803e7c7fd18b21c8bdd86e3421668. That commit taught do_askpass to hand ownership of our buffer back to the caller rather than simply return a pointer into our internal strbuf. What it failed to notice, though, was that our internal strbuf is static, because we are trying to emulate the getpass() interface. By handing off ownership, we created a memory leak that cannot be solved. Sometimes git_prompt returns a static buffer from getpass() (or our smarter git_terminal_prompt wrapper), and sometimes it returns an allocated string from do_askpass. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 January 2014, 18:21:40 UTC
92164af Benny Siegert 31 December 2013, 14:36:45 UTC Add MirBSD support to the build system. Add an entry into the table of supported OSes. Do not set _XOPEN_SOURCE (contrary to OpenBSD) because that disables the u_short and u_long typedefs, which are used unconditionally in various other header files. Signed-off-by: Benny Siegert <bsiegert@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 January 2014, 18:19:14 UTC
663a856 Christian Couder 28 December 2013, 11:00:05 UTC replace info: rename 'full' to 'long' and clarify in-code symbols Enum names SHORT/MEDIUM/FULL were too broad to be descriptive. And they clashed with built-in symbols on platforms like Windows. Clarify by giving them REPLACE_FORMAT_ prefix. Rename 'full' format in "git replace --format=<name>" to 'long', to match others (i.e. 'short' and 'medium'). Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 December 2013, 20:33:11 UTC
4448466 Junio C Hamano 30 December 2013, 20:27:01 UTC Merge branch 'maint' * maint: for-each-ref: remove unused variable 30 December 2013, 20:27:01 UTC
b9cf14d Ramkumar Ramachandra 30 December 2013, 16:28:55 UTC for-each-ref: remove unused variable No code ever used this symbol since the command was introduced at 9f613ddd (Add git-for-each-ref: helper for language bindings, 2006-09-15). Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 December 2013, 20:23:51 UTC
8f29299 Junio C Hamano 30 December 2013, 19:58:54 UTC merge-base --octopus: reduce the result from get_octopus_merge_bases() Scripts that use "merge-base --octopus" could do the reducing themselves, but most of them are expected to want to get the reduced results without having to do any work themselves. Tests are taken from a message by Василий Макаров <einmalfel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- We might want to vet the existing callers of the underlying get_octopus_merge_bases() and find out if _all_ of them are doing anything extra (like deduping) because the machinery can return duplicate results. And if that is the case, then we may want to move the dedupling down the callchain instead of having it here. 30 December 2013, 19:58:54 UTC
e2f5df4 Junio C Hamano 30 December 2013, 19:37:49 UTC merge-base: separate "--independent" codepath into its own helper It piggybacks on an unrelated handle_octopus() function only because there are some similarities between the way they need to preprocess their input and output their result. There is nothing similar in the true logic between these two operations. Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 December 2013, 19:37:49 UTC
e228c17 Johannes Schindelin 27 December 2013, 20:49:57 UTC Remove the line length limit for graft files Support for grafts predates Git's strbuf, and hence it is understandable that there was a hard-coded line length limit of 1023 characters (which was chosen a bit awkwardly, given that it is *exactly* one byte short of aligning with the 41 bytes occupied by a commit name and the following space or new-line character). While regular commit histories hardly win comprehensibility in general if they merge more than twenty-two branches in one go, it is not Git's business to limit grafts in such a way. In this particular developer's case, the use case that requires substantially longer graft lines to be supported is the visualization of the commits' order implied by their changes: commits are considered to have an implicit relationship iff exchanging them in an interactive rebase would result in merge conflicts. Thusly implied branches tend to be very shallow in general, and the resulting thicket of implied branches is usually very wide; It is actually quite common that *most* of the commits in a topic branch have not even one implied parent, so that a final merge commit has about as many implied parents as there are commits in said branch. [jc: squashed in tests by Jonathan] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 December 2013, 00:46:25 UTC
53f3478 Junio C Hamano 27 December 2013, 22:58:35 UTC Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git-svn: workaround for a bug in svn serf backend 27 December 2013, 22:58:35 UTC
36ec9e2 Junio C Hamano 27 December 2013, 22:58:25 UTC Merge branch 'fc/remote-helper-fixes' * fc/remote-helper-fixes: remote-hg: test 'shared_path' in a moved clone remote-hg: add tests for special filenames remote-hg: fix 'shared path' path remote-helpers: add extra safety checks remote-hg: avoid buggy strftime() 27 December 2013, 22:58:25 UTC
back to top