Skip to main content

Browse the archive

swh:1:snp:6df5a50b8107b6bbe1e51d0239d816a7503c536a
sort by:
Revision Author Date Message Commit Date
bdfc6b3 Junio C Hamano 08 December 2015, 22:07:30 UTC Git 2.6.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 December 2015, 22:12:45 UTC
4d0069f Junio C Hamano 08 December 2015, 22:11:32 UTC Merge branch 'rs/status-detached-head-memcmp' into maint Fix some string-matching corner cases when digging in the reflog for "git status". * rs/status-detached-head-memcmp: wt-status: correct and simplify check for detached HEAD 08 December 2015, 22:11:32 UTC
b5d2d8e Junio C Hamano 08 December 2015, 22:05:03 UTC Merge branch 'ad/sha1-update-chunked' into maint Apple's common crypto implementation of SHA1_Update() does not take more than 4GB at a time, and we now have a compile-time workaround for it. * ad/sha1-update-chunked: sha1: allow limiting the size of the data passed to SHA1_Update() sha1: provide another level of indirection for the SHA-1 functions 08 December 2015, 22:05:03 UTC
e6ed5a4 Junio C Hamano 08 December 2015, 22:05:02 UTC Merge branch 'sg/bash-prompt-dirty-orphan' into maint Produce correct "dirty" marker for shell prompts, even when we are on an orphan or an unborn branch. * sg/bash-prompt-dirty-orphan: bash prompt: indicate dirty index even on orphan branches bash prompt: remove a redundant 'git diff' option bash prompt: test dirty index and worktree while on an orphan branch 08 December 2015, 22:05:02 UTC
22386ad Junio C Hamano 08 December 2015, 22:05:02 UTC Merge branch 'jk/interpret-trailers-outside-a-repository' into maint Allow "git interpret-trailers" to run outside of a Git repository. * jk/interpret-trailers-outside-a-repository: interpret-trailers: allow running outside a repository 08 December 2015, 22:05:02 UTC
697bd28 Junio C Hamano 08 December 2015, 22:05:00 UTC Merge branch 'jk/rebase-no-autostash' into maint There was no way to defeat a configured rebase.autostash variable from the command line, as "git rebase --no-autostash" was missing. * jk/rebase-no-autostash: Documentation/git-rebase: fix --no-autostash formatting rebase: support --no-autostash 08 December 2015, 22:05:01 UTC
9a8c740 Junio C Hamano 04 December 2015, 19:39:19 UTC Prepare for 2.6.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 December 2015, 19:39:19 UTC
aa0b4c3 Junio C Hamano 04 December 2015, 19:34:24 UTC Merge branch 'da/difftool' into maint The code to prepare the working tree side of temporary directory for the "dir-diff" feature forgot that symbolic links need not be copied (or symlinked) to the temporary area, as the code already special cases and overwrites them. Besides, it was wrong to try computing the object name of the target of symbolic link, which may not even exist or may be a directory. * da/difftool: difftool: ignore symbolic links in use_wt_file 04 December 2015, 19:34:24 UTC
b50ceab Junio C Hamano 04 December 2015, 19:33:07 UTC Merge branch 'dk/gc-idx-wo-pack' into maint Having a leftover .idx file without corresponding .pack file in the repository hurts performance; "git gc" learned to prune them. We may want to do the same for .bitmap (and notice but not prune .keep) without corresponding .pack, but that can be a separate topic. * dk/gc-idx-wo-pack: gc: remove garbage .idx files from pack dir t5304: test cleaning pack garbage prepare_packed_git(): refactor garbage reporting in pack directory 04 December 2015, 19:33:08 UTC
908a6e4 Jeff King 01 December 2015, 22:24:20 UTC Merge branch 'eg/p4-submit-catch-failure' into maint Just like the working tree is cleaned up when the user cancelled submission in P4Submit.applyCommit(), clean up the mess if "p4 submit" fails. * eg/p4-submit-catch-failure: git-p4: clean up after p4 submit failure 01 December 2015, 22:24:21 UTC
35f2635 Jeff King 01 December 2015, 22:21:31 UTC Merge branch 'dk/check-ignore-docs' into maint Documentation clarification for "check-ignore" without "--verbose". * dk/check-ignore-docs: check-ignore: correct documentation about output 01 December 2015, 22:21:32 UTC
5b228f9 Jeff King 01 December 2015, 22:21:29 UTC Merge branch 'ld/p4-detached-head' into maint Make git-p4 work on a detached head. * ld/p4-detached-head: git-p4: work with a detached head git-p4: add option to system() to return subshell status git-p4: add failing test for submit from detached head 01 December 2015, 22:21:29 UTC
978b576 Jeff King 01 December 2015, 22:21:17 UTC Merge branch 'sg/filter-branch-dwim-ambiguity' into maint Fix for a corner case in filter-branch. * sg/filter-branch-dwim-ambiguity: filter-branch: deal with object name vs. pathname ambiguity in tree-filter 01 December 2015, 22:21:17 UTC
2cc3640 Jeff King 01 December 2015, 22:21:11 UTC Merge branch 'mg/doc-word-diff-example' into maint * mg/doc-word-diff-example: Documentation/diff: give --word-diff-regex=. example 01 December 2015, 22:21:11 UTC
712a12e Jeff King 01 December 2015, 22:21:01 UTC Merge branch 'cb/ssl-config-pathnames' into maint Allow tilde-expansion in some http config variables. * cb/ssl-config-pathnames: http: treat config options sslCAPath and sslCAInfo as paths 01 December 2015, 22:21:01 UTC
76fdb06 Jeff King 01 December 2015, 22:20:52 UTC Merge branch 'dk/t5813-unc-paths' into maint Test portability fix for a topic in v2.6.1. * dk/t5813-unc-paths: t5813: avoid creating urls that break on cygwin 01 December 2015, 22:20:52 UTC
3840d2d Jeff King 01 December 2015, 22:20:46 UTC Merge branch 'dk/rerere-train-quoting' into maint Fix shell quoting in contrib script. * dk/rerere-train-quoting: Escape Git's exec path in contrib/rerere-train.sh script 01 December 2015, 22:20:46 UTC
347acea Jeff King 01 December 2015, 22:19:52 UTC Merge branch 'cb/hook-sigpipe' into maint We now consistently allow all hooks to ignore their standard input, rather than having git complain of SIGPIPE. * cb/hook-sigpipe: allow hooks to ignore their standard input stream 01 December 2015, 22:19:52 UTC
45e330f Jeff King 01 December 2015, 22:19:37 UTC Merge branch 'fm/shell-path-whitespace' into maint Portability fix for Windows, which may rewrite $SHELL variable using non-POSIX paths. * fm/shell-path-whitespace: rebase-i-exec: Allow space in SHELL_PATH 01 December 2015, 22:19:37 UTC
2945adc Jeff King 01 December 2015, 22:19:33 UTC Merge branch 'ar/doc-env-variable-format' into maint Minor documentation fixup. * ar/doc-env-variable-format: Documentation: make environment variable formatting more consistent 01 December 2015, 22:19:33 UTC
92b9bf4 Jeff King 01 December 2015, 22:19:12 UTC Merge branch 'pt/http-socks-proxy' into maint Add support for talking http/https over socks proxy. * pt/http-socks-proxy: remote-http(s): support SOCKS proxies 01 December 2015, 22:19:12 UTC
cd76778 Jeff King 01 December 2015, 22:19:06 UTC Merge branch 'rc/configure-use-libs-when-checking-a-lib' into maint The "configure" script did not test for -lpthread correctly, which upset some linkers. * rc/configure-use-libs-when-checking-a-lib: configure.ac: use $LIBS not $CFLAGS when testing -lpthread 01 December 2015, 22:19:06 UTC
904de44 René Scharfe 25 November 2015, 14:10:18 UTC wt-status: correct and simplify check for detached HEAD If a branch name is longer than four characters then memcmp() reads over the end of the static string "HEAD". This causes the following test failures with AddressSanitizer: t3203-branch-output.sh (Wstat: 256 Tests: 18 Failed: 4) Failed tests: 12, 15-17 Non-zero exit status: 1 t3412-rebase-root.sh (Wstat: 256 Tests: 31 Failed: 3) Failed tests: 28-29, 31 Non-zero exit status: 1 t3507-cherry-pick-conflict.sh (Wstat: 256 Tests: 31 Failed: 4) Failed tests: 14, 29-31 Non-zero exit status: 1 t3510-cherry-pick-sequence.sh (Wstat: 256 Tests: 39 Failed: 14) Failed tests: 17, 22-26, 28-30, 34-35, 37-39 Non-zero exit status: 1 t3420-rebase-autostash.sh (Wstat: 256 Tests: 28 Failed: 4) Failed tests: 24-27 Non-zero exit status: 1 t3404-rebase-interactive.sh (Wstat: 256 Tests: 91 Failed: 57) Failed tests: 17, 19, 21-42, 44, 46-74, 77, 81-82 Non-zero exit status: 1 t3900-i18n-commit.sh (Wstat: 256 Tests: 34 Failed: 1) Failed test: 34 Non-zero exit status: 1 t5407-post-rewrite-hook.sh (Wstat: 256 Tests: 14 Failed: 6) Failed tests: 9-14 Non-zero exit status: 1 t7001-mv.sh (Wstat: 256 Tests: 46 Failed: 5) Failed tests: 39-43 Non-zero exit status: 1 t7509-commit.sh (Wstat: 256 Tests: 12 Failed: 2) Failed tests: 11-12 Non-zero exit status: 1 t7512-status-help.sh (Wstat: 256 Tests: 39 Failed: 35) Failed tests: 5-39 Non-zero exit status: 1 t6030-bisect-porcelain.sh (Wstat: 256 Tests: 70 Failed: 1) Failed test: 13 Non-zero exit status: 1 And if a branch is named "H", "HE", or "HEA" then the current if clause erroneously considers it as matching "HEAD" because it only compares up to the end of the branch name. Fix that by doing the comparison using strcmp() and only after the branch name is extracted. This way neither too less nor too many characters are checked. While at it call strchrnul() to find the end of the branch name instead of open-coding it. Helped-by: Jeff King <peff@peff.net> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> 28 November 2015, 17:30:18 UTC
bf9acba Charles Bailey 23 November 2015, 12:02:40 UTC http: treat config options sslCAPath and sslCAInfo as paths This enables ~ and ~user expansion for these config options. Signed-off-by: Charles Bailey <cbailey32@bloomberg.net> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 23:51:00 UTC
2c15c00 Michael J Gruber 20 November 2015, 13:36:14 UTC Documentation/diff: give --word-diff-regex=. example It's just so useful. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 23:38:46 UTC
4d2a364 SZEDER Gábor 23 November 2015, 12:23:16 UTC filter-branch: deal with object name vs. pathname ambiguity in tree-filter 'git filter-branch' fails complaining about an ambiguous argument, if a tree-filter renames a path and the new pathname happens to match an existing object name. After the tree-filter has been applied, 'git filter-branch' looks for changed paths by running: git diff-index -r --name-only --ignore-submodules $commit which then, because of the lack of disambiguating double-dash, can't decide whether to treat '$commit' as revision or path and errors out. Add that disambiguating double-dash after 'git diff-index's revision argument to make sure that '$commit' is interpreted as a revision. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 23:37:50 UTC
219cbf0 Dennis Kaarsemaker 20 November 2015, 20:30:48 UTC check-ignore: correct documentation about output By default git check-ignore shows only the filenames that will be ignored, not the pattern that causes their exclusion. Instead of moving the partial exclude pattern precendence information to the -v option where it belongs, link to gitignore(5) which describes this more thoroughly. Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 22:13:36 UTC
5cb2e16 Christian Couder 24 November 2015, 11:55:07 UTC Documentation/git-update-index: add missing opts to synopsys Untracked cache related options should appear in the synopsis. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:44:40 UTC
b7638fe GIRARD Etienne 24 November 2015, 07:43:59 UTC git-p4: clean up after p4 submit failure When "p4 submit" command fails in P4Submit.applyCommit, the workspace is left with the changes. We already have code to revert the changes to the workspace when the user decides to cancel submission by aborting the editor that edits the change description, and we should treat the "p4 submit" failure the same way. Clean the workspace if p4_write_pipe raised SystemExit, so that the user don't have to do it themselves. Signed-off-by: GIRARD Etienne <egirard@murex.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:41:59 UTC
c26f70c SZEDER Gábor 21 November 2015, 11:30:09 UTC bash prompt: indicate dirty index even on orphan branches __git_ps1() doesn't indicate dirty index while on an orphan branch. To check the dirtiness of the index, __git_ps1() runs 'git diff-index --cached ... HEAD', which doesn't work on an orphan branch, because HEAD doesn't point to a valid commit. Run 'git diff ... --cached' instead, as it does the right thing both on valid and invalid HEAD, i.e. compares the index to the existing HEAD in the former case and to the empty tree in the latter. This fixes the two failing tests added in the first commit of this series. The dirtiness of the worktree is already checked with 'git diff' and is displayed correctly even on an orphan branch. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:27:01 UTC
0af9f7e SZEDER Gábor 21 November 2015, 14:46:40 UTC bash prompt: remove a redundant 'git diff' option To get the dirty state indicator __git_ps1() runs 'git diff' with '--quiet --exit-code' options. '--quiet' already implies '--exit-code', so the latter is unnecessary and can be removed. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:27:01 UTC
a30d11e SZEDER Gábor 21 November 2015, 11:30:07 UTC bash prompt: test dirty index and worktree while on an orphan branch There is only a single test exercising the dirty state indicator on an orphan branch, and in that test neither the index nor the worktree are dirty. Add two failing tests to check the dirty state indicator while either the index is dirty or while both the index and the worktree are dirty on an orphan branch, and to show that the dirtiness of the index is not displayed in these cases (the fourth combination, i.e. clean index and dirty worktree are impossible on an orphan branch). Update the existing dirty state indicator on clean orphan branch test to match the style of the two new tests, most importantly to use 'git checkout --orphan' instead of cd-ing into a repository that just happens to be empty and clean. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:27:01 UTC
00ad6e3 Luke Diamand 21 November 2015, 09:54:41 UTC git-p4: work with a detached head When submitting, git-p4 finds the current branch in order to know if it is allowed to submit (configuration "git-p4.allowSubmit"). On a detached head, detecting the branch would fail, and git-p4 would report a cryptic error. This change teaches git-p4 to recognise a detached head and submit successfully. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:20:15 UTC
cbff4b2 Luke Diamand 21 November 2015, 09:54:40 UTC git-p4: add option to system() to return subshell status Add an optional parameter ignore_error to the git-p4 system() function. If used, it will return the subshell exit status rather than throwing an exception. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:20:15 UTC
74b6fe9 Luke Diamand 21 November 2015, 09:54:39 UTC git-p4: add failing test for submit from detached head git-p4 can't submit from a detached head. This test case demonstrates the problem. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net> 24 November 2015, 20:20:15 UTC
6d7afe0 Pat Thoyts 26 October 2015, 13:15:07 UTC remote-http(s): support SOCKS proxies With this patch we properly support SOCKS proxies, configured e.g. like this: git config http.proxy socks5://192.168.67.1:32767 Without this patch, Git mistakenly tries to use SOCKS proxies as if they were HTTP proxies, resulting in a error message like: fatal: unable to access 'http://.../': Proxy CONNECT aborted This patch was required to work behind a faulty AP and scraped from http://stackoverflow.com/questions/15227130/#15228479 and guarded with an appropriate cURL version check by Johannes Schindelin. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 November 2015, 12:31:39 UTC
681390b Dennis Kaarsemaker 09 November 2015, 17:49:35 UTC t5813: avoid creating urls that break on cygwin When passed an ssh:// url, git strips ssh://host from the url but does not remove leading slashes from the path. So when this test used ssh://remote//path/to/pwd, the path accessed by our fake SSH is //path/to/pwd, which cygwin interprets as a UNC path, causing the test to fail. We may want to actually fix this in git itself, making it remove extra slashes from urls before feeding them to transports or helpers, but that's for another topic as it could cause regressions. Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net> Signed-off-by: Jeff King <peff@peff.net> 20 November 2015, 11:46:48 UTC
4573a68 Daniel Knittl-Frank 08 November 2015, 11:27:55 UTC Escape Git's exec path in contrib/rerere-train.sh script Whitespace can cause the source command to fail. This is usually not a problem on Unix systems, but on Windows Git is likely to be installed under "C:/Program Files/", thus rendering the script broken. Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> Signed-off-by: Jeff King <peff@peff.net> 20 November 2015, 11:43:00 UTC
af65f68 Clemens Buchacher 16 November 2015, 08:05:58 UTC allow hooks to ignore their standard input stream Since ec7dbd145 (receive-pack: allow hooks to ignore its standard input stream) the pre-receive and post-receive hooks ignore SIGPIPE. Do the same for the remaining hooks pre-push and post-rewrite, which read from standard input. The same arguments for ignoring SIGPIPE apply. Include test by Jeff King which checks that SIGPIPE does not cause pre-push hook failure. With the use of git update-ref --stdin it is fast enough to be enabled by default. Signed-off-by: Clemens Buchacher <clemens.buchacher@intel.com> Signed-off-by: Jeff King <peff@peff.net> 16 November 2015, 13:59:19 UTC
fe9394a Fredrik Medley 13 November 2015, 06:03:19 UTC rebase-i-exec: Allow space in SHELL_PATH On Windows, when Git is installed under "C:\Program Files\Git", SHELL_PATH will include a space. Fix "git rebase --interactive --exec" so that it works with spaces in SHELL_PATH. Signed-off-by: Fredrik Medley <fredrik.medley@gmail.com> Signed-off-by: Jeff King <peff@peff.net> 13 November 2015, 22:51:39 UTC
6dedd80 Андрей Рыбак 11 November 2015, 15:47:25 UTC Documentation: make environment variable formatting more consistent Documentation/git.txt is not consistent in the way it stylizes mentions of Environment Variables. Most of them are enclosed in single quotes, some are enclosed in backticks, some are not enclosed. Signed-off-by: Andrey Rybak <rybak.a.v@gmail.com> Signed-off-by: Jeff King <peff@peff.net> 11 November 2015, 21:46:34 UTC
bac2c5b Rainer M. Canavan 06 November 2015, 01:11:37 UTC configure.ac: use $LIBS not $CFLAGS when testing -lpthread Some linkers, namely the one on IRIX are rather strict concerning the order or arguments for symbol resolution, i.e. no libraries listed before objects or other libraries on the command line are considered for symbol resolution. Therefore, -lpthread can't work if it's put in CFLAGS, because it will not be considered for resolving pthread_key_create in conftest.o. Use $LIBS instead. Signed-off-by: Rainer Canavan <git@canavan.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 November 2015, 17:41:08 UTC
af40944 Junio C Hamano 05 November 2015, 20:20:34 UTC Git 2.6.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 November 2015, 20:20:34 UTC
b8f5242 Junio C Hamano 05 November 2015, 20:18:16 UTC Merge branch 'rs/daemon-plug-child-leak' into maint "git daemon" uses "run_command()" without "finish_command()", so it needs to release resources itself, which it forgot to do. * rs/daemon-plug-child-leak: daemon: plug memory leak run-command: factor out child_process_clear() 05 November 2015, 20:18:17 UTC
db43891 Junio C Hamano 05 November 2015, 20:18:15 UTC Merge branch 'rs/wt-status-detached-branch-fix' into maint "git status --branch --short" accessed beyond the constant string "HEAD", which has been corrected. * rs/wt-status-detached-branch-fix: wt-status: use skip_prefix() to get rid of magic string length constants wt-status: don't skip a magical number of characters blindly wt-status: avoid building bogus branch name with detached HEAD wt-status: exit early using goto in wt_shortstatus_print_tracking() t7060: add test for status --branch on a detached HEAD 05 November 2015, 20:18:15 UTC
f97aee1 Junio C Hamano 05 November 2015, 20:18:14 UTC Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maint We peek objects from submodule's object store by linking it to the list of alternate object databases, but the code to do so forgot to correctly initialize the list. * jk/initialization-fix-to-add-submodule-odb: add_submodule_odb: initialize alt_odb list earlier 05 November 2015, 20:18:14 UTC
ace5348 Junio C Hamano 05 November 2015, 20:18:13 UTC Merge branch 'js/misc-fixes' into maint Various compilation fixes and squelching of warnings. * js/misc-fixes: Correct fscanf formatting string for I64u values Silence GCC's "cast of pointer to integer of a different size" warning Squelch warning about an integer overflow 05 November 2015, 20:18:13 UTC
a878e7e Junio C Hamano 05 November 2015, 20:18:12 UTC Merge branch 'jc/add-u-A-default-to-top' into maint "git --literal-pathspecs add -u/-A" without any command line argument misbehaved ever since Git 2.0. * jc/add-u-A-default-to-top: add: simplify -u/-A without pathspec 05 November 2015, 20:18:12 UTC
5e6154f Junio C Hamano 05 November 2015, 20:18:11 UTC Merge branch 'jk/delete-modechange-conflict' into maint Merging a branch that removes a path and another that changes the mode bits on the same path should have conflicted at the path, but it didn't and silently favoured the removal. * jk/delete-modechange-conflict: merge: detect delete/modechange conflict t6031: generalize for recursive and resolve strategies t6031: move triple-rename test to t3030 05 November 2015, 20:18:11 UTC
c378862 Junio C Hamano 05 November 2015, 20:18:10 UTC Merge branch 'js/imap-send-curl-compilation-fix' into maint "git imap-send" did not compile well with older version of cURL library. * js/imap-send-curl-compilation-fix: imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available 05 November 2015, 20:18:10 UTC
3897d2d Junio C Hamano 05 November 2015, 20:18:08 UTC Merge branch 'rp/link-curl-before-ssl' into maint The linkage order of libraries was wrong in places around libcurl. * rp/link-curl-before-ssl: configure.ac: detect ssl need with libcurl Makefile: make curl-config path configurable Makefile: link libcurl before zlib 05 November 2015, 20:18:09 UTC
4349f59 Junio C Hamano 05 November 2015, 20:18:07 UTC Merge branch 'nd/clone-linked-checkout' into maint It was not possible to use a repository-lookalike created by "git worktree add" as a local source of "git clone". * nd/clone-linked-checkout: clone: better error when --reference is a linked checkout clone: allow --local from a linked checkout enter_repo: allow .git files in strict mode enter_repo: avoid duplicating logic, use is_git_directory() instead t0002: add test for enter_repo(), non-strict mode path.c: delete an extra space 05 November 2015, 20:18:08 UTC
53be145 Junio C Hamano 05 November 2015, 20:18:06 UTC Merge branch 'sa/send-email-smtp-batch-data-limit' into maint When "git send-email" wanted to talk over Net::SMTP::SSL, Net::Cmd::datasend() did not like to be fed too many bytes at the same time and failed to send messages. Send the payload one line at a time to work around the problem. * sa/send-email-smtp-batch-data-limit: git-send-email.perl: Fixed sending of many/huge changes/patches 05 November 2015, 20:18:06 UTC
001fd7a Atousa Pahlevan Duprat 05 November 2015, 06:38:42 UTC sha1: allow limiting the size of the data passed to SHA1_Update() Using the previous commit's inredirection mechanism for SHA1, support a chunked implementation of SHA1_Update() that limits the amount of data in the chunk passed to SHA1_Update(). This is enabled by using the Makefile variable SHA1_MAX_BLOCK_SIZE to specify chunk size. When using Apple's CommonCrypto library this is set to 1GiB (the implementation cannot handle more 4GiB). Signed-off-by: Atousa Pahlevan Duprat <apahlevan@ieee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 November 2015, 18:35:11 UTC
3bc72fd Atousa Pahlevan Duprat 05 November 2015, 06:38:41 UTC sha1: provide another level of indirection for the SHA-1 functions The git source uses git_SHA1_Update() and friends to call into the code that computes the hashes. Traditionally, we used to map these directly to underlying implementation of the SHA-1 hash (e.g. SHA1_Update() from OpenSSL or blk_SHA1_Update() from block-sha1/). This arrangement however makes it hard to tweak behaviour of the underlying implementation without fully replacing. If we want to introduce a tweaked_SHA1_Update() wrapper to implement the "Update" in a slightly different way, for example, the implementation of the wrapper still would want to call into the underlying implementation, but tweaked_SHA1_Update() cannot call git_SHA1_Update() to get to the underlying implementation (often but not always SHA1_Update()). Add another level of indirection that maps platform_SHA1_Update() and friends to their underlying implementations, and by default make git_SHA1_Update() and friends map to platform_SHA1_* functions. Doing it this way will later allow us to map git_SHA1_Update() to tweaked_SHA1_Update(), and the latter can use platform_SHA1_Update() in its implementation. Signed-off-by: Atousa Pahlevan Duprat <apahlevan@ieee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 November 2015, 18:35:11 UTC
684fea3 Junio C Hamano 04 November 2015, 22:20:49 UTC Merge branch 'xf/user-manual-ff' into maint * xf/user-manual-ff: user-manual: fix the description of fast-forward 04 November 2015, 22:20:49 UTC
6c66686 Junio C Hamano 04 November 2015, 22:20:47 UTC Merge branch 'xf/user-manual-markup' into maint AsciiDoc markup fixes. * xf/user-manual-markup: Documentation: match undefline with the text in old release notes Documentation: match underline with the text Documentation: fix header markup 04 November 2015, 22:20:47 UTC
7974b3f Junio C Hamano 04 November 2015, 22:20:46 UTC Merge branch 'jc/everyday-markup' into maint AsciiDoc markup fixes. * jc/everyday-markup: Documentation/everyday: match undefline with the text 04 November 2015, 22:20:46 UTC
bc1e048 Junio C Hamano 04 November 2015, 22:20:45 UTC Merge branch 'jc/em-dash-in-doc' into maint AsciiDoc markup fixes. * jc/em-dash-in-doc: Documentation: AsciiDoc spells em-dash as double-dashes, not triple 04 November 2015, 22:20:45 UTC
d091031 Junio C Hamano 04 November 2015, 22:20:44 UTC Merge branch 'es/worktree-add' into maint * es/worktree-add: worktree: usage: denote <branch> as optional with 'add' 04 November 2015, 22:20:44 UTC
478f34d Doug Kelly 04 November 2015, 03:05:08 UTC gc: remove garbage .idx files from pack dir Add a custom report_garbage handler to collect and remove garbage .idx files from the pack directory. Signed-off-by: Doug Kelly <dougk.ff7@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 November 2015, 19:30:22 UTC
e6d65c9 Doug Kelly 04 November 2015, 03:05:07 UTC t5304: test cleaning pack garbage Pack garbage, noticeably stale .idx files, can be cleaned up during a garbage collection. This tests to ensure such garbage is properly cleaned up. Note that the prior test for checking pack garbage with count-objects left some stale garbage after the test exited. This has also been corrected. Signed-off-by: Doug Kelly <dougk.ff7@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 November 2015, 19:30:10 UTC
fdca2be Junio C Hamano 03 November 2015, 23:32:42 UTC Merge branch 'mk/blame-error-message' into maint The error message from "git blame --contents --reverse" incorrectly talked about "--contents --children". * mk/blame-error-message: blame: fix option name in error message 03 November 2015, 23:32:43 UTC
5c15ca0 Junio C Hamano 03 November 2015, 23:32:41 UTC Merge branch 'jk/merge-file-exit-code' into maint "git merge-file" tried to signal how many conflicts it found, which obviously would not work well when there are too many of them. * jk/merge-file-exit-code: merge-file: clamp exit code to maximum 127 03 November 2015, 23:32:41 UTC
3a27eec Junio C Hamano 03 November 2015, 23:32:40 UTC Merge branch 'dt/name-hash-dir-entry-fix' into maint The name-hash subsystem that is used to cope with case insensitive filesystems keeps track of directories and their on-filesystem cases for all the paths in the index by holding a pointer to a randomly chosen cache entry that is inside the directory (for its ce->ce_name component). This pointer was not updated even when the cache entry was removed from the index, leading to use after free. This was fixed by recording the path for each directory instead of borrowing cache entries and restructuring the API somewhat. * dt/name-hash-dir-entry-fix: name-hash: don't reuse cache_entry in dir_entry 03 November 2015, 23:32:40 UTC
ced2321 Junio C Hamano 03 November 2015, 23:32:39 UTC Merge branch 'jc/am-3-fallback-regression-fix' into maint "git am -3" had a small regression where it is aborted in its error handling codepath when underlying merge-recursive failed in certain ways, as it assumed that the internal call to merge-recursive will never die, which is not the case (yet). * jc/am-3-fallback-regression-fix: am -3: do not let failed merge from completing the error codepath 03 November 2015, 23:32:39 UTC
f5f7684 Junio C Hamano 03 November 2015, 23:32:38 UTC Merge branch 'jc/usage-stdin' into maint The synopsis text and the usage string of subcommands that read list of things from the standard input are often shown as if they only take input from a file on a filesystem, which was misleading. * jc/usage-stdin: usage: do not insist that standard input must come from a file 03 November 2015, 23:32:38 UTC
14f905c Junio C Hamano 03 November 2015, 23:32:37 UTC Merge branch 'rt/placeholder-in-usage' into maint A couple of commands still showed "[options]" in their usage string to note where options should come on their command line, but we spell that "[<options>]" in most places these days. * rt/placeholder-in-usage: am, credential-cache: add angle brackets to usage string 03 November 2015, 23:32:37 UTC
ccb4739 Junio C Hamano 03 November 2015, 23:32:36 UTC Merge branch 'dt/t7063-fix-flaky-test' into maint * dt/t7063-fix-flaky-test: t7063: fix flaky untracked-cache test 03 November 2015, 23:32:36 UTC
1bf986b Junio C Hamano 03 November 2015, 23:32:34 UTC Merge branch 'mk/submodule-gitdir-path' into maint The submodule code has been taught to work better with separate work trees created via "git worktree add". * mk/submodule-gitdir-path: path: implement common_dir handling in git_pathdup_submodule() submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb() 03 November 2015, 23:32:35 UTC
c1324e6 Junio C Hamano 03 November 2015, 23:32:33 UTC Merge branch 'nd/gc-auto-background-fix' into maint When "git gc --auto" is backgrounded, its diagnosis message is lost. Save it to a file in $GIT_DIR and show it next time the "gc --auto" is run. * nd/gc-auto-background-fix: gc: save log from daemonized gc --auto and print it next time 03 November 2015, 23:32:33 UTC
c7bdbd6 Junio C Hamano 03 November 2015, 23:32:31 UTC Merge branch 'ls/p4-translation-failure' into maint Work around "git p4" failing when the P4 depot records the contents in UTF-16 without UTF-16 BOM. * ls/p4-translation-failure: git-p4: handle "Translation of file content failed" git-p4: add test case for "Translation of file content failed" error 03 November 2015, 23:32:32 UTC
c04b3a2 Junio C Hamano 03 November 2015, 23:32:30 UTC Merge branch 'gr/rebase-i-drop-warn' into maint Recent update to "rebase -i" that tries to sanity check the edited insn sheet before it uses it has become too picky on Windows where CRLF left by the editor is turned into a trailing CR on the line read via the "read" built-in command. * gr/rebase-i-drop-warn: rebase-i: work around Windows CRLF line endings t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings 03 November 2015, 23:32:30 UTC
f836a32 Junio C Hamano 03 November 2015, 23:32:28 UTC Merge branch 'js/clone-dissociate' into maint "git clone --dissociate" runs a big "git repack" process at the end, and it helps to close file descriptors that are open on the packs and their idx files before doing so on filesystems that cannot remove a file that is still open. * js/clone-dissociate: clone --dissociate: avoid locking pack files sha1_file.c: add a function to release all packs sha1_file: consolidate code to close a pack's file descriptor t5700: demonstrate a Windows file locking issue with `git clone --dissociate` 03 November 2015, 23:32:29 UTC
04bba3a Junio C Hamano 03 November 2015, 23:32:27 UTC Merge branch 'ld/p4-import-labels' into maint Correct "git p4 --detect-labels" so that it does not fail to create a tag that points at a commit that is also being imported. * ld/p4-import-labels: git-p4: fix P4 label import for unprocessed commits git-p4: do not terminate creating tag for unknown commit git-p4: failing test for ignoring invalid p4 labels 03 November 2015, 23:32:28 UTC
e23469f Junio C Hamano 03 November 2015, 23:32:26 UTC Merge branch 'tk/stripspace' into maint The internal stripspace() function has been moved to where it logically belongs to, i.e. strbuf API, and the command line parser of "git stripspace" has been updated to use the parse_options API. * tk/stripspace: stripspace: use parse-options for command-line parsing strbuf: make stripspace() part of strbuf 03 November 2015, 23:32:26 UTC
f89baca Junio C Hamano 03 November 2015, 23:32:25 UTC Merge branch 'jk/repository-extension' into maint Prepare for Git on-disk repository representation to undergo backward incompatible changes by introducing a new repository format version "1", with an extension mechanism. * jk/repository-extension: introduce "preciousObjects" repository extension introduce "extensions" form of core.repositoryformatversion 03 November 2015, 23:32:25 UTC
b1b49ff René Scharfe 24 October 2015, 12:23:20 UTC daemon: plug memory leak Call child_process_clear() when a child ends to release the memory allocated for its environment. This is necessary because unlike all other users of start_command() we don't call finish_command(), which would have taken care of that for us. This leak was introduced by f063d38b (daemon: use cld->env_array when re-spawning). Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 November 2015, 23:01:23 UTC
2d71608 René Scharfe 24 October 2015, 12:11:27 UTC run-command: factor out child_process_clear() Avoid duplication by moving the code to release allocated memory for arguments and environment to its own function, child_process_clear(). Export it to provide a counterpart to child_process_init(). Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 November 2015, 23:01:00 UTC
c72b49d René Scharfe 31 October 2015, 17:37:43 UTC wt-status: use skip_prefix() to get rid of magic string length constants Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 November 2015, 17:58:20 UTC
8d8325f René Scharfe 31 October 2015, 17:37:12 UTC wt-status: don't skip a magical number of characters blindly Use the variable branch_name, which already has "refs/heads/" removed, instead of blindly advancing in the ->branch string by 11 bytes. This is safer and less magical. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 November 2015, 17:58:20 UTC
baf0a3e René Scharfe 31 October 2015, 17:36:35 UTC wt-status: avoid building bogus branch name with detached HEAD If we're on a detached HEAD then wt_shortstatus_print_tracking() takes the string "HEAD (no branch)", translates it, skips the first eleven characters and passes the result to branch_get(), which returns a bogus result and accesses memory out of bounds in order to produce it. Somehow stat_tracking_info(), which is passed that result, does the right thing anyway, i.e. it finds that there is no base. Avoid the bogus results and memory accesses by checking for HEAD first and exiting early in that case. This fixes t7060 with --valgrind. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 November 2015, 17:58:20 UTC
bcf8cc2 René Scharfe 31 October 2015, 17:36:01 UTC wt-status: exit early using goto in wt_shortstatus_print_tracking() Deduplicate printing the line terminator by jumping to the end of the function. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 November 2015, 17:58:20 UTC
7ca8c18 René Scharfe 31 October 2015, 17:35:32 UTC t7060: add test for status --branch on a detached HEAD This test fails when run under Valgrind because branch_get() gets passed a bogus branch name pointer: ==62831== Invalid read of size 1 ==62831== at 0x4F76AE: branch_get (remote.c:1650) ==62831== by 0x53499E: wt_shortstatus_print_tracking (wt-status.c:1654) ==62831== by 0x53499E: wt_shortstatus_print (wt-status.c:1706) ==62831== by 0x428D29: cmd_status (commit.c:1384) ==62831== by 0x405D6D: run_builtin (git.c:350) ==62831== by 0x405D6D: handle_builtin (git.c:536) ==62831== by 0x404F10: run_argv (git.c:582) ==62831== by 0x404F10: main (git.c:690) ==62831== Address 0x5e89b0b is 6 bytes after a block of size 5 alloc'd ==62831== at 0x4C28C4F: malloc (vg_replace_malloc.c:299) ==62831== by 0x59579E9: strdup (strdup.c:42) ==62831== by 0x52E108: xstrdup (wrapper.c:43) ==62831== by 0x5322A6: wt_status_prepare (wt-status.c:130) ==62831== by 0x4276E0: status_init_config (commit.c:184) ==62831== by 0x428BB8: cmd_status (commit.c:1350) ==62831== by 0x405D6D: run_builtin (git.c:350) ==62831== by 0x405D6D: handle_builtin (git.c:536) ==62831== by 0x404F10: run_argv (git.c:582) ==62831== by 0x404F10: main (git.c:690) Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 November 2015, 17:58:20 UTC
cfe2d4b David Aguilar 29 October 2015, 18:19:01 UTC difftool: ignore symbolic links in use_wt_file The caller is preparing a narrowed-down copy of the working tree and this function is asked if the path should be included in that copy. If we say yes, the path from the working tree will be either symlinked or copied into the narrowed-down copy. For any path that is a symbolic link, the caller later fixes up the narrowed-down copy by unlinking the path and replacing it with a regular file it writes out that mimics the way how "git diff" compares symbolic links. Let's answer "no, you do not want to copy/symlink the working tree file" for all symbolic links from this function, as we know the result will not be used because it will be overwritten anyway. Incidentally, this also stops the function from feeding a symbolic link in the working tree to hash-object, which is a wrong thing to do to begin with. The link may be pointing at a directory, or worse may be dangling (both would be noticed as an error). Even if the link points at a regular file, hashing the contents of a file that is pointed at by the link is not correct (Git hashes the contents of the link itself, not the pointee). Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 October 2015, 20:43:10 UTC
e34f802 Jeff King 28 October 2015, 22:44:21 UTC merge-file: clamp exit code to maximum 127 Git-merge-file is documented to return one of three exit codes: - zero means the merge was successful - a negative number means an error occurred - a positive number indicates the number of conflicts Unfortunately, this all gets stuffed into an 8-bit return code. Which means that if you have 256 conflicts, this wraps to zero, and the merge appears to succeed (and commits a blob full of conflict-marker cruft!). This patch clamps the return value to a maximum of 127, which we should be able to safely represent everywhere. This also leaves 128-255 for other values. Shells (and some parts of git) will typically represent signal death as 128 plus the signal number. And negative values are typically coerced to an 8-bit unsigned value (so "return -1" ends up as 255). Technically negative returns have the same problem (e.g., "-256" wraps back to 0), but this is not a problem in practice, as the only negative value we use is "-1". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 October 2015, 19:10:23 UTC
39743cf Junio C Hamano 28 October 2015, 14:54:48 UTC rebase-i: work around Windows CRLF line endings Editors on Windows can and do save text files with CRLF line endings, which is the convention on the platform. We are seeing reports that the "read" command in a port of bash to the environment however does not strip the CRLF at the end, not adjusting for the same convention on the platform. This breaks the recently added sanity checks for the insn sheet fed to "rebase -i"; instead of an empty line (hence nothing in $command), the script was getting a lone CR in there. Special case a lone CR and treat it the same way as an empty line to work this around. This patch (also) passes the test with Git for Windows, where the issue was seen first. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 October 2015, 17:06:46 UTC
1db25aa Johannes Schindelin 28 October 2015, 14:54:21 UTC t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings Based on a bug report by Chad Boles. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 October 2015, 17:01:59 UTC
9a6e4f0 Jeff King 28 October 2015, 14:07:25 UTC add_submodule_odb: initialize alt_odb list earlier The add_submodule_odb function tries to add a submodule's object store as an "alternate". It needs the existing list to be initialized (from the objects/info/alternates file) for two reasons: 1. We look for duplicates with the existing alternate stores, but obviously this doesn't work if we haven't loaded any yet. 2. We link our new entry into the list by prepending it to alt_odb_list. But we do _not_ modify alt_odb_tail. This variable starts as NULL, and is a signal to the alt_odb code that the list has not yet been initialized. We then call read_info_alternates on the submodule (to recursively load its alternates), which will try to append to that tail, assuming it has been initialized. This causes us to segfault if it is NULL. This rarely comes up in practice, because we will have initialized the alt_odb any time we do an object lookup. So you can trigger this only when: - you try to access a submodule (e.g., a diff with diff.submodule=log) - the access happens before any other object has been accessed (e.g., because the diff is between the working tree and the index) - the submodule contains an alternates file (so we try to add an entry to the NULL alt_odb_tail) To fix this, we just need to call prepare_alt_odb at the start of the function (and if we have already initialized, it is a noop). Note that we can remove the prepare_alt_odb call from the end. It is guaranteed to be a noop, since we will have called it earlier. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 October 2015, 15:26:15 UTC
72fac66 Jeff King 26 October 2015, 21:39:39 UTC merge: detect delete/modechange conflict If one side deletes a file and the other changes its content, we notice and report a conflict. However, if instead of changing the content, we change only the mode, the merge does not notice (and the mode change is silently dropped). The trivial index merge notices the problem and correctly leaves the conflict in the index, but both merge-recursive and merge-one-file will silently resolve this in favor of the deletion. In many cases that is a sane resolution, but we should be punting to the user whenever there is any question. So let's detect and treat this as a conflict (in both strategies). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 October 2015, 21:49:31 UTC
f78d1fe Jeff King 26 October 2015, 21:37:18 UTC t6031: generalize for recursive and resolve strategies This script tests the filemode handling of merge-recursive, but we do not test the same thing for merge-resolve. Let's generalize the script a little: 1. Break out the setup steps for each test into a separate snippet. 2. For each test, run it twice; once with "-s recursive" and once with "-s resolve". We can avoid repeating ourselves by adding a function. 3. Since we have a nice abstracted function, we can make our tests more thorough by testing both directions (change on "ours" versus "theirs"). This improves our test coverage, and will make this the place to add more tests related to merging mode changes. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 October 2015, 21:48:56 UTC
6f50833 Jeff King 26 October 2015, 21:36:18 UTC t6031: move triple-rename test to t3030 The t6031 test was introduced to check filemode handling of merge-recursive. Much later, an unrelated test was tacked on to look at renames and d/f conflicts. This test does not depend on anything that happened before (it actually blows away any existing content in the test repo). Let's move it to t3030, where there are more related tests. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 October 2015, 21:48:54 UTC
fdcdb77 Waldek Maleska 26 October 2015, 13:15:33 UTC Correct fscanf formatting string for I64u values This fix is probably purely cosmetic because PRIuMAX is likely identical to SCNuMAX. Nevertheless, when using a function of the scanf() family, the correct interpolation to use is the latter, not the former. Signed-off-by: Waldek Maleska <w.maleska@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 October 2015, 20:24:03 UTC
56a1a3a Johannes Schindelin 26 October 2015, 13:15:25 UTC Silence GCC's "cast of pointer to integer of a different size" warning When calculating hashes from pointers, it actually makes sense to cut off the most significant bits. In that case, said warning does not make a whole lot of sense. So let's just work around it by casting the pointer first to intptr_t and then casting up/down to the final integral type. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 October 2015, 20:24:03 UTC
8f77442 Johannes Schindelin 26 October 2015, 13:15:21 UTC Squelch warning about an integer overflow We cannot rely on long integers to have more than 32 bits. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 October 2015, 20:23:59 UTC
71d9257 Johannes Schindelin 26 October 2015, 13:14:58 UTC imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available This fixes the compilation on an older Linux that was used to debug test failures when upgrading Git for Windows to Git v2.3.0. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 October 2015, 20:10:30 UTC
9526197 Max Kirillov 26 October 2015, 05:29:00 UTC blame: fix option name in error message The option name used in blame's UI is `--reverse`. Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 October 2015, 20:08:21 UTC
b2af482 Xue Fuqiao 25 October 2015, 00:28:43 UTC user-manual: fix the description of fast-forward The "Fast-forward merges" section of user-manual.txt incorrectly says if the current branch is a descendant of the other, Git will perform a fast-forward merge, but it should the other way around. Signed-off-by: Xue Fuqiao <xfq.free@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 October 2015, 20:03:44 UTC
29abb33 Junio C Hamano 25 October 2015, 02:31:11 UTC add: simplify -u/-A without pathspec Since Git 2.0, "add -u" and "add -A" run from a subdirectory without any pathspec mean "everything in the working tree" (before 2.0, they were limited to the current directory). The limiting to the current directory was implemented by inserting "." to the command line when the end user did not give us any pathspec. At 2.0, we updated the code to insert ":/" (instead of '.') to consider everything from the top-level, by using a pathspec magic "top". The call to parse_pathspec() using the command line arguments is, however, made with PATHSPEC_PREFER_FULL option since 5a76aff1 (add: convert to use parse_pathspec, 2013-07-14), which predates Git 2.0. In retrospect, there was no need to turn "adding . to limit to the directory" into "adding :/ to unlimit to everywhere" in Git 2.0; instead we could just have done "if there is no pathspec on the command line, just let it be". The parse_pathspec() then would give us a pathspec that matches everything and all is well. Incidentally such a simplification also fixes a corner case bug that stems from the fact that ":/" does not necessarily mean any magic. A user would say "git --literal-pathspecs add -u :/" from the command line when she has a directory ':' and wants to add everything in it (and she knows that her :/ will be taken as 'everything under the sun' magic pathspec unless she disables the magic with --literal-pathspecs). The internal use of ':/' would behave the same way as such an explicitly given ":/" when run with "--literal-pathspecs", and will not add everything under the sun as the code originally intended. Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 October 2015, 02:32:47 UTC
3b19dba Junio C Hamano 22 October 2015, 20:02:33 UTC Documentation: AsciiDoc spells em-dash as double-dashes, not triple Again, we do not usually process release notes with AsciiDoc, but it is better to be consistent. This incidentally reveals breakages left by an ancient 5e00439f (Documentation: build html for all files in technical and howto, 2012-10-23). The index-format documentation was originally written to be read as straight text without formatting and when the commit forced everything in Documentation/ to go through AsciiDoc, it did not do any adjustment--hence the double-dashes will be seen in the resulting text that is rendered as preformatted fixed-width without converted into em-dashes. Signed-off-by: Junio C Hamano <gitster@pobox.com> 22 October 2015, 20:02:33 UTC
back to top