| f69f5f1 | Junio C Hamano | 06 March 2015, 22:57:58 UTC | Merge branch 'rj/no-xopen-source-for-cygwin' into maint Code cleanups. * rj/no-xopen-source-for-cygwin: git-compat-util.h: remove redundant code | 06 March 2015, 22:57:58 UTC |
| f56a5f4 | Junio C Hamano | 06 March 2015, 22:57:57 UTC | Merge branch 'rs/simple-cleanups' into maint Code cleanups. * rs/simple-cleanups: sha1_name: use strlcpy() to copy strings pretty: use starts_with() to check for a prefix for-each-ref: use skip_prefix() to avoid duplicate string comparison connect: use strcmp() for string comparison | 06 March 2015, 22:57:57 UTC |
| d86679f | Junio C Hamano | 06 March 2015, 22:57:56 UTC | Merge branch 'mm/am-c-doc' into maint The configuration variable 'mailinfo.scissors' was hard to discover in the documentation. * mm/am-c-doc: Documentation/git-am.txt: mention mailinfo.scissors config variable Documentation/config.txt: document mailinfo.scissors | 06 March 2015, 22:57:56 UTC |
| 2e7ca27 | Junio C Hamano | 06 March 2015, 22:57:55 UTC | Merge branch 'ew/svn-maint-fixes' into maint Correct a breakage to git-svn around v2.2 era that triggers premature closing of FileHandle. * ew/svn-maint-fixes: Git::SVN::*: avoid premature FileHandle closure git-svn: fix localtime=true on non-glibc environments | 06 March 2015, 22:57:55 UTC |
| e1db59e | Junio C Hamano | 06 March 2015, 22:57:54 UTC | Merge branch 'km/send-email-getopt-long-workarounds' into maint Even though we officially haven't dropped Perl 5.8 support, the Getopt::Long package that came with it does not support "--no-" prefix to negate a boolean option; manually add support to help people with older Getopt::Long package. * km/send-email-getopt-long-workarounds: git-send-email.perl: support no- prefix with older GetOptions | 06 March 2015, 22:57:54 UTC |
| 3ebda3e | Junio C Hamano | 05 March 2015, 21:15:53 UTC | Prepare for 2.3.2 | 05 March 2015, 21:15:53 UTC |
| 1e299f5 | Junio C Hamano | 05 March 2015, 21:13:13 UTC | Merge branch 'sb/plug-leak-in-make-cache-entry' into maint "update-index --refresh" used to leak when an entry cannot be refreshed for whatever reason. * sb/plug-leak-in-make-cache-entry: read-cache.c: free cache entry when refreshing fails | 05 March 2015, 21:13:14 UTC |
| 4e0d620 | Junio C Hamano | 05 March 2015, 21:13:12 UTC | Merge branch 'jk/fast-import-die-nicely-fix' into maint "git fast-import" used to crash when it could not close and conclude the resulting packfile cleanly. * jk/fast-import-die-nicely-fix: fast-import: avoid running end_packfile recursively | 05 March 2015, 21:13:13 UTC |
| 007f7f6 | Junio C Hamano | 05 March 2015, 21:13:12 UTC | Merge branch 'es/blame-commit-info-fix' into maint "git blame" died, trying to free an uninitialized piece of memory. * es/blame-commit-info-fix: builtin/blame: destroy initialized commit_info only | 05 March 2015, 21:13:12 UTC |
| 3336757 | Junio C Hamano | 05 March 2015, 21:13:10 UTC | Merge branch 'ab/merge-file-prefix' into maint "git merge-file" did not work correctly in a subdirectory. * ab/merge-file-prefix: merge-file: correctly open files when in a subdir | 05 March 2015, 21:13:11 UTC |
| 3630be2 | Junio C Hamano | 05 March 2015, 21:13:09 UTC | Merge branch 'ps/submodule-sanitize-path-upon-add' into maint "git submodule add" failed to squash "path/to/././submodule" to "path/to/submodule". * ps/submodule-sanitize-path-upon-add: git-submodule.sh: fix '/././' path normalization | 05 March 2015, 21:13:10 UTC |
| cbc8d6d | Junio C Hamano | 05 March 2015, 21:13:08 UTC | Merge branch 'jk/prune-mtime' into maint In v2.2.0, we broke "git prune" that runs in a repository that borrows from an alternate object store. * jk/prune-mtime: sha1_file: fix iterating loose alternate objects for_each_loose_file_in_objdir: take an optional strbuf path | 05 March 2015, 21:13:08 UTC |
| f5a191d | Junio C Hamano | 05 March 2015, 21:13:07 UTC | Merge branch 'tc/curl-vernum-output-broken-in-7.11' into maint Certain older vintages of cURL give irregular output from "curl-config --vernum", which confused our build system. * tc/curl-vernum-output-broken-in-7.11: Makefile: handle broken curl version number in version check | 05 March 2015, 21:13:07 UTC |
| e591339 | Junio C Hamano | 05 March 2015, 21:13:06 UTC | Merge branch 'es/squelch-openssl-warnings-on-macosx' into maint An earlier workaround to squelch unhelpful deprecation warnings from the complier on Mac OSX unnecessarily set minimum required version of the OS, which the user might want to raise (or lower) for other reasons. * es/squelch-openssl-warnings-on-macosx: git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED | 05 March 2015, 21:13:07 UTC |
| c11c154 | Junio C Hamano | 05 March 2015, 21:13:05 UTC | Merge branch 'jc/conf-var-doc' into maint Longstanding configuration variable naming rules has been added to the documentation. * jc/conf-var-doc: CodingGuidelines: describe naming rules for configuration variables config.txt: mark deprecated variables more prominently config.txt: clarify that add.ignore-errors is deprecated | 05 March 2015, 21:13:05 UTC |
| 518d1c3 | Junio C Hamano | 05 March 2015, 21:13:04 UTC | Merge branch 'av/wincred-with-at-in-username-fix' into maint The credential helper for Windows (in contrib/) used to mishandle a user name with an at-sign in it. * av/wincred-with-at-in-username-fix: wincred: fix get credential if username has "@" | 05 March 2015, 21:13:04 UTC |
| ab09f58 | Junio C Hamano | 05 March 2015, 21:13:03 UTC | Merge branch 'ch/new-gpg-drops-rfc-1991' into maint Older GnuPG implementations may not correctly import the keyring material we prepare for the tests to use. * ch/new-gpg-drops-rfc-1991: t/lib-gpg: sanity-check that we can actually sign t/lib-gpg: include separate public keys in keyring.gpg | 05 March 2015, 21:13:04 UTC |
| 069dea8 | Junio C Hamano | 05 March 2015, 21:13:03 UTC | Merge branch 'jc/remote-set-url-doc' into maint Clarify in the documentation that "remote.<nick>.pushURL" and "remote.<nick>.URL" are there to name the same repository accessed via different transports, not two separate repositories. * jc/remote-set-url-doc: Documentation/git-remote.txt: stress that set-url is not for triangular | 05 March 2015, 21:13:03 UTC |
| abfed73 | Junio C Hamano | 05 March 2015, 21:13:02 UTC | Merge branch 'jk/pack-bitmap' into maint The pack bitmap support did not build with older versions of GCC. * jk/pack-bitmap: ewah: fix building with gcc < 3.4.0 | 05 March 2015, 21:13:02 UTC |
| 2250406 | Junio C Hamano | 05 March 2015, 21:13:00 UTC | Merge branch 'jk/config-no-ungetc-eof' into maint Reading configuration from a blob object, when it ends with a lone CR, use to confuse the configuration parser. * jk/config-no-ungetc-eof: config_buf_ungetc: warn when pushing back a random character config: do not ungetc EOF | 05 March 2015, 21:13:00 UTC |
| 3bef3c1 | Junio C Hamano | 05 March 2015, 21:12:59 UTC | Merge branch 'jk/decimal-width-for-uintmax' into maint We didn't format an integer that wouldn't fit in "int" but in "uintmax_t" correctly. * jk/decimal-width-for-uintmax: decimal_width: avoid integer overflow | 05 March 2015, 21:12:59 UTC |
| b1cffbf | Junio C Hamano | 05 March 2015, 21:12:58 UTC | Merge branch 'jc/push-cert' into maint "git push --signed" gave an incorrectly worded error message when the other side did not support the capability. * jc/push-cert: transport-helper: fix typo in error message when --signed is not supported | 05 March 2015, 21:12:58 UTC |
| 6db0497 | Junio C Hamano | 05 March 2015, 21:12:57 UTC | Merge branch 'mh/deref-symref-over-helper-transport' into maint "git fetch" over a remote-helper that cannot respond to "list" command could not fetch from a symbolic reference e.g. HEAD. * mh/deref-symref-over-helper-transport: transport-helper: do not request symbolic refs to remote helpers | 05 March 2015, 21:12:57 UTC |
| aaa90f5 | Junio C Hamano | 05 March 2015, 21:12:56 UTC | Merge branch 'ks/rebase-i-abbrev' into maint The insn sheet "git rebase -i" creates did not fully honor core.abbrev settings. * ks/rebase-i-abbrev: rebase -i: use full object name internally throughout the script | 05 March 2015, 21:12:56 UTC |
| be2804c | Junio C Hamano | 05 March 2015, 21:12:55 UTC | Merge branch 'dp/remove-duplicated-header-inclusion' into maint Code clean-up. * dp/remove-duplicated-header-inclusion: do not include the same header twice | 05 March 2015, 21:12:55 UTC |
| 552f699 | Junio C Hamano | 05 March 2015, 21:12:54 UTC | Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maint Code clean-up. * sb/hex-object-name-is-at-most-41-bytes-long: hex.c: reduce memory footprint of sha1_to_hex static buffers | 05 March 2015, 21:12:55 UTC |
| a628d50 | Junio C Hamano | 05 March 2015, 21:12:53 UTC | Merge branch 'ak/git-pm-typofix' into maint Typofix in comments. * ak/git-pm-typofix: Git.pm: two minor typo fixes | 05 March 2015, 21:12:53 UTC |
| 8fd37b3 | Junio C Hamano | 05 March 2015, 21:12:52 UTC | Merge branch 'jk/sanity' into maint The tests that wanted to see that file becomes unreadable after running "chmod a-r file", and the tests that wanted to make sure it is not run as root, we used "can we write into the / directory?" as a cheap substitute, but on some platforms that is not a good heuristics. The tests and their prerequisites have been updated to check what they really require. * jk/sanity: test-lib.sh: set prerequisite SANITY by testing what we really need tests: correct misuses of POSIXPERM t/lib-httpd: switch SANITY check for NOT_ROOT | 05 March 2015, 21:12:52 UTC |
| e426311 | Kyle J. McKay | 26 February 2015, 13:49:34 UTC | Git::SVN::*: avoid premature FileHandle closure Since b19138b (git-svn: Make it incrementally faster by minimizing temp files, v1.6.0), git-svn has been using the Git.pm temp_acquire and temp_release mechanism to avoid unnecessary temp file churn and provide a speed boost. However, that change introduced a call to temp_acquire inside the Git::SVN::Fetcher::close_file function for an 'svn_hash' temp file. Because an SVN::Pool is active at the time this function is called, if the Git::temp_acquire function ends up actually creating a new FileHandle for the temp file (which it will the first time it's called with the name 'svn_hash') that FileHandle will end up in the SVN::Pool and should that pool have SVN::Pool::clear called on it that FileHandle will be closed out from under Git::temp_acquire. Since the only call site to Git::temp_acquire with the name 'svn_hash' is inside the close_file function, if an 'svn_hash' temp file is ever created its FileHandle is guaranteed to be created in the active SVN::Pool. This has not been a problem in the past because the SVN::Pool was not being cleared. However, since dfa72fdb (git-svn: reload RA every log-window-size, v2.2.0) the pool has been getting cleared periodically at which point the FileHandle for the 'svn_hash' temp file gets closed. Any subsequent calls to Git::temp_acquire for 'svn_hash', however, succeed without creating/opening a new temporary file since it still has the now invalid FileHandle in its cache. Callers that then attempt to use that FileHandle fail with an error. We avoid this problem by making sure the 'svn_hash' temp file is created in the same place the 'svn_delta_...' and 'git_blob_...' temp files are (and then temp_release'd) so that it can be safely used inside the close_file function without having its FileHandle end up in an SVN::Pool that gets cleared. Additionally the Git.pm cat_blob function creates a bidirectional pipe FileHandle using the IPC::Open2::open2 function. If that handle is created too late, it also gets caught up in the SVN::Pool and incorrectly closed by the SVN::Pool::clear call. But this only seems to happen with more recent versions of Perl and svn. To avoid this problem we add an explicit call to _open_cat_blob_if_needed before the first call to SVN::Pool->new_default to make sure the open2 handle does not end up in the SVN::Pool. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 February 2015, 22:02:34 UTC |
| 45c956b | Ryuichi Kokubo | 25 February 2015, 16:04:41 UTC | git-svn: fix localtime=true on non-glibc environments git svn uses POSIX::strftime('%s', $sec, $min, ...) to make unix epoch time. But lowercase %s formatting character is a GNU extention. This causes problem in git svn fetch --localtime on non-glibc systems, such as msys or cygwin. Using Time::Local::timelocal($sec, $min, ...) fixes it. Signed-off-by: Ryuichi Kokubo <ryu1kkb@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Notes: lowercase %s format character in strftime is a GNU extension and not widely supported. POSIX::strftime affected by underlying crt's strftime because POSIX::strftime just calls crt's one. Time::Local is good function to replace POSIX::strftime because it's a perl core module function. Document about Time::Local. http://perldoc.perl.org/Time/Local.html These are specifications of strftime. The GNU C Library Reference Manual. http://www.gnu.org/software/libc/manual/html_node/Formatting-Calendar-Time.html perl POSIX module's strftime document. It does not have '%s'. http://perldoc.perl.org/POSIX.html strftime document of Microsort Windows C Run-Time library. https://msdn.microsoft.com/en-us/library/fe06s4ak.aspx The Open Group's old specification does not have '%s' too. http://pubs.opengroup.org/onlinepubs/007908799/xsh/strftime.html On my environment, following problems happened. - msys : git svn fetch does not progress at all with perl.exe consuming CPU. - cygwin : git svn fetch progresses but time stamp information is dropped. Every commits have unix epoch timestamp. I would like to thank git developer and contibutors. git helps me so much everyday. Thank you. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 February 2015, 22:02:34 UTC |
| 8004647 | Junio C Hamano | 25 February 2015, 06:14:42 UTC | Git 2.3.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2015, 06:14:42 UTC |
| 7bc4c01 | Junio C Hamano | 25 February 2015, 06:10:42 UTC | Merge branch 'ak/add-i-empty-candidates' into maint The interactive "show a list and let the user choose from it" interface "add -i" used showed and prompted to the user even when the candidate list was empty, against which the only "choice" the user could have made was to choose nothing. * ak/add-i-empty-candidates: add -i: return from list_and_choose if there is no candidate | 25 February 2015, 06:10:42 UTC |
| 2764442 | Junio C Hamano | 25 February 2015, 06:10:41 UTC | Merge branch 'jc/apply-ws-fix-expands' into maint "git apply --whitespace=fix" used to under-allocate the memory when the fix resulted in a longer text than the original patch. * jc/apply-ws-fix-expands: apply: count the size of postimage correctly apply: make update_pre_post_images() sanity check the given postlen apply.c: typofix | 25 February 2015, 06:10:41 UTC |
| 254a3eb | Junio C Hamano | 25 February 2015, 06:10:39 UTC | Merge branch 'jc/doc-log-rev-list-options' into maint "git log --help" used to show rev-list options that are irrelevant to the "log" command. * jc/doc-log-rev-list-options: Documentation: what does "git log --indexed-objects" even mean? | 25 February 2015, 06:10:40 UTC |
| 7070c03 | Junio C Hamano | 25 February 2015, 06:10:38 UTC | Merge branch 'mg/commit-author-no-match-malformed-message' into maint The error message from "git commit", when a non-existing author name was given as value to the "--author=" parameter, has been reworded to avoid misunderstanding. * mg/commit-author-no-match-malformed-message: commit: reword --author error message | 25 February 2015, 06:10:38 UTC |
| 117c1b3 | Junio C Hamano | 25 February 2015, 06:10:37 UTC | Merge branch 'jk/dumb-http-idx-fetch-fix' into maint A broken pack .idx file in the receiving repository prevented the dumb http transport from fetching a good copy of it from the other side. * jk/dumb-http-idx-fetch-fix: dumb-http: do not pass NULL path to parse_pack_index | 25 February 2015, 06:10:37 UTC |
| 9f8410b | Junio C Hamano | 25 February 2015, 06:10:36 UTC | Merge branch 'jc/diff-format-doc' into maint The documentation incorrectly said that C(opy) and R(ename) are the only ones that can be followed by the score number in the output in the --raw format. * jc/diff-format-doc: diff-format doc: a score can follow M for rewrite | 25 February 2015, 06:10:36 UTC |
| b9efce1 | Junio C Hamano | 25 February 2015, 06:10:35 UTC | Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maint Fix a misspelled conditional that is always true. * jk/remote-curl-an-array-in-struct-cannot-be-null: do not check truth value of flex arrays | 25 February 2015, 06:10:35 UTC |
| 93baadb | Junio C Hamano | 25 February 2015, 06:10:21 UTC | Merge branch 'jk/status-read-branch-name-fix' into maint Code to read branch name from various files in .git/ directory would have misbehaved if the code to write them left an empty file. * jk/status-read-branch-name-fix: read_and_strip_branch: fix typo'd address-of operator | 25 February 2015, 06:10:22 UTC |
| 2fc85f0 | Junio C Hamano | 25 February 2015, 06:10:19 UTC | Merge branch 'mg/push-repo-option-doc' into maint The "git push" documentation made the "--repo=<there>" option easily misunderstood. * mg/push-repo-option-doc: git-push.txt: document the behavior of --repo | 25 February 2015, 06:10:19 UTC |
| 8f3d03d | Junio C Hamano | 25 February 2015, 06:10:17 UTC | Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maint After attempting and failing a password-less authentication (e.g. kerberos), libcURL refuses to fall back to password based Basic authentication without a bit of help/encouragement. * bc/http-fallback-to-password-after-krb-fails: remote-curl: fall back to Basic auth if Negotiate fails | 25 February 2015, 06:10:17 UTC |
| 6606129 | Junio C Hamano | 25 February 2015, 06:10:15 UTC | Merge branch 'dk/format-patch-ignore-diff-submodule' into maint Setting diff.submodule to 'log' made "git format-patch" produce broken patches. * dk/format-patch-ignore-diff-submodule: format-patch: ignore diff.submodule setting t4255: test am submodule with diff.submodule | 25 February 2015, 06:10:15 UTC |
| 74419c2 | Junio C Hamano | 25 February 2015, 06:10:13 UTC | Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint "git rerere" (invoked internally from many mergy operations) did not correctly signal errors when told to update the working tree files and failed to do so for whatever reason. * jn/rerere-fail-on-auto-update-failure: rerere: error out on autoupdate failure | 25 February 2015, 06:10:13 UTC |
| faf723a | Junio C Hamano | 25 February 2015, 06:09:54 UTC | Merge branch 'jk/blame-commit-label' into maint "git blame HEAD -- missing" failed to correctly say "HEAD" when it tried to say "No such path 'missing' in HEAD". * jk/blame-commit-label: blame.c: fix garbled error message use xstrdup_or_null to replace ternary conditionals builtin/commit.c: use xstrdup_or_null instead of envdup builtin/apply.c: use xstrdup_or_null instead of null_strdup git-compat-util: add xstrdup_or_null helper | 25 February 2015, 06:09:54 UTC |
| 33baa69 | Ramsay Jones | 23 February 2015, 00:07:14 UTC | git-compat-util.h: remove redundant code Since commit 3a0a3a89 ("git-compat-util.h: don't define _XOPEN_SOURCE on cygwin", 23-11-2014) removed the definition of _XOPEN_SOURCE on cygwin, the code within a pre-processor conditional further down the file became redundant. Remove the redundant code. This effectively reverts commit 41b20017 ("Fix an "implicit function definition" warning", 03-03-2007). Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2015, 02:56:23 UTC |
| 2ce63e9 | René Scharfe | 21 February 2015, 19:55:22 UTC | sha1_name: use strlcpy() to copy strings Use strlcpy() instead of calling strncpy() and then setting the last byte of the target buffer to NUL explicitly. This shortens and simplifies the code a bit. Signed-of-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2015, 20:01:38 UTC |
| 68d6d6e | René Scharfe | 21 February 2015, 19:53:09 UTC | pretty: use starts_with() to check for a prefix Simplify the code and avoid duplication by using starts_with() instead of strlen() and strncmp() to check if a line starts with "encoding ". Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2015, 20:01:37 UTC |
| 008d5d0 | René Scharfe | 21 February 2015, 19:51:28 UTC | for-each-ref: use skip_prefix() to avoid duplicate string comparison Use skip_prefix() to get the part after "color:" (if present) and only compare it with "reset" instead of comparing the whole string again. This gets rid of the duplicate "color:" part of the string constant. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2015, 20:01:37 UTC |
| 2ae7f90 | René Scharfe | 21 February 2015, 19:49:58 UTC | connect: use strcmp() for string comparison Get rid of magic string length constants and simply compare the strings using strcmp(). This makes the intent of the code a bit clearer. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2015, 20:01:37 UTC |
| afb5de7 | Matthieu Moy | 20 February 2015, 19:32:21 UTC | Documentation/git-am.txt: mention mailinfo.scissors config variable It was already documented, but the user had to follow the link to git-mailinfo.txt to find it. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2015, 23:09:23 UTC |
| d5c4b18 | Matthieu Moy | 20 February 2015, 19:32:20 UTC | Documentation/config.txt: document mailinfo.scissors The variable was documented in git-mailinfo.txt, but not in config.txt. The detailed documentation is still the one of --scissors in git-mailinfo.txt, but we give enough information here to let the user understand what it is about, and to make it easy to find it (e.g. searching ">8" and "8<" finds it). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2015, 23:07:19 UTC |
| ef2956a | Alexander Kuleshov | 18 February 2015, 17:32:20 UTC | Git.pm: two minor typo fixes Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2015, 20:29:00 UTC |
| bc1c2ca | Stefan Beller | 17 February 2015, 18:06:14 UTC | read-cache.c: free cache entry when refreshing fails This fixes a memory leak when building the cache entries as refresh_cache_entry may decide to return NULL, but it does not free the cache entry structure which was passed in as an argument. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2015, 18:42:43 UTC |
| f471494 | Kyle J. McKay | 31 January 2015, 02:40:17 UTC | git-send-email.perl: support no- prefix with older GetOptions Only Perl version 5.8.0 or later is required, but that comes with an older Getopt::Long (2.32) that does not support the 'no-' prefix. Support for that was added in Getopt::Long version 2.33. Since the help only mentions the 'no-' prefix and not the 'no' prefix, add explicit support for the 'no-' prefix to support older GetOptions versions. Reported-by: Tom G. Christensen <tgc@statsbiblioteket.dk> Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Tested-by: Tom G. Christensen <tgc@statsbiblioteket.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2015, 21:26:51 UTC |
| f400e51 | Torsten Bögershausen | 27 January 2015, 15:39:01 UTC | test-lib.sh: set prerequisite SANITY by testing what we really need What we wanted out of the SANITY precondition is that the filesystem behaves sensibly with permission bits settings. - You should not be able to remove a file in a read-only directory, - You should not be able to tell if a file in a directory exists if the directory lacks read or execute permission bits. We used to cheat by approximating that condition with "is the / writable?" test and/or "are we running as root?" test. Neither test is sufficient or appropriate in environments like Cygwin. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2015, 23:48:38 UTC |
| 0b868f0 | Stefan Beller | 13 February 2015, 21:18:49 UTC | hex.c: reduce memory footprint of sha1_to_hex static buffers 41 bytes is the exact number of bytes needed for having the returned hex string represented. 50 seems to be an arbitrary number, such that there are no benefits from alignment to certain address boundaries. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2015, 21:42:17 UTC |
| 5d30851 | Дилян Палаузов | 13 February 2015, 14:47:39 UTC | do not include the same header twice A few files include the same header file directly more than once. As all these headers protect themselves against repeated inclusion by the "#ifndef FOO_H / #define FOO_H / ... / #endif" idiom, leave only the first inclusion and remove the later inclusion as a no-op clean-up. Signed-off-by: Дилян Палаузов <git-dpa@aegee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2015, 21:16:12 UTC |
| 45917f0 | Mike Hommey | 12 February 2015, 10:10:01 UTC | transport-helper: fix typo in error message when --signed is not supported Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2015, 20:31:28 UTC |
| 204a8ff | Aleksander Boruch-Gruszecki | 08 February 2015, 16:53:53 UTC | merge-file: correctly open files when in a subdir run_setup_gently() is called before merge-file. This may result in changing current working directory, which wasn't taken into account when opening a file for writing. Fix by prepending the passed prefix. Previous var is left so that error messages keep referring to the file from the user's working directory perspective. Signed-off-by: Aleksander Boruch-Gruszecki <aleksander.boruchgruszecki@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2015, 19:01:50 UTC |
| 5e915f3 | Jeff King | 10 February 2015, 01:07:19 UTC | fast-import: avoid running end_packfile recursively When an import has finished, we run end_packfile() to finalize the data and move the packfile into place. If this process fails, we call die() and end up in our die_nicely() handler. Which unfortunately includes running end_packfile to save any progress we made. We enter the function again, and start operating on the pack_data struct while it is in an inconsistent state, leading to a segfault. One way to trigger this is to simply start two identical fast-imports at the same time. They will both create the same packfiles, which will then try to create identically named ".keep" files. One will win the race, and the other will die(), and end up with the segfault. Since 3c078b9, we already reset the pack_data pointer to NULL at the end of end_packfile. That covers the case of us calling die() right after end_packfile, before we have reinitialized the pack_data pointer. This new problem is quite similar, except that we are worried about calling die() _during_ end_packfile, not right after. Ideally we would simply set pack_data to NULL as soon as we enter the function, and operate on a copy of the pointer. Unfortunately, it is not so easy. pack_data is a global, and end_packfile calls into other functions which operate on the global directly. We would have to teach each of these to take an argument, and there is no guarantee that we would catch all of the spots. Instead, we can simply use a static flag to avoid recursively entering the function. This is a little less elegant, but it's short and fool-proof. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2015, 18:35:32 UTC |
| e600592 | Eric Sunshine | 09 February 2015, 21:28:07 UTC | builtin/blame: destroy initialized commit_info only Since ea02ffa3 (mailmap: simplify map_user() interface, 2013-01-05), find_alignment() has been invoking commit_info_destroy() on an uninitialized auto 'struct commit_info' (when METAINFO_SHOWN is not set). commit_info_destroy() calls strbuf_release() for each 'commit_info' strbuf member, which randomly invokes free() on whatever random stack value happens to reside in strbuf.buf, thus leading to periodic crashes. Reported-by: Dilyan Palauzov <dilyan.palauzov@aegee.org> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2015, 18:31:48 UTC |
| b0a4264 | Jonathon Mah | 09 February 2015, 01:15:39 UTC | sha1_file: fix iterating loose alternate objects The string in 'base' contains a path suffix to a specific object; when its value is used, the suffix must either be filled (as in stat_sha1_file, open_sha1_file, check_and_freshen_nonlocal) or cleared (as in prepare_packed_git) to avoid junk at the end. 660c889e (sha1_file: add for_each iterators for loose and packed objects, 2014-10-15) introduced loose_from_alt_odb(), but this did neither and treated 'base' as a complete path to the "base" object directory, instead of a pointer to the "base" of the full path string. The trailing path after 'base' is still initialized to NUL, hiding the bug in some common cases. Additionally the descendent for_each_file_in_obj_subdir() function swallows ENOENT, so an error only shows if the alternate's path was last filled with a valid object (where statting /path/to/existing/00/0bjectfile/00 fails). Signed-off-by: Jonathon Mah <me@JonathonMah.com> Helped-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2015, 22:14:56 UTC |
| e6f875e | Jeff King | 09 February 2015, 01:13:22 UTC | for_each_loose_file_in_objdir: take an optional strbuf path We feed a root "objdir" path to this iterator function, which then copies the result into a strbuf, so that it can repeatedly append the object sub-directories to it. Let's make it easy for callers to just pass us a strbuf in the first place. We leave the original interface as a convenience for callers who want to just pass a const string like the result of get_object_directory(). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2015, 22:14:53 UTC |
| 88c03eb | Kyle J. McKay | 06 February 2015, 09:35:31 UTC | git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_MIN_REQUIRED may be defined by the builder to a specific version in order to produce compatible binaries for a particular system. Blindly defining it to MAC_OS_X_VERSION_10_6 is bad. Additionally MAC_OS_X_VERSION_10_6 will not be defined on older systems and should AvailabilityMacros.h be included on such as system an error will result. However, using the explicit value of 1060 (which is what MAC_OS_X_VERSION_10_6 is defined to) does not solve the problem. The changes that introduced stepping on MAC_OS_X_VERSION_MIN were made in b195aa00 (git-compat-util: suppress unavoidable Apple-specific deprecation warnings) to avoid deprecation warnings. Instead of blindly setting MAC_OS_X_VERSION_MIN to 1060 change the definition of DEPRECATED_ATTRIBUTE to empty to avoid the warnings. This preserves any MAC_OS_X_VERSION_MIN_REQUIRED setting while avoiding the warnings as intended by b195aa00. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2015, 22:09:21 UTC |
| 9874fca | Junio C Hamano | 05 February 2015, 21:23:56 UTC | Git 2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2015, 21:23:56 UTC |
| 1d0655c | Jeff King | 05 February 2015, 21:00:24 UTC | config_buf_ungetc: warn when pushing back a random character Our config code simulates a stdio stream around a buffer, but our fake ungetc() does not behave quite like the real one. In particular, we only rewind the position by one character, but do _not_ actually put the character from the caller into position. It turns out that this does not matter, because we only ever push back the character we just read. In other words, such an assignment would be a noop. But because the function is called ungetc, and because it takes a character parameter, it is a mistake waiting to happen. Actually assigning the character into the buffer would be ideal, but our pointer is actually a "const" copy of the buffer. We do not know who the real owner of the buffer is in this code, and would not want to munge their contents. Instead, we can simply add an assertion that matches what the current caller does, and will let us know if new callers are added that violate the contract. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2015, 21:16:55 UTC |
| d306f3d | Jeff King | 05 February 2015, 08:14:19 UTC | decimal_width: avoid integer overflow The decimal_width function originally appeared in blame.c as "lineno_width", and was designed for calculating the print-width of small-ish integer values (line numbers in text files). In ec7ff5b, it was made into a reusable function, and in dc801e7, we started using it to align diffstats. Binary files in a diffstat show byte counts rather than line numbers, meaning they can be quite large (e.g., consider adding or removing a 2GB file). decimal_width is not up to the challenge for two reasons: 1. It takes the value as an "int", whereas large files may easily surpass this. The value may be truncated, in which case we will produce an incorrect value. 2. It counts "up" by repeatedly multiplying another integer by 10 until it surpasses the value. This can cause an infinite loop when the value is close to the largest representable integer. For example, consider using a 32-bit signed integer, and a value of 2,140,000,000 (just shy of 2^31-1). We will count up and eventually see that 1,000,000,000 is smaller than our value. The next step would be to multiply by 10 and see that 10,000,000,000 is too large, ending the loop. But we can't represent that value, and we have signed overflow. This is technically undefined behavior, but a common behavior is to lose the high bits, in which case our iterator will certainly be less than the number. So we'll keep multiplying, overflow again, and so on. This patch changes the argument to a uintmax_t (the same type we use to store the diffstat information for binary filese), and counts "down" by repeatedly dividing our value by 10. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2015, 20:38:35 UTC |
| 5e0be13 | Jeff King | 05 February 2015, 06:53:28 UTC | config: do not ungetc EOF When we are parsing a config value, if we see a carriage return, we fgetc the next character to see if it is a line feed (in which case we silently drop the CR). If it isn't, we then ungetc the character, and take the literal CR. But we never check whether we in fact got a character at all. If the config file ends in CR, we will get EOF here, and try to ungetc EOF. This works OK for a real stdio stream. The ungetc returns an error, and the next fgetc will then return EOF again. However, our custom buffer-based stream is not so fortunate. It happily rewinds the position of the stream by one character, ignoring the fact that we fed it EOF. The next fgetc call returns the final CR again, over and over, and we end up in an infinite loop. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2015, 20:37:36 UTC |
| bd4e882 | Tom G. Christensen | 04 February 2015, 08:23:16 UTC | ewah: fix building with gcc < 3.4.0 The __builtin_ctzll function was added in gcc 3.4.0. This extends the check for gcc so that use of __builtin_ctzll is only enabled if gcc >= 3.4.0. Signed-off-by: Tom G. Christensen <tgc@statsbiblioteket.dk> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2015, 18:45:31 UTC |
| 3af6792 | Tom G. Christensen | 30 January 2015, 09:52:34 UTC | Makefile: handle broken curl version number in version check curl 7.11.0 through 7.12.2 when built from their official release archives will present a 5 digit version number instead of the documented 6 digits which breaks the version check in the Makefile. Correct these broken version numbers on the fly when extracting them to ensure the comparison works correctly. [jc: shortened the new sed scripts a bit] Signed-off-by: Tom G. Christensen <tgc@statsbiblioteket.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2015, 02:30:24 UTC |
| 8196e72 | Patrick Steinhardt | 30 January 2015, 15:14:03 UTC | git-submodule.sh: fix '/././' path normalization When we add a new submodule the path of the submodule is being normalized. We fail to normalize multiple adjacent '/./', though. Thus 'path/to/././submodule' will become 'path/to/./submodule' where it should be 'path/to/submodule' instead. Signed-off-by: Patrick Steinhardt <ps@pks.im> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2015, 20:35:16 UTC |
| 0d1c285 | Junio C Hamano | 02 February 2015, 20:05:56 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: ca.po: Fix trailing whitespace | 02 February 2015, 20:05:56 UTC |
| 35840a3 | Junio C Hamano | 27 January 2015, 20:26:03 UTC | CodingGuidelines: describe naming rules for configuration variables We may want to say something about command line option names in the new section as well, but for now, let's make sure everybody is clear on how to structure and name their configuration variables. The text for the rules are partly taken from the log message of Jonathan's 6b3020a2 (add: introduce add.ignoreerrors synonym for add.ignore-errors, 2010-12-01). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2015, 19:28:55 UTC |
| 7471cf8 | Alex Henrie | 30 January 2015, 22:02:34 UTC | l10n: ca.po: Fix trailing whitespace Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 30 January 2015, 22:02:34 UTC |
| 697f652 | Junio C Hamano | 29 January 2015, 20:26:09 UTC | Documentation/git-remote.txt: stress that set-url is not for triangular It seems to be a common mistake to try using a single remote (e.g. 'origin') to fetch from one place (i.e. upstream) while pushing to another (i.e. your publishing point). That will never work satisfactorily, and it is easy to understand why if you think about what refs/remotes/origin/* would mean in such a world. It fundamentally cannot reflect the reality. If it follows the state of your upstream, it cannot match what you have published, and vice versa. It may be that misinformation is spread by some people. Let's counter them by adding a few words to our documentation. - The description was referring to <oldurl> and <newurl>, but never mentioned <name> argument you give from the command line. By mentioning "remote <name>", stress the fact that it is configuring a single remote. - Add a reminder that explicitly states that this is about a single remote, which the triangular workflow is not about. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2015, 22:07:13 UTC |
| 1f985d6 | Jeff King | 29 January 2015, 15:51:11 UTC | t/lib-gpg: sanity-check that we can actually sign Some older versions of gpg (reportedly v1.2.6 from RHEL4) cannot import the keyrings found in our test suite, and thus cannot even make a signature. The previous change works it around, but we cannot anticipate breakages update to GPG would cause in the future. Do a test-sign before declaring the GPG prerequisite fulfilled to future-proof our tests. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2015, 20:35:05 UTC |
| 830ff02 | Jeff King | 29 January 2015, 15:43:20 UTC | t/lib-gpg: include separate public keys in keyring.gpg Since 1e3eefb (tests: replace binary GPG keyrings with ASCII-armored keys, 2014-12-12), we import our test GPG keys from a single file. Each keypair in the import stream contains both the secret and public keys. However, older versions of gpg reportedly fail to import the public half of the key. We can solve this by including duplicates of the public keys separately. The duplicates are ignored by modern gpg, and this makes older versions work. Reported by Tom G. Christensen <tgc@statsbiblioteket.dk> on gpg 1.2.6 (from RHEL4). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2015, 19:56:19 UTC |
| ac1c2d9 | Junio C Hamano | 28 January 2015, 21:17:19 UTC | diff-format doc: a score can follow M for rewrite b6d8f309 (diff-raw format update take #2., 2005-05-23) started documenting the diff format, and it said ... (8) sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree". (9) status, followed by similarlity index number only for C and R. (10) a tab or a NUL when '-z' option is used. ... because C and R _were_ the only ones that came with a number back then. This was corrected by ddafa7e9 (diff-helper: Fix R/C score parsing under -z flag., 2005-05-29) and we started saying "score" instead of "similarlity index" (because we can have other kind of score there), and stopped saying "only for C and R" (because Git is an ever evolving system). Later f345b0a0 (Add -B flag to diff-* brothers., 2005-05-30) introduced a new concept, "dissimilarity" score; it did not have to fix any documentation. The current text that says only C and R can have scores came independently from a5a323f3 (Add reference for status letters in documentation., 2008-11-02) and it was wrong from the day one. Noticed-by: Mike Hommey Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2015, 06:22:03 UTC |
| 57b92a7 | Michael J Gruber | 27 January 2015, 12:35:53 UTC | git-push.txt: document the behavior of --repo As per the code, the --repo <repo> option is equivalent to the <repo> argument to 'git push', but somehow it was documented as something that is more than that. [It exists for historical reasons, back from the time when options had to come before arguments.] Say so. [But not that.] Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 January 2015, 20:56:06 UTC |
| 94ee8e2 | Jeff King | 28 January 2015, 17:58:50 UTC | do not check truth value of flex arrays There is no point in checking "!ref->name" when ref is a "struct ref". The name field is a flex-array, and there always has a non-zero address. This is almost certainly not hurting anything, but it does cause clang-3.6 to complain. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 January 2015, 20:46:07 UTC |
| 66ec904 | Jeff King | 28 January 2015, 17:57:35 UTC | read_and_strip_branch: fix typo'd address-of operator When we are chomping newlines from the end of a strbuf, we must check "sb.len != 0" before accessing "sb.buf[sb.len - 1]". However, this code mistakenly checks "&sb.len", which is always true (it is a part of an auto struct, so the address is always non-zero). This could lead to us accessing memory outside the strbuf when we read an empty file. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 January 2015, 20:42:44 UTC |
| 502e7f9 | Junio C Hamano | 27 January 2015, 20:25:48 UTC | config.txt: mark deprecated variables more prominently Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 January 2015, 20:22:01 UTC |
| 394e150 | Junio C Hamano | 27 January 2015, 20:19:11 UTC | config.txt: clarify that add.ignore-errors is deprecated The old text gave an impression that even in a new repository using old form might be safer. Only Git from pre 1.7.0 days choke on the correctly named variable, which is ancient by today's standard. We have no intention to remove the support for deprecated ones, but let's make sure that we do not give room for confused questions such as "why does core.sparse-checkout not work, when add.ignore-errors does?" Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 January 2015, 20:21:12 UTC |
| 15598cf | Junio C Hamano | 27 January 2015, 22:39:53 UTC | Git 2.3.0-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2015, 22:39:53 UTC |
| 8b9c2dd | Jeff King | 27 January 2015, 20:02:27 UTC | dumb-http: do not pass NULL path to parse_pack_index Once upon a time, dumb http always fetched .idx files directly into their final location, and then checked their validity with parse_pack_index. This was refactored in commit 750ef42 (http-fetch: Use temporary files for pack-*.idx until verified, 2010-04-19), which uses the following logic: 1. If we have the idx already in place, see if it's valid (using parse_pack_index). If so, use it. 2. Otherwise, fetch the .idx to a tempfile, check that, and if so move it into place. 3. Either way, fetch the pack itself if necessary. However, it got step 1 wrong. We pass a NULL path parameter to parse_pack_index, so an existing .idx file always looks broken. Worse, we do not treat this broken .idx as an opportunity to re-fetch, but instead return an error, ignoring the pack entirely. This can lead to a dumb-http fetch failing to retrieve the necessary objects. This doesn't come up much in practice, because it must be a packfile that we found out about (and whose .idx we stored) during an earlier dumb-http fetch, but whose packfile we _didn't_ fetch. I.e., we did a partial clone of a repository, didn't need some packfiles, and now a followup fetch needs them. Discovery and tests by Charles Bailey <charles@hashpling.org>. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2015, 20:41:45 UTC |
| ff76d36 | Junio C Hamano | 27 January 2015, 19:01:05 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: de.po: correct singular form l10n: de.po: translate "leave behind" correctly l10n: de.po: fix typo l10n: ca.po: update translation | 27 January 2015, 19:01:05 UTC |
| b4fde1e | Jiang Xin | 27 January 2015, 07:00:48 UTC | Merge branch 'master' of git://github.com/alexhenrie/git-po * 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: update translation | 27 January 2015, 07:00:48 UTC |
| 1044b1f | Michael J Gruber | 26 January 2015, 15:48:33 UTC | commit: reword --author error message If an --author argument is specified but does not contain a '>' then git tries to find the argument within the existing authors; and gives the error message "No existing author found with '%s'" if there is no match. This is confusing for users who try to specify a valid complete author name. Rename the error message to make it clearer that the failure has two reasons in this case. (This codepath is touched only when we know already that the argument cannot be a completely wellformed author ident.) Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2015, 03:57:12 UTC |
| 07586eb | Michael J Gruber | 26 January 2015, 15:34:32 UTC | l10n: de.po: correct singular form Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 26 January 2015, 18:36:04 UTC |
| 2f334c6 | Michael J Gruber | 26 January 2015, 15:34:31 UTC | l10n: de.po: translate "leave behind" correctly This message is about leaving orphaned commits behind, not about behind an upstream branch. Try to make this clear. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 26 January 2015, 18:36:04 UTC |
| 3b36ef9 | Benedikt Heine | 25 January 2015, 11:00:04 UTC | l10n: de.po: fix typo Signed-off-by: Benedikt Heine <bebe@bebehei.de> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 26 January 2015, 18:36:04 UTC |
| 573ed5e | Alex Henrie | 26 January 2015, 17:12:50 UTC | l10n: ca.po: update translation Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 26 January 2015, 17:12:50 UTC |
| 13d261e | Aleksey Vasenev | 19 November 2014, 21:47:32 UTC | wincred: fix get credential if username has "@" Such a username with "@" in it isn't all that unusual these days. cf. https://groups.google.com/forum/#!msg/msysgit/YVuCqmwwRyY/HULHj5OoE88J Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru> Acked-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2015, 04:08:56 UTC |
| 3cab02d | Junio C Hamano | 23 January 2015, 19:49:05 UTC | Documentation: what does "git log --indexed-objects" even mean? 4fe10219 (rev-list: add --indexed-objects option, 2014-10-16) adds "--indexed-objects" option to "rev-list", and it is only useful in the context of "git rev-list" and not "git log". There are other object traversal options that do not make sense for "git log" that are shown in the manual page. Move the description of "--indexed-objects" to the object traversal section so that it sits together with its friends "--objects", "--objects-edge", etc. and then show them only in "git rev-list" documentation. Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2015, 23:06:24 UTC |
| a9c4641 | Alexander Kuleshov | 22 January 2015, 08:39:44 UTC | add -i: return from list_and_choose if there is no candidate The list_and_choose() helper is given a prompt and a list, asks the user to make selection from the list, and then returns a list of items chosen. Even when it is given an empty list as the original candidate set to choose from, it gave a prompt to the user, who can only say "I am done choosing". Return an empty result when the input is an empty list without bothering the user. The existing caller must already have a logic to say "Nothing to do" or an equivalent when the returned list is empty (i.e. the user chose to select nothing) if it is necessary, so no change to the callers is necessary. This fixes the case where "add untracked" is asked in "git add -i" and there is no untracked files in the working tree. We used to give an empty list of files to choose from with a prompt, but with this change, we no longer do. Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2015, 22:44:36 UTC |
| 76afe74 | Junio C Hamano | 22 January 2015, 21:46:45 UTC | Merge branch 'js/t1050' * js/t1050: t1050-large: generate large files without dd | 22 January 2015, 21:46:45 UTC |
| 67b5440 | Junio C Hamano | 22 January 2015, 21:46:38 UTC | Merge branch 'ak/cat-file-clean-up' * ak/cat-file-clean-up: cat-file: use "type" and "size" from outer scope | 22 January 2015, 21:46:38 UTC |
| d588d4d | Junio C Hamano | 22 January 2015, 21:45:07 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: correct indentation of show-branch usage l10n: de.po: translate 3 messages l10n: zh_CN: various fixes on command arguments l10n: vi.po(2298t): Updated 3 new strings l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 2 l10n: git.pot: v2.3.0 round 2 (3 updated) l10n: de.po: translate 13 new messages l10n: de.po: fix typo l10n: de.po: translate "track" as "versionieren" l10n: zh_CN: translations for git v2.3.0-rc0 l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 1 l10n: vi.po(2298t): Updated and change Plural-Forms l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) l10n: ca.po: various fixes | 22 January 2015, 21:45:07 UTC |
| ab9432d | Junio C Hamano | 22 January 2015, 21:44:47 UTC | Merge branch 'sh/asciidoc-git-version-fix' * sh/asciidoc-git-version-fix: Documentation: fix version numbering | 22 January 2015, 21:44:47 UTC |
| a4c0444 | Sven van Haastregt | 22 January 2015, 19:32:33 UTC | Documentation: fix version numbering Version numbers in asciidoc-generated content (such as man pages) went missing as of da8a366 (Documentation: refactor common operations into variables). Fix by putting the underscore back in the variable name. Signed-off-by: Sven van Haastregt <svenvh@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2015, 21:44:14 UTC |
