Skip to main content

Browse the archive

https://github.com/git/git
09 August 2024, 01:33:12 UTC
sort by:
Revision Author Date Message Commit Date
341e7e8 Junio C Hamano 25 June 2014, 19:21:11 UTC Git 2.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 June 2014, 19:21:11 UTC
62bfd83 Junio C Hamano 25 June 2014, 18:50:13 UTC Merge branch 'na/no-http-test-in-the-middle' into maint The mode to run tests with HTTP server tests disabled was broken. * na/no-http-test-in-the-middle: t5538: move http push tests out to t5542 25 June 2014, 18:50:13 UTC
287a870 Junio C Hamano 25 June 2014, 18:50:03 UTC Merge branch 'jl/status-added-submodule-is-never-ignored' into maint "git status" (and "git commit") behaved as if changes in a modified submodule are not there if submodule.*.ignore configuration is set, which was misleading. The configuration is only to unclutter diff output during the course of development, and should not to hide changes in the "status" output to cause the users forget to commit them. * jl/status-added-submodule-is-never-ignored: commit -m: commit staged submodules regardless of ignore config status/commit: show staged submodules regardless of ignore config 25 June 2014, 18:50:03 UTC
1881d2b Junio C Hamano 25 June 2014, 18:49:48 UTC Merge branch 'ym/fix-opportunistic-index-update-race' into maint "git status", even though it is a read-only operation, tries to update the index with refreshed lstat(2) info to optimize future accesses to the working tree opportunistically, but this could race with a "read-write" operation that modify the index while it is running. Detect such a race and avoid overwriting the index. * ym/fix-opportunistic-index-update-race: read-cache.c: verify index file before we opportunistically update it wrapper.c: add xpread() similar to xread() 25 June 2014, 18:49:48 UTC
85785df Junio C Hamano 25 June 2014, 18:49:39 UTC Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint "git show -s" (i.e. show log message only) used to incorrectly emit an extra blank line after a merge commit. * mk/show-s-no-extra-blank-line-for-merges: git-show: fix 'git show -s' to not add extra terminator after merge commit 25 June 2014, 18:49:39 UTC
d9036cd Junio C Hamano 25 June 2014, 18:49:31 UTC Merge branch 'rr/rebase-autostash-fix' into maint The autostash mode of "git rebase -i" did not restore the dirty working tree state if the user aborted the interactive rebase by emptying the insn sheet. * rr/rebase-autostash-fix: rebase -i: test "Nothing to do" case with autostash rebase -i: handle "Nothing to do" case with autostash 25 June 2014, 18:49:31 UTC
8675779 Junio C Hamano 25 June 2014, 18:49:10 UTC Merge branch 'jc/shortlog-ref-exclude' into maint "git log --exclude=<glob> --all | git shortlog" worked as expected, but "git shortlog --exclude=<glob> --all", which is supposed to be identical to the above pipeline, was not accepted at the command line argument parser level. * jc/shortlog-ref-exclude: shortlog: allow --exclude=<glob> to be passed 25 June 2014, 18:49:11 UTC
c4f79d1 Junio C Hamano 25 June 2014, 18:49:01 UTC Merge branch 'jl/remote-rm-prune' into maint "git remote rm" and "git remote prune" can involve removing many refs at once, which is not a very efficient thing to do when very many refs exist in the packed-refs file. * jl/remote-rm-prune: remote prune: optimize "dangling symref" check/warning remote: repack packed-refs once when deleting multiple refs remote rm: delete remote configuration as the last 25 June 2014, 18:49:01 UTC
ada8710 Junio C Hamano 25 June 2014, 18:48:54 UTC Merge branch 'fc/rerere-conflict-style' into maint "git rerere forget" did not work well when merge.conflictstyle was set to a non-default value. * fc/rerere-conflict-style: rerere: fix for merge.conflictstyle 25 June 2014, 18:48:54 UTC
5327207 Junio C Hamano 25 June 2014, 18:48:42 UTC Merge branch 'rs/pack-objects-no-unnecessary-realloc' into maint "git pack-objects" unnecessarily copied the previous contents when extending the hashtable, even though it will populate the table from scratch anyway. * rs/pack-objects-no-unnecessary-realloc: pack-objects: use free()+xcalloc() instead of xrealloc()+memset() 25 June 2014, 18:48:43 UTC
5fa38cc Junio C Hamano 25 June 2014, 18:48:34 UTC Merge branch 'dt/merge-recursive-case-insensitive' into maint On a case insensitive filesystem, merge-recursive incorrectly deleted the file that is to be renamed to a name that is the same except for case differences. * dt/merge-recursive-case-insensitive: mv: allow renaming to fix case on case insensitive filesystems merge-recursive.c: fix case-changing merge bug 25 June 2014, 18:48:34 UTC
ed5d0d2 Junio C Hamano 25 June 2014, 18:48:23 UTC Merge branch 'rs/mailinfo-header-cmp' into maint "git mailinfo" used to read beyond the end of header string while parsing an incoming e-mail message to extract the patch. * rs/mailinfo-header-cmp: mailinfo: use strcmp() for string comparison 25 June 2014, 18:48:23 UTC
182c3d6 Junio C Hamano 25 June 2014, 18:48:13 UTC Merge branch 'jk/index-pack-report-missing' into maint The error reporting from "git index-pack" has been improved to distinguish missing objects from type errors. * jk/index-pack-report-missing: index-pack: distinguish missing objects from type errors 25 June 2014, 18:48:14 UTC
a9041df Junio C Hamano 25 June 2014, 18:47:58 UTC Merge branch 'nd/index-pack-one-fd-per-thread' into maint We used to disable threaded "git index-pack" on platforms without thread-safe pread(); use a different workaround for such platforms to allow threaded "git index-pack". * nd/index-pack-one-fd-per-thread: index-pack: work around thread-unsafe pread() 25 June 2014, 18:47:58 UTC
75b1b04 Junio C Hamano 25 June 2014, 18:47:49 UTC Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maint "git grep -O" to show the lines that hit in the pager did not work well with case insensitive search. We now spawn "less" with its "-I" option when it is used as the pager (which is the default). * sk/spawn-less-case-insensitively-from-grep-O-i: git grep -O -i: if the pager is 'less', pass the '-I' option 25 June 2014, 18:47:49 UTC
94c734a Junio C Hamano 25 June 2014, 18:47:36 UTC Merge branch 'nd/daemonize-gc' into maint "git gc --auto" was recently changed to run in the background to give control back early to the end-user sitting in front of the terminal, but it forgot that housekeeping involving reflogs should be done without other processes competing for accesses to the refs. * nd/daemonize-gc: gc --auto: do not lock refs in the background 25 June 2014, 18:47:36 UTC
cb4575f Junio C Hamano 25 June 2014, 18:47:23 UTC Merge branch 'jk/diff-follow-must-take-one-pathspec' into maint "git format-patch" did not enforce the rule that the "--follow" option from the log/diff family of commands must be used with exactly one pathspec. * jk/diff-follow-must-take-one-pathspec: move "--follow needs one pathspec" rule to diff_setup_done 25 June 2014, 18:47:23 UTC
11aae3e Junio C Hamano 25 June 2014, 18:47:09 UTC Merge branch 'jk/diff-files-assume-unchanged' into maint "git diff --find-copies-harder" sometimes pretended as if the mode bits have changed for paths that are marked with assume-unchanged bit. * jk/diff-files-assume-unchanged: run_diff_files: do not look at uninitialized stat data 25 June 2014, 18:47:09 UTC
b659f81 Junio C Hamano 25 June 2014, 18:46:54 UTC Merge branch 'jk/commit-C-pick-empty' into maint "git commit --allow-empty-message -C $commit" did not work when the commit did not have any log message. * jk/commit-C-pick-empty: commit: do not complain of empty messages from -C 25 June 2014, 18:46:54 UTC
4d27d8c Junio C Hamano 25 June 2014, 18:46:44 UTC Merge branch 'bc/blame-crlf-test' into maint "git blame" assigned the blame to the copy in the working-tree if the repository is set to core.autocrlf=input and the file used CRLF line endings. * bc/blame-crlf-test: blame: correctly handle files regardless of autocrlf 25 June 2014, 18:46:45 UTC
6bf8426 Junio C Hamano 25 June 2014, 18:46:34 UTC Merge branch 'jx/blame-align-relative-time' into maint "git blame" miscounted number of columns needed to show localized timestamps, resulting in jaggy left-side-edge of the source code lines in its output. * jx/blame-align-relative-time: blame: dynamic blame_date_width for different locales blame: fix broken time_buf paddings in relative timestamp 25 June 2014, 18:46:34 UTC
c122c9a Junio C Hamano 25 June 2014, 18:46:23 UTC Merge branch 'jc/apply-ignore-whitespace' into maint "--ignore-space-change" option of "git apply" ignored the spaces at the beginning of line too aggressively, which is inconsistent with the option of the same name "diff" and "git diff" have. * jc/apply-ignore-whitespace: apply --ignore-space-change: lines with and without leading whitespaces do not match 25 June 2014, 18:46:23 UTC
ff7e96b Junio C Hamano 25 June 2014, 18:46:12 UTC Merge branch 'jk/complete-merge-pull' into maint The completion scripts (in contrib/) did not know about quite a few options that are common between "git merge" and "git pull", and a couple of options unique to "git merge". * jk/complete-merge-pull: completion: add missing options for git-merge completion: add a note that merge options are shared 25 June 2014, 18:46:12 UTC
fbfdf13 Junio C Hamano 25 June 2014, 18:45:55 UTC Merge branch 'ow/config-mailmap-pathname' into maint The "mailmap.file" configuration option did not support the tilde expansion (i.e. ~user/path and ~/path). * ow/config-mailmap-pathname: config: respect '~' and '~user' in mailmap.file 25 June 2014, 18:45:55 UTC
ad5d893 Junio C Hamano 25 June 2014, 18:45:31 UTC Merge branch 'as/pretty-truncate' into maint The "%<(10,trunc)%s" pretty format specifier in the log family of commands is used to truncate the string to a given length (e.g. 10 in the example) with padding to column-align the output, but did not take into account that number of bytes and number of display columns are different. * as/pretty-truncate: pretty.c: format string with truncate respects logOutputEncoding t4205, t6006: add tests that fail with i18n.logOutputEncoding set t4205 (log-pretty-format): use `tformat` rather than `format` t4041, t4205, t6006, t7102: don't hardcode tested encoding value t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs 25 June 2014, 18:45:32 UTC
91043fc Junio C Hamano 25 June 2014, 18:44:53 UTC Merge branch 'jc/revision-dash-count-parsing' into maint "git log -2master" is a common typo that shows two commits starting from whichever random branch that is not 'master' that happens to be checked out currently. * jc/revision-dash-count-parsing: revision: parse "git log -<count>" more carefully 25 June 2014, 18:44:53 UTC
81bd9b1 Junio C Hamano 25 June 2014, 18:43:57 UTC Merge branch 'jk/report-fail-to-read-objects-better' into maint Reworded the error message given upon a failure to open an existing loose object file due to e.g. permission issues; it was reported as the object being corrupt, but that is not quite true. * jk/report-fail-to-read-objects-better: open_sha1_file: report "most interesting" errno 25 June 2014, 18:43:58 UTC
73505ef Junio C Hamano 25 June 2014, 18:43:43 UTC Merge branch 'mn/sideband-no-ansi' into maint Tools that read diagnostic output in our standard error stream do not want to see terminal control sequence (e.g. erase-to-eol). Detect them by checking if the standard error stream is connected to a tty. * mn/sideband-no-ansi: sideband.c: do not use ANSI control sequence on non-terminal 25 June 2014, 18:43:43 UTC
e293c56 Junio C Hamano 25 June 2014, 18:43:07 UTC Merge branch 'je/pager-do-not-recurse' into maint We used to unconditionally disable the pager in the pager process we spawn to feed out output, but that prevented people who want to run "less" within "less" from doing so. * je/pager-do-not-recurse: pager: do allow spawning pager recursively 25 June 2014, 18:43:07 UTC
9a597ed Junio C Hamano 12 June 2014, 19:17:57 UTC Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maint * jc/rev-parse-argh-dashed-multi-words: update-index: fix segfault with missing --cacheinfo argument 12 June 2014, 19:17:57 UTC
8f92c77 Jacek Konieczny 11 June 2014, 08:47:45 UTC pull: do not abuse 'break' inside a shell 'case' It is not C. The code would break under mksh when 'pull.ff' is set: $ git pull /usr/lib/git-core/git-pull[67]: break: can't break Already up-to-date. Signed-off-by: Jacek Konieczny <jajcus@jajcus.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 June 2014, 19:15:49 UTC
e3fa568 Junio C Hamano 06 June 2014, 22:33:25 UTC revision: parse "git log -<count>" more carefully This mistyped command line simply ignores "master" and ends up showing two commits from the current HEAD: $ git log -2master because we feed "2master" to atoi() without making sure that the whole string is parsed as an integer. Use the strtol_i() helper function instead. Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 June 2014, 21:53:49 UTC
eb07774 Junio C Hamano 30 May 2014, 19:57:25 UTC shortlog: allow --exclude=<glob> to be passed These two commands are supposed to be equivalent: $ git log --exclude=refs/notes/\* --all --no-merges --since=2.days | git shortlog $ git shortlog --exclude=refs/notes/\* --all --no-merges --since=2.days However, the latter does not understand the ref-exclusion command line option, even though other options understood by "log", such as "--all" and "--no-merges", are understood. This was because e7b432c5 (revision: introduce --exclude=<glob> to tame wildcards, 2013-08-30) did not wire the new option fully to the machinery. A new option understood by handle_revision_pseudo_opt() must be told to handle_revision_opt() as well. Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 June 2014, 20:41:33 UTC
c8e1ee4 Jeff King 04 June 2014, 07:11:11 UTC update-index: fix segfault with missing --cacheinfo argument Running "git update-index --cacheinfo" without any further arguments results in a segfault rather than an error message. Commit ec160ae (update-index: teach --cacheinfo a new syntax "mode,sha1,path", 2014-03-23) added code to examine the format of the argument, but forgot to handle the NULL case. Returning an error from the parser is enough, since we then treat it as an old-style "--cacheinfo <mode> <sha1> <path>", and complain that we have less than 3 arguments to read. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 June 2014, 18:02:55 UTC
fb79947 René Scharfe 01 June 2014, 11:07:21 UTC pack-objects: use free()+xcalloc() instead of xrealloc()+memset() Whenever the hash table becomes too small then its size is increased, the original part (and the added space) is zerod out using memset(), and the table is rebuilt from scratch. Simplify this proceess by returning the old memory using free() and allocating the new buffer using xcalloc(), which already clears the buffer for us. That way we avoid copying the old hash table contents needlessly inside xrealloc(). While at it, use the first array member with sizeof instead of a specific type. The old code used uint32_t and int, while index is actually an array of int32_t. Their sizes are the same basically everywhere, so it's not actually a problem, but the new code is cleaner and doesn't have to be touched should the type be changed. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 June 2014, 20:51:22 UTC
b1a013d René Scharfe 01 June 2014, 09:00:40 UTC mailinfo: use strcmp() for string comparison The array header is defined as: static const char *header[MAX_HDR_PARSED] = { "From","Subject","Date", }; When looking for the index of a specfic string in that array, simply use strcmp() instead of memcmp(). This avoids running over the end of the string (e.g. with memcmp("Subject", "From", 7)) and gets 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> 02 June 2014, 20:30:18 UTC
38de156 Michael Naumov 28 May 2014, 03:12:15 UTC sideband.c: do not use ANSI control sequence on non-terminal Diagnostic messages received on the sideband #2 from the server side are sent to the standard error with ANSI terminal control sequence "\033[K" that erases to the end of line appended at the end of each line. However, some programs (e.g. GitExtensions for Windows) read and interpret and/or show the message without understanding the terminal control sequences, resulting them to be shown to their end users. To help these programs, squelch the control sequence when the standard error stream is not being sent to a tty. NOTE: I considered to cover the case that a pager has already been started. But decided that is probably not worth worrying about here, though, as we shouldn't be using a pager for commands that do network communications (and if we do, omitting the magic line-clearing signal is probably a sane thing to do). Thanks-to: Erik Faye-Lund <kusmabite@gmail.com> Thanks-to: Jeff King <peff@peff.net> Signed-off-by: Michael Naumov <mnaoumov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 June 2014, 18:02:27 UTC
afa53fe Nick Alcock 30 May 2014, 17:36:21 UTC t5538: move http push tests out to t5542 As 0232852b, but for the push tests instead: this avoids a start_httpd in the middle of the file, which fails under GIT_TEST_HTTPD=false. Note that we have to munge the test in a few ways while moving it: 1. We drop the `test -z "$GIT_TEST_HTTPD"` check; this is too simplistic since 83d842d, and we should let lib-httpd.sh handle it. 2. We have to port over some of the old setup from t5538. 3. In the final test, we no longer expect the extra commit "1" built on top of "4". This was a side effect from an earlier test in t5538 which was not ported over. Signed-off-by: Nick Alcock <nick.alcock@oracle.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 May 2014, 18:13:45 UTC
bce14aa Junio C Hamano 30 May 2014, 17:57:52 UTC Sync with 1.9.4 30 May 2014, 17:57:52 UTC
34d5217 Junio C Hamano 28 May 2014, 22:50:22 UTC Git 1.9.4 This is expected to be the final maintenance release for 1.9 series, merging the remaining fixes that are relevant and are already in 2.0. Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 May 2014, 17:13:41 UTC
d717282 Jeff King 30 May 2014, 01:34:19 UTC t5537: re-drop http tests These were originally removed by 0232852 (t5537: move http tests out to t5539, 2014-02-13). However, they were accidentally re-added in 1ddb4d7 (Merge branch 'nd/upload-pack-shallow', 2014-03-21). This looks like an error in manual conflict resolution. Here's what happened: 1. v1.9.0 shipped with the http tests in t5537. 2. We realized that this caused problems, and built 0232852 on top to move the tests to their own file. This fix made it into v1.9.1. 3. We later had another fix in nd/upload-pack-shallow that also touched t5537. It was built directly on v1.9.0. When we merged nd/upload-pack-shallow to master, we got a conflict; it was built on a version with the http tests, but we had since removed them. The correct resolution was to drop the http tests and keep the new ones, but instead we kept everything. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 May 2014, 16:46:19 UTC
12188a8 Junio C Hamano 28 May 2014, 22:46:36 UTC Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint * rh/prompt-pcmode-avoid-eval-on-refname: git-prompt.sh: don't assume the shell expands the value of PS1 28 May 2014, 22:46:36 UTC
64d8c31 Junio C Hamano 28 May 2014, 22:45:57 UTC Merge branch 'mw/symlinks' into maint * mw/symlinks: setup: fix windows path buffer over-stepping setup: don't dereference in-tree symlinks for absolute paths setup: add abspath_part_inside_repo() function t0060: add tests for prefix_path when path begins with work tree t0060: add test for prefix_path when path == work tree t0060: add test for prefix_path on symlinks via absolute paths t3004: add test for ls-files on symlinks via absolute paths 28 May 2014, 22:45:57 UTC
e156455 Junio C Hamano 28 May 2014, 18:04:19 UTC Git 2.0 28 May 2014, 18:04:19 UTC
9352fd5 Øystein Walle 27 May 2014, 08:45:58 UTC config: respect '~' and '~user' in mailmap.file git_config_string() does not handle '~' and '~user' as part of the value. Using git_config_pathname() fixes this. Signed-off-by: Øystein Walle <oystwa@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 May 2014, 19:59:32 UTC
62aad18 Nguyễn Thái Ngọc Duy 25 May 2014, 00:38:29 UTC gc --auto: do not lock refs in the background 9f673f9 (gc: config option for running --auto in background - 2014-02-08) puts "gc --auto" in background to reduce user's wait time. Part of the garbage collecting is pack-refs and pruning reflogs. These require locking some refs and may abort other processes trying to lock the same ref. If gc --auto is fired in the middle of a script, gc's holding locks in the background could fail the script, which could never happen before 9f673f9. Keep running pack-refs and "reflog --prune" in foreground to stop parallel ref updates. The remaining background operations (repack, prune and rerere) should not impact running git processes. Reported-by: Adam Borowski <kilobyte@angband.pl> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 May 2014, 19:33:53 UTC
e6bea66 Jens Lindström 23 May 2014, 10:30:25 UTC remote prune: optimize "dangling symref" check/warning When 'git remote prune' was used to delete many refs in a repository with many refs, a lot of time was spent checking for (now) dangling symbolic refs pointing to the deleted ref, since warn_dangling_symref() was once per deleted ref to check all other refs in the repository. Avoid this using the new warn_dangling_symrefs() function which makes one pass over all refs and checks for all the deleted refs in one go, after they have all been deleted. Signed-off-by: Jens Lindström <jl@opera.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 May 2014, 19:30:47 UTC
c9e768b Jens Lindström 23 May 2014, 10:29:45 UTC remote: repack packed-refs once when deleting multiple refs When 'git remote rm' or 'git remote prune' were used in a repository with many refs, and needed to delete many remote-tracking refs, a lot of time was spent deleting those refs since for each deleted ref, repack_without_refs() was called to rewrite packed-refs without just that deleted ref. To avoid this, call repack_without_refs() first to repack without all the refs that will be deleted, before calling delete_ref() to delete each one completely. The call to repack_without_ref() in delete_ref() then becomes a no-op, since packed-refs already won't contain any of the deleted refs. Signed-off-by: Jens Lindström <jl@opera.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 May 2014, 19:30:42 UTC
8fee872 John Keeping 22 May 2014, 13:58:38 UTC completion: add missing options for git-merge The options added to __git_merge_options are those that git-pull passes to git-merge, since that variable is used by both commands. Those added directly in _git_merge() are specific to git-merge and are not passed thru from git-pull. Reported-by: Haralan Dobrev <hkdobrev@gmail.com> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 May 2014, 19:27:50 UTC
6d2b06f John Keeping 22 May 2014, 13:58:37 UTC completion: add a note that merge options are shared This should avoid future confusion after a subsequent patch has added some options to __git_merge_options and some directly in _git_merge(). Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 May 2014, 19:27:36 UTC
b07bdd3 Jens Lindström 23 May 2014, 10:28:43 UTC remote rm: delete remote configuration as the last When removing a remote, delete the remote-tracking branches before deleting the remote configuration. This way, if the operation fails or is aborted while deleting the remote-tracking branches, the command can be rerun to complete the operation. Signed-off-by: Jens Lindström <jl@opera.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 May 2014, 18:56:15 UTC
4a28f16 Junio C Hamano 21 May 2014, 18:50:35 UTC Update draft release notes to 2.0 Hopefully for the last time ;-) Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 May 2014, 18:50:35 UTC
7d50987 Alexey Shumkin 21 May 2014, 13:20:07 UTC pretty.c: format string with truncate respects logOutputEncoding Pretty format string %<(N,[ml]trunc)>%s truncates subject to a given length with an appropriate padding. This works for non-ASCII texts when i18n.logOutputEncoding is UTF-8 only (independently of a printed commit message encoding) but does not work when i18n.logOutputEncoding is NOT UTF-8. In 7e77df3 (pretty: two phase conversion for non utf-8 commits, 2013-04-19) 'format_commit_item' function assumes commit message to be in UTF-8. And that was so until ecaee80 (pretty: --format output should honor logOutputEncoding, 2013-06-26) where conversion to logOutputEncoding was added before calling 'format_commit_message'. Correct this by converting a commit message to UTF-8 first (as it assumed in 7e77df3 (pretty: two phase conversion for non utf-8 commits, 2013-04-19)). Only after that convert a commit message to an actual logOutputEncoding. Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 May 2014, 18:13:30 UTC
d928d81 Alexey Shumkin 21 May 2014, 13:20:06 UTC t4205, t6006: add tests that fail with i18n.logOutputEncoding set Pretty format string %<(N,[ml]trunc)>%s truncates subject to a given length with an appropriate padding. This works for non-ASCII texts when i18n.logOutputEncoding is UTF-8 only (independently of a printed commit message encoding) but does not work when i18n.logOutputEncoding is NOT UTF-8. There were no breakages as far as were no tests for the case when both a commit message and logOutputEncoding are not UTF-8. Add failing tests for that which will be fixed in the next patch. Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com> Helped-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Helped-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 May 2014, 18:11:50 UTC
c82134a Alexey Shumkin 21 May 2014, 13:20:05 UTC t4205 (log-pretty-format): use `tformat` rather than `format` Use `tformat` to avoid using of `echo` to complete end of line. Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 May 2014, 18:10:10 UTC
ee3efaf Alexey Shumkin 21 May 2014, 13:20:04 UTC t4041, t4205, t6006, t7102: don't hardcode tested encoding value The tested encoding is always available in a variable. Use it instead of hardcoding. Also, to be in line with other tests use ISO8859-1 (uppercase) rather then iso8859-1. Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 May 2014, 18:10:06 UTC
8ced8e4 Junio C Hamano 20 May 2014, 19:07:35 UTC Git 2.0-rc4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2014, 21:51:11 UTC
3054c66 Jason St. John 17 May 2014, 03:30:34 UTC RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, double quotes, or articles Signed-off-by: Jason St. John <jstjohn@purdue.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2014, 21:51:06 UTC
b2c851a Junio C Hamano 20 May 2014, 21:18:11 UTC Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)" Instead of showing a warning and working as before, fail and show the message and force immediate upgrade from their upstream repositories when these tools are run, per request from their primary author. Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2014, 21:48:11 UTC
ddb5432 Matthieu Moy 20 May 2014, 07:49:31 UTC rebase -i: test "Nothing to do" case with autostash Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2014, 18:33:49 UTC
dd63f16 Jeff King 20 May 2014, 06:49:20 UTC move "--follow needs one pathspec" rule to diff_setup_done Because of the way "--follow" is implemented, we must have exactly one pathspec. "git log" enforces this restriction, but other users of the revision traversal code do not. For example, "git format-patch --follow" will segfault during try_to_follow_renames, as we have no pathspecs at all. We can push this check down into diff_setup_done, which is probably a better place anyway. It is the diff code that introduces this restriction, so other parts of the code should not need to care themselves. Reported-by: "Michael S. Tsirkin" <mst@redhat.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2014, 18:09:03 UTC
00a5b79 Junio C Hamano 20 May 2014, 00:12:36 UTC Merge branch 'jc/graduate-remote-hg-bzr' (early part) * 'jc/graduate-remote-hg-bzr' (early part): remote-helpers: point at their upstream repositories contrib: remote-helpers: add move warnings (v2.0) Revert "Merge branch 'fc/transport-helper-sync-error-fix'" 20 May 2014, 00:12:36 UTC
896ba14 Junio C Hamano 15 May 2014, 21:58:16 UTC remote-helpers: point at their upstream repositories Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2014, 00:10:03 UTC
0311086 Felipe Contreras 13 May 2014, 21:29:56 UTC contrib: remote-helpers: add move warnings (v2.0) The tools are now maintained out-of-tree, and they have a regression in v2.0. It's better to start warning the users as soon as possible. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2014, 00:10:03 UTC
10e1fee Junio C Hamano 14 May 2014, 19:06:35 UTC Revert "Merge branch 'fc/transport-helper-sync-error-fix'" This reverts commit d508e4a8e2391ae2596403b6478d01cf3d5f928f, reversing changes made to e42552135a2a396f37053a89f44952ea907870b2. The author of the original topic says he broke the upcoming 2.0 release with something that relates to "synchronization crash regression" while refusing to give further specifics, so this would unfortunately be the safest option for the upcoming release. Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 May 2014, 00:09:57 UTC
df43b41 Junio C Hamano 19 May 2014, 23:10:10 UTC Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' * rh/prompt-pcmode-avoid-eval-on-refname: git-prompt.sh: don't assume the shell expands the value of PS1 19 May 2014, 23:10:10 UTC
1e4119c Richard Hansen 19 May 2014, 22:55:37 UTC git-prompt.sh: don't assume the shell expands the value of PS1 Not all shells subject the prompt string to parameter expansion. Test whether the shell will expand the value of PS1, and use the result to control whether raw ref names are included directly in PS1. This fixes a regression introduced in commit 8976500 ("git-prompt.sh: don't put unsanitized branch names in $PS1"): zsh does not expand PS1 by default, but that commit assumed it did. The bug resulted in prompts containing the literal string '${__git_ps1_branch_name}' instead of the actual branch name. Reported-by: Caleb Thompson <caleb@calebthompson.io> Signed-off-by: Richard Hansen <rhansen@bbn.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 May 2014, 23:09:53 UTC
e4244eb Ramkumar Ramachandra 19 May 2014, 22:05:20 UTC rebase -i: handle "Nothing to do" case with autostash When a user invokes $ git rebase -i @~3 with dirty files and rebase.autostash turned on, and exits the $EDITOR with an empty buffer, the autostash fails to apply. Although the primary focus of rr/rebase-autostash was to get the git-rebase--backend.sh scripts to return control to git-rebase.sh, it missed this case in git-rebase--interactive.sh. Since this case is unlike the other cases which return control for housekeeping, assign it a special return status and handle that return value explicitly in git-rebase.sh. Reported-by: Karen Etheridge <ether@cpan.org> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 May 2014, 22:36:24 UTC
496a698 Alexey Shumkin 19 May 2014, 15:28:16 UTC t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs The expected SHA-1 digests are always available in variables. Use them instead of hardcoding. That was introduced in a742f2a (t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs, 2013-06-26) but unfortunately was not followed in 5e1361c (log: properly handle decorations with chained tags, 2013-12-17) Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 May 2014, 18:24:46 UTC
7dde48e Junio C Hamano 19 May 2014, 17:35:36 UTC Merge branch 'lt/request-pull' * lt/request-pull: request-pull: resurrect for-linus -> tags/for-linus DWIM 19 May 2014, 17:35:36 UTC
5714722 Junio C Hamano 19 May 2014, 17:35:24 UTC Merge branch 'jl/use-vsatisfy-correctly-for-2.0' * jl/use-vsatisfy-correctly-for-2.0: git-gui: tolerate major version changes when comparing the git version 19 May 2014, 17:35:24 UTC
c29bf4a Junio C Hamano 19 May 2014, 17:32:56 UTC Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: fr: a lot of good fixups 19 May 2014, 17:32:56 UTC
3fc2aea Junio C Hamano 19 May 2014, 17:32:25 UTC Merge branch 'kb/fast-hashmap' * kb/fast-hashmap: Documentation/technical/api-hashmap: remove source highlighting 19 May 2014, 17:32:25 UTC
c2538fd Anders Kaseorg 17 May 2014, 11:08:55 UTC Documentation/technical/api-hashmap: remove source highlighting The highlighting was pretty, but unfortunately, the failure mode when source-highlight is not installed was that the entire code block disappears. See https://bugs.debian.org/745591, https://bugs.launchpad.net/bugs/1316810. Signed-off-by: Anders Kaseorg <andersk@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 May 2014, 17:31:36 UTC
b3f0c5c Jens Lehmann 17 May 2014, 19:49:05 UTC git-gui: tolerate major version changes when comparing the git version Since git 2.0.0 starting git gui in a submodule using a gitfile fails with the following error: No working directory ../../../<path> couldn't change working directory to "../../../<path>": no such file or directory This is because "git rev-parse --show-toplevel" is only run when git gui sees a git version of at least 1.7.0 (which is the version in which the --show-toplevel option was introduced). But "package vsatisfies" returns false when the major version changes, which is not what we want here. Fix that for both places where the git version is checked using vsatisfies by appending a '-' to the version number. This tells vsatisfies that a change of the major version is not considered to be a problem, as long as the new major version is larger. This is done for both the place that caused the reported bug and another spot where the git version is tested for another feature. Reported-by: Chris Packham <judge.packham@gmail.com> Reported-by: Yann Dirson <ydirson@free.fr> Helped-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Tested-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 May 2014, 17:12:45 UTC
a6e8883 Grégoire Paris 06 May 2014, 21:29:57 UTC fr: a lot of good fixups Signed-off-by: Grégoire Paris <postmaster@greg0ire.fr> Acked-by: Jean-Noel Avila <jn.avila@free.fr> 17 May 2014, 17:08:59 UTC
d952cbb Junio C Hamano 16 May 2014, 17:18:25 UTC request-pull: resurrect for-linus -> tags/for-linus DWIM Older versions of Git before v1.7.10 did not DWIM $ git pull $URL for-linus to the tag "tags/for-linus" and the users were required to say $ git pull $URL tags/for-linus instead. Because newer versions of Git works either way, request-pull used to show tags/for-linus when asked $ git request-pull origin/master $URL for-linus The recent updates broke this and in the output we see "for-linus" without the "tags/" prefix. As v1.7.10 is more than 2 years old, this should matter very little in practice, but resurrecting it is very simple. Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 May 2014, 17:18:25 UTC
f7febbe Johannes Schindelin 08 February 2011, 06:17:24 UTC git grep -O -i: if the pager is 'less', pass the '-I' option When <command> happens to be the magic string "less", today git grep -O<command> -e<pattern> helpfully passes +/<pattern> to less so you can navigate through the results within a file using the n and shift+n keystrokes. Alas, that doesn't do the right thing for a case-insensitive match, i.e. git grep -i -O<command> -e<pattern> For that case we should pass --IGNORE-CASE to "less" so that n and shift+n can move between results ignoring case in the pattern. The original patch came from msysgit and used "-i", but that was not due to lack of support for "-I" but it merely overlooked that it ought to work even when the pattern contains capital letters. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Stepan Kasal <kasal@ucw.cz> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 May 2014, 19:49:23 UTC
d6c8a05 Jeff King 15 May 2014, 08:54:06 UTC open_sha1_file: report "most interesting" errno When we try to open a loose object file, we first attempt to open in the local object database, and then try any alternates. This means that the errno value when we return will be from the last place we looked (and due to the way the code is structured, simply ENOENT if we do not have have any alternates). This can cause confusing error messages, as read_sha1_file checks for ENOENT when reporting a missing object. If errno is something else, we report that. If it is ENOENT, but has_loose_object reports that we have it, then we claim the object is corrupted. For example: $ chmod 0 .git/objects/??/* $ git rev-list --all fatal: loose object b2d6fab18b92d49eac46dc3c5a0bcafabda20131 (stored in .git/objects/b2/d6fab18b92d49eac46dc3c5a0bcafabda20131) is corrupt This patch instead keeps track of the "most interesting" errno we receive during our search. We consider ENOENT to be the least interesting of all, and otherwise report the first error found (so problems in the object database take precedence over ones in alternates). Here it is with this patch: $ git rev-list --all fatal: failed to read object b2d6fab18b92d49eac46dc3c5a0bcafabda20131: Permission denied Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 May 2014, 17:03:06 UTC
5304810 Jeff King 14 May 2014, 22:13:06 UTC run_diff_files: do not look at uninitialized stat data If we try to diff an index entry marked CE_VALID (because it was marked with --assume-unchanged), we do not bother even running stat() on the file to see if it was removed. This started long ago with 540e694 (Prevent diff machinery from examining assume-unchanged entries on worktree, 2009-08-11). However, the subsequent code may look at our "struct stat" and expect to find actual data; currently it will find whatever cruft was left on the stack. This can cause problems in two situations: 1. We call match_stat_with_submodule with the stat data, so a submodule may be erroneously marked as changed. 2. If --find-copies-harder is in effect, we pass all entries, even unchanged ones, to diff_change, so it can list them as rename/copy sources. Since we found no change, we assume that function will realize it and not actually display any diff output. However, we end up feeding it a bogus mode, leading it to sometimes claim there was a mode change. We can fix both by splitting the CE_VALID and regular code paths, and making sure only to look at the stat information in the latter. Furthermore, we push the declaration of our "struct stat" down into the code paths that actually set it, so we cannot accidentally access it uninitialized in future code. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 May 2014, 16:35:33 UTC
ad2f725 Max Kirillov 14 May 2014, 22:12:45 UTC git-show: fix 'git show -s' to not add extra terminator after merge commit When git show -s is called for merge commit it prints extra newline after any merge commit. This differs from output for commits with one parent. Fix it by more thorough checking that diff output is disabled. The code in question exists since commit 3969cf7db1. The additional newline is really needed for cases when patch is requested, test t4013-diff-various.sh contains cases which can demonstrate behavior when the condition is restricted further. Tests: Added merge commit to 'set up a bit of history' case in t7007-show.sh to cover the fix. Existing tests are updated to demonstrate the new behaviour. Earlier, the tests that used "git show -s --pretty=format:%s", even though "--pretty=format:%s" calls for item separator semantics and does not ask for the terminating newline after the last item, expected the output to end with such a newline. They were relying on the buggy behaviour. Use of "--format=%s", which is equivalent to "--pretty=tformat:%s" that asks for a terminating newline after each item, is a more realistic way to use the command. In the test 'merge log messages' the expected data is changed, because it was explicitly listing the extra newline. Also the msg.nologff and msg.nolognoff expected files are replaced by one msg.nolog, because they were diffing because of the bug, and now there should be no difference. Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 May 2014, 16:32:08 UTC
6308767 Junio C Hamano 13 May 2014, 18:53:14 UTC Merge branch 'fc/prompt-zsh-read-from-file' * fc/prompt-zsh-read-from-file: contrib: completion: fix 'eread()' namespace 13 May 2014, 18:53:14 UTC
66ab301 Felipe Contreras 13 May 2014, 13:21:19 UTC contrib: completion: fix 'eread()' namespace Otherwise it might collide with a function of the same name in the user's environment. Suggested-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 May 2014, 18:52:51 UTC
77583e7 Jeff King 12 May 2014, 04:38:39 UTC index-pack: distinguish missing objects from type errors When we fetch a pack that does not contain an object we expected to receive, we get an error like: $ git init --bare tmp.git && cd tmp.git $ git fetch ../parent.git [...] error: Could not read 964953ec7bcc0245cb1d0db4095455edd21a2f2e fatal: Failed to traverse parents of commit b8247b40caf6704fe52736cdece6d6aae87471aa error: ../parent.git did not send all necessary objects This comes from the check_everything_connected rev-list. If we try cloning the same repo (rather than a fetch), we end up using index-pack's --check-self-contained-and-connected option instead, which produces output like: $ git clone --no-local --bare parent.git tmp.git [...] fatal: object of unexpected type fatal: index-pack failed Not only is the sha1 missing, but it's a misleading message. There's no type problem, but rather a missing object problem; we don't notice the difference because we simply compare OBJ_BAD != OBJ_BLOB. Let's provide a different message for this case: $ git clone --no-local --bare parent.git tmp.git fatal: did not receive expected object 6b00a8c61ed379d5f925a72c1987c9c52129d364 fatal: index-pack failed While we're at it, let's also improve a true type mismatch error to look like fatal: object 6b00a8c61ed379d5f925a72c1987c9c52129d364: expected type blob, got tree Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 May 2014, 18:27:50 UTC
998f840 Junio C Hamano 12 May 2014, 17:12:05 UTC Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: Updated Bulgarian translation of git (1307t0f921u) 12 May 2014, 17:12:05 UTC
1c3c841 Alexander Shopov 29 January 2014, 13:08:40 UTC l10n: Updated Bulgarian translation of git (1307t0f921u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> 11 May 2014, 14:09:01 UTC
b28aeab Junio C Hamano 09 May 2014, 18:23:25 UTC Git 2.0-rc3 09 May 2014, 18:23:55 UTC
7234af6 Junio C Hamano 09 May 2014, 18:00:48 UTC Sync with 1.9.3 09 May 2014, 18:00:48 UTC
eea5913 Junio C Hamano 09 May 2014, 17:59:07 UTC Git 1.9.3 The third maintenance release for Git 1.9; contains all the fixes that are scheduled to appear in Git 2.0 since 1.9.2. Signed-off-by: Junio C Hamano <gitster@pobox.com> 09 May 2014, 17:59:07 UTC
4d4813a brian m. carlson 26 April 2014, 23:10:40 UTC blame: correctly handle files regardless of autocrlf If a file contained CRLF line endings in a repository with core.autocrlf=input, then blame always marked lines as "Not Committed Yet", even if they were unmodified. Don't attempt to convert the line endings when creating the fake commit so that blame works correctly regardless of the autocrlf setting. Reported-by: Ephrim Khong <dr.khong@gmail.com> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 May 2014, 21:43:49 UTC
baa37bf David Turner 08 May 2014, 17:23:34 UTC mv: allow renaming to fix case on case insensitive filesystems "git mv hello.txt Hello.txt" on a case insensitive filesystem always triggers "destination already exists" error, because these two names refer to the same path from the filesystem's point of view, and requires the user to give "--force" when correcting the case of the path recorded in the index and in the next commit. Detect this case and allow it without requiring "--force". Signed-off-by: David Turner <dturner@twitter.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 May 2014, 21:34:00 UTC
d30acb7 Junio C Hamano 08 May 2014, 18:59:51 UTC Sync with maint * maint: shell doc: remove stray "+" in example Start preparing for 1.9.3 08 May 2014, 18:59:51 UTC
e28dcdc Jonathan Nieder 07 May 2014, 23:44:01 UTC shell doc: remove stray "+" in example The git-shell(1) manpage says EXAMPLE To disable interactive logins, displaying a greeting instead: + $ chsh -s /usr/bin/git-shell $ mkdir $HOME/git-shell-commands [...] The stray "+" has been there ever since the example was added in v1.8.3-rc0~210^2 (shell: new no-interactive-login command to print a custom message, 2013-03-09). The "+" sign between paragraphs is needed in asciidoc to attach extra paragraphs to a list item but here it is not needed and ends up rendered as a literal "+". Remove it. A quick search with "grep -e '<p>+' /usr/share/doc/git/html/*.html" doesn't find any other instances of this problem. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 May 2014, 17:26:26 UTC
2b14124 Junio C Hamano 08 May 2014, 17:25:37 UTC Merge git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: Fix a couple of typos in the Swedish translation 08 May 2014, 17:25:37 UTC
86ae051 Junio C Hamano 08 May 2014, 17:05:22 UTC Start preparing for 1.9.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 May 2014, 17:05:22 UTC
bd51339 Junio C Hamano 08 May 2014, 17:01:32 UTC Merge branch 'cl/p4-use-diff-tree' into maint "git p4" dealing with changes in binary files were broken by a change in 1.9 release. * cl/p4-use-diff-tree: git-p4: format-patch to diff-tree change breaks binary patches 08 May 2014, 17:01:32 UTC
6eca9c0 Junio C Hamano 08 May 2014, 17:01:18 UTC Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maint The shell prompt script (in contrib/), when using the PROMPT_COMMAND interface, used an unsafe construct when showing the branch name in $PS1. * rh/prompt-pcmode-avoid-eval-on-refname: git-prompt.sh: don't put unsanitized branch names in $PS1 08 May 2014, 17:01:18 UTC
e79fcfc Junio C Hamano 08 May 2014, 17:01:06 UTC Merge branch 'km/avoid-non-function-return-in-rebase' into maint "git rebase" used a POSIX shell construct FreeBSD /bin/sh does not work well with. * km/avoid-non-function-return-in-rebase: Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD" rebase: avoid non-function use of "return" on FreeBSD 08 May 2014, 17:01:06 UTC
e230cd8 Junio C Hamano 08 May 2014, 17:00:45 UTC Merge branch 'tb/unicode-6.3-zero-width' into maint Some more Unicode codepoints defined in Unicode 6.3 as having zero width have been taught to our display column counting logic. * tb/unicode-6.3-zero-width: utf8.c: partially update to version 6.3 08 May 2014, 17:00:45 UTC
16fefdc Junio C Hamano 08 May 2014, 17:00:36 UTC Merge branch 'km/avoid-bs-in-shell-glob' into maint Some tests used shell constructs that did not work well on FreeBSD * km/avoid-bs-in-shell-glob: test: fix t5560 on FreeBSD 08 May 2014, 17:00:36 UTC
back to top