| cee0c27 | Junio C Hamano | 18 March 2014, 21:06:49 UTC | Git 1.9.1 The version numbering scheme has changed since Git 1.9 and we dropped the third dewey-decimal from the traditional numbering (e.g. both 1.8.4 and 1.8.5 were major feature releases). This release 1.9.1 is the first maintenance relase for Git 1.9. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 March 2014, 21:16:16 UTC |
| 9526473 | Junio C Hamano | 18 March 2014, 21:04:59 UTC | Merge branch 'jk/clean-d-pathspec' into maint "git clean -d pathspec" did not use the given pathspec correctly and ended up cleaning too much. * jk/clean-d-pathspec: clean: simplify dir/not-dir logic clean: respect pathspecs with "-d" | 18 March 2014, 21:04:59 UTC |
| 01e13d0 | Junio C Hamano | 18 March 2014, 21:04:36 UTC | Merge branch 'da/difftool-git-files' into maint "git difftool" misbehaved when the repository is bound to the working tree with the ".git file" mechanism, where a textual file ".git" tells us where it is. * da/difftool-git-files: t7800: add a difftool test for .git-files difftool: support repositories with .git-files | 18 March 2014, 21:04:36 UTC |
| 4097a25 | Junio C Hamano | 18 March 2014, 21:04:16 UTC | Merge branch 'jk/remote-pushremote-config-reading' into maint "git push" did not pay attention to branch.*.pushremote if it is defined earlier than remote.pushdefault; the order of these two variables in the configuration file should not matter, but it did by mistake. * jk/remote-pushremote-config-reading: remote: handle pushremote config in any order | 18 March 2014, 21:04:16 UTC |
| 8aac6c9 | Junio C Hamano | 18 March 2014, 21:04:01 UTC | Merge branch 'jk/commit-dates-parsing-fix' into maint Codepaths that parse timestamps in commit objects have been tightened. * jk/commit-dates-parsing-fix: show_ident_date: fix tz range check log: do not segfault on gmtime errors log: handle integer overflow in timestamps date: check date overflow against time_t fsck: report integer overflow in author timestamps t4212: test bogus timestamps with git-log | 18 March 2014, 21:04:01 UTC |
| a5aca6e | Junio C Hamano | 18 March 2014, 21:03:41 UTC | Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint "git diff --external-diff" incorrectly fed the submodule directory in the working tree to the external diff driver when it knew it is the same as one of the versions being compared. * tr/diff-submodule-no-reuse-worktree: diff: do not reuse_worktree_file for submodules | 18 March 2014, 21:03:41 UTC |
| 1f56977 | Junio C Hamano | 18 March 2014, 21:03:24 UTC | Merge branch 'nd/reset-setup-worktree' into maint "git reset" needs to refresh the index when working in a working tree (it can also be used to match the index to the HEAD in an otherwise bare repository), but it failed to set up the working tree properly, causing GIT_WORK_TREE to be ignored. * nd/reset-setup-worktree: reset: optionally setup worktree and refresh index on --mixed | 18 March 2014, 21:03:24 UTC |
| a8b3131 | Junio C Hamano | 18 March 2014, 21:03:03 UTC | Merge branch 'jc/check-attr-honor-working-tree' into maint "git check-attr" when working on a repository with a working tree did not work well when the working tree was specified via the --work-tree (and obviously with --git-dir) option. * jc/check-attr-honor-working-tree: check-attr: move to the top of working tree when in non-bare repository t0003: do not chdir the whole test process | 18 March 2014, 21:03:03 UTC |
| 6d011b8 | Junio C Hamano | 18 March 2014, 21:02:37 UTC | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint "merge-recursive" was broken in 1.7.7 era and stopped working in an empty (temporary) working tree, when there are renames involved. This has been corrected. * bk/refresh-missing-ok-in-merge-recursive: merge-recursive.c: tolerate missing files while refreshing index read-cache.c: extend make_cache_entry refresh flag with options read-cache.c: refactor --ignore-missing implementation t3030-merge-recursive: test known breakage with empty work tree | 18 March 2014, 21:02:38 UTC |
| c7b3173 | Junio C Hamano | 18 March 2014, 21:01:05 UTC | Merge branch 'ds/rev-parse-required-args' into maint "git rev-parse" was loose in rejecting command line arguments that do not make sense, e.g. "--default" without the required value for that option. * ds/rev-parse-required-args: rev-parse: check i before using argv[i] against argc | 18 March 2014, 21:01:05 UTC |
| 6f01667 | Junio C Hamano | 18 March 2014, 21:00:15 UTC | Merge branch 'jk/config-path-include-fix' into maint include.path variable (or any variable that expects a path that can use ~username expansion) in the configuration file is not a boolean, but the code failed to check it. * jk/config-path-include-fix: handle_path_include: don't look at NULL value expand_user_path: do not look at NULL path | 18 March 2014, 21:00:15 UTC |
| 34120a5 | Junio C Hamano | 18 March 2014, 20:59:55 UTC | Merge branch 'nd/diff-quiet-stat-dirty' into maint "git diff --quiet -- pathspec1 pathspec2" sometimes did not return correct status value. * nd/diff-quiet-stat-dirty: diff: do not quit early on stat-dirty files diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later | 18 March 2014, 20:59:56 UTC |
| 1030d4c | Junio C Hamano | 18 March 2014, 20:59:37 UTC | Merge branch 'nd/http-fetch-shallow-fix' into maint Attempting to deepen a shallow repository by fetching over smart HTTP transport failed in the protocol exchange, when no-done extension was used. The fetching side waited for the list of shallow boundary commits after the sending end stopped talking to it. * nd/http-fetch-shallow-fix: t5537: move http tests out to t5539 fetch-pack: fix deepen shallow over smart http with no-done cap protocol-capabilities.txt: document no-done protocol-capabilities.txt: refer multi_ack_detailed back to pack-protocol.txt pack-protocol.txt: clarify 'obj-id' in the last ACK after 'done' test: rename http fetch and push test files tests: auto-set LIB_HTTPD_PORT from test name | 18 March 2014, 20:59:37 UTC |
| 6a0556e | Junio C Hamano | 18 March 2014, 20:58:58 UTC | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maint Allow "git cmd path/", when the 'path' is where a submodule is bound to the top-level working tree, to match 'path', despite the extra and unnecessary trailing slash (such a slash is often given by command line completion). * nd/submodule-pathspec-ending-with-slash: clean: use cache_name_is_other() clean: replace match_pathspec() with dir_path_match() pathspec: pass directory indicator to match_pathspec_item() match_pathspec: match pathspec "foo/" against directory "foo" dir.c: prepare match_pathspec_item for taking more flags pathspec: rename match_pathspec_depth() to match_pathspec() pathspec: convert some match_pathspec_depth() to dir_path_match() pathspec: convert some match_pathspec_depth() to ce_path_match() | 18 March 2014, 20:58:58 UTC |
| 1f2e108 | Jeff King | 10 March 2014, 17:24:47 UTC | clean: simplify dir/not-dir logic When we get a list of paths from read_directory, we further prune it to create the final list of items to remove. The code paths for directories and non-directories repeat the same "add to list" code. This patch restructures the code so that we don't repeat ourselves. Also, by following a "if (condition) continue" pattern like the pathspec check above, it makes it more obvious that the conditional is about excluding directories under certain circumstances. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2014, 19:14:25 UTC |
| cf424f5 | Jeff King | 10 March 2014, 20:37:30 UTC | clean: respect pathspecs with "-d" git-clean uses read_directory to fill in a `struct dir` with potential hits. However, read_directory does not actually check against our pathspec. It uses a simplified version that may turn up false positives. As a result, we need to check that any hits match our pathspec. We do so reliably for non-directories. For directories, if "-d" is not given we check that the pathspec matched exactly (i.e., we are even stricter, and require an explicit "git clean foo" to clean "foo/"). But if "-d" is given, rather than relaxing the exact match to allow a recursive match, we do not check the pathspec at all. This regression was introduced in 113f10f (Make git-clean a builtin, 2007-11-11). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2014, 19:13:42 UTC |
| 3f419d4 | Jeff King | 07 March 2014, 17:15:01 UTC | show_ident_date: fix tz range check Commit 1dca155fe3fa (log: handle integer overflow in timestamps, 2014-02-24) tried to catch integer overflow coming from strtol() on the timezone field by comparing against LONG_MIN/LONG_MAX. However, the intermediate "tz" variable is an "int", which means it can never be LONG_MAX on LP64 systems; we would truncate the output from strtol before the comparison. Clang's -Wtautological-constant-out-of-range-compare notices this and rightly complains. Let's instead store the result of strtol in a long, and then compare it against INT_MIN/INT_MAX. This will catch overflow from strtol, and also overflow when we pass the result as an int to show_date. Reported-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2014, 19:53:29 UTC |
| fcfec8b | Junio C Hamano | 05 March 2014, 09:23:35 UTC | t7800: add a difftool test for .git-files Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 20:20:23 UTC |
| 16216b6 | Sandy Carter | 03 March 2014, 14:55:53 UTC | i18n: proposed command missing leading dash Add missing leading dash to proposed commands in french output when using the command: git branch --set-upstream remotename/branchname and when upstream is gone Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2014, 14:10:24 UTC |
| f34b205 | Nguyễn Thái Ngọc Duy | 25 January 2014, 06:46:50 UTC | diff: do not quit early on stat-dirty files When QUICK is set (i.e. with --quiet) we try to do as little work as possible, stopping after seeing the first change. stat-dirty is considered a "change" but it may turn out not, if no actual content is changed. The actual content test is performed too late in the process and the shortcut may be taken prematurely, leading to incorrect return code. Assume we do "git diff --quiet". If we have a stat-dirty file "a" and a really dirty file "b". We break the loop in run_diff_files() and stop after "a" because we have got a "change". Later in diffcore_skip_stat_unmatch() we find out "a" is actually not changed. But there's nothing else in the diff queue, we incorrectly declare "no change", ignoring the fact that "b" is changed. This also happens to "git diff --quiet HEAD" when it hits diff_can_quit_early() in oneway_diff(). This patch does the content test earlier in order to keep going if "a" is unchanged. The test result is cached so that when diffcore_skip_stat_unmatch() is done in the end, we spend no cycles on re-testing "a". Reported-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:50:14 UTC |
| fceb907 | Nguyễn Thái Ngọc Duy | 25 January 2014, 06:46:49 UTC | diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:50:03 UTC |
| 2e70c01 | Nguyễn Thái Ngọc Duy | 24 January 2014, 13:40:35 UTC | clean: use cache_name_is_other() cmd_clean() has the exact same code of index_name_is_other(). Reduce code duplication. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:37:24 UTC |
| 05b8502 | Nguyễn Thái Ngọc Duy | 24 January 2014, 13:40:34 UTC | clean: replace match_pathspec() with dir_path_match() This instance was left out when many match_pathspec() call sites that take input from dir_entry were converted to dir_path_match() because it passed a path with the trailing slash stripped out to match_pathspec() while the others did not. Stripping for all call sites back then would be a regression because match_pathspec() did not know how to match pathspec foo/ against _directory_ foo (the stripped version of path "foo/"). match_pathspec() knows how to do it now. And dir_path_match() strips the trailing slash also. Use the new function, because the stripping code is removed in the next patch. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:37:24 UTC |
| ae8d082 | Nguyễn Thái Ngọc Duy | 24 January 2014, 13:40:33 UTC | pathspec: pass directory indicator to match_pathspec_item() This patch activates the DO_MATCH_DIRECTORY code in m_p_i(), which makes "git diff HEAD submodule/" and "git diff HEAD submodule" produce the same output. Previously only the version without trailing slash returns the difference (if any). That's the effect of new ce_path_match(). dir_path_match() is not executed by the new tests. And it should not introduce regressions. Previously if path "dir/" is passed in with pathspec "dir/", they obviously match. With new dir_path_match(), the path becomes _directory_ "dir" vs pathspec "dir/", which is not executed by the old code path in m_p_i(). The new code path is executed and produces the same result. The other case is pathspec "dir" and path "dir/" is now turned to "dir" (with DO_MATCH_DIRECTORY). Still the same result before or after the patch. So why change? Because of the next patch about clean.c. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:37:19 UTC |
| 68690fd | Nguyễn Thái Ngọc Duy | 24 January 2014, 13:40:32 UTC | match_pathspec: match pathspec "foo/" against directory "foo" Currently we do support matching pathspec "foo/" against directory "foo". That is because match_pathspec() has no way to tell "foo" is a directory and matching "foo/" against _file_ "foo" is wrong. The callers can now tell match_pathspec if "foo" is a directory, we could make an exception for this case. Code is not executed though because no callers pass the flag yet. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:37:19 UTC |
| 42b0874 | Nguyễn Thái Ngọc Duy | 24 January 2014, 13:40:31 UTC | dir.c: prepare match_pathspec_item for taking more flags Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:37:19 UTC |
| 854b095 | Nguyễn Thái Ngọc Duy | 24 January 2014, 13:40:30 UTC | pathspec: rename match_pathspec_depth() to match_pathspec() A long time ago, for some reason I was not happy with match_pathspec(). I created a better version, match_pathspec_depth() that was suppose to replace match_pathspec() eventually. match_pathspec() has finally been gone since 6 months ago. Use the shorter name for match_pathspec_depth(). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:37:14 UTC |
| ebb3289 | Nguyễn Thái Ngọc Duy | 24 January 2014, 13:40:29 UTC | pathspec: convert some match_pathspec_depth() to dir_path_match() This helps reduce the number of match_pathspec_depth() call sites and show how m_p_d() is used. And it usage is: - match against an index entry (ce_path_match or match_pathspec_depth in ls-files) - match against a dir_entry from read_directory (dir_path_match and match_pathspec_depth in clean.c, which will be converted later) - resolve-undo (rerere.c and ls-files.c) Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:37:09 UTC |
| 429bb40 | Nguyễn Thái Ngọc Duy | 24 January 2014, 13:40:28 UTC | pathspec: convert some match_pathspec_depth() to ce_path_match() This helps reduce the number of match_pathspec_depth() call sites and show how match_pathspec_depth() is used. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:36:52 UTC |
| 6e2068a | Brad King | 27 January 2014, 14:45:09 UTC | merge-recursive.c: tolerate missing files while refreshing index Teach add_cacheinfo to tell make_cache_entry to skip refreshing stat information when a file is missing from the work tree. We do not want the index to be stat-dirty after the merge but also do not want to fail when a file happens to be missing. This fixes the 'merge-recursive w/ empty work tree - ours has rename' case in t3030-merge-recursive. Suggested-by: Elijah Newren <newren@gmail.com> Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:31:30 UTC |
| 2576272 | Brad King | 27 January 2014, 14:45:08 UTC | read-cache.c: extend make_cache_entry refresh flag with options Convert the make_cache_entry boolean 'refresh' argument to a more general 'refresh_options' argument. Pass the value through to the underlying refresh_cache_ent call. Add option CE_MATCH_REFRESH to enable stat refresh. Update call sites to use the new signature. Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:31:17 UTC |
| 2e2e7ec | Brad King | 27 January 2014, 14:45:07 UTC | read-cache.c: refactor --ignore-missing implementation Move lstat ENOENT handling from refresh_index to refresh_cache_ent and activate it with a new CE_MATCH_IGNORE_MISSING option. This will allow other call paths into refresh_cache_ent to use the feature. Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:31:10 UTC |
| 29d9af5 | Brad King | 27 January 2014, 14:45:06 UTC | t3030-merge-recursive: test known breakage with empty work tree Sometimes when working with a large repository it can be useful to try out a merge and only check out conflicting files to disk (for example as a speed optimization on a server). Until v1.7.7-rc1~28^2~20 (merge-recursive: When we detect we can skip an update, actually skip it, 2011-08-11), it was possible to do so with the following idiom: # Prepare a temporary index and empty work tree. GIT_INDEX_FILE="$PWD/tmp-$$-index" && export GIT_INDEX_FILE && GIT_WORK_TREE="$PWD/tmp-$$-work" && export GIT_WORK_TREE && mkdir "$GIT_WORK_TREE" && # Convince the index that our side is on disk. git read-tree -i -m $ours && git update-index --ignore-missing --refresh && # Merge their side into our side. bases=$(git merge-base --all $ours $theirs) && git merge-recursive $bases -- $ours $theirs && tree=$(git write-tree) Nowadays, that still works and the exit status is the same, but merge-recursive produces a diagnostic if "our" side renamed a file: error: addinfo_cache failed for path 'dst' Add a test to document this regression. Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 22:30:22 UTC |
| 98b406f | Jeff King | 24 February 2014, 08:59:03 UTC | remote: handle pushremote config in any order The remote we push can be defined either by remote.pushdefault or by branch.*.pushremote for the current branch. The order in which they appear in the config file should not matter to precedence (which should be to prefer the branch-specific config). The current code parses the config linearly and uses a single string to store both values, overwriting any previous value. Thus, config like: [branch "master"] pushremote = foo [remote] pushdefault = bar erroneously ends up pushing to "bar" from the master branch. We can fix this by storing both values and resolving the correct value after all config is read. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 20:53:28 UTC |
| 2b15846 | Jeff King | 24 February 2014, 07:49:05 UTC | log: do not segfault on gmtime errors Many code paths assume that show_date and show_ident_date cannot return NULL. For the most part, we handle missing or corrupt timestamps by showing the epoch time t=0. However, we might still return NULL if gmtime rejects the time_t we feed it, resulting in a segfault. Let's catch this case and just format t=0. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 18:12:58 UTC |
| 1dca155 | Jeff King | 24 February 2014, 07:46:37 UTC | log: handle integer overflow in timestamps If an ident line has a ridiculous date value like (2^64)+1, we currently just pass ULONG_MAX along to the date code, which can produce nonsensical dates. On systems with a signed long time_t (e.g., 64-bit glibc systems), this actually doesn't end up too bad. The ULONG_MAX is converted to -1, we apply the timezone field to that, and the result ends up somewhere between Dec 31, 1969 and Jan 1, 1970. However, there is still a few good reasons to detect the overflow explicitly: 1. On systems where "unsigned long" is smaller than time_t, we get a nonsensical date in the future. 2. Even where it would produce "Dec 31, 1969", it's easier to recognize "midnight Jan 1" as a consistent sentinel value for "we could not parse this". 3. Values which do not overflow strtoul but do overflow a signed time_t produce nonsensical values in the past. For example, on a 64-bit system with a signed long time_t, a timestamp of 18446744073000000000 produces a date in 1947. We also recognize overflow in the timezone field, which could produce nonsensical results. In this case we show the parsed date, but in UTC. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 18:12:58 UTC |
| 7ca36d9 | Jeff King | 24 February 2014, 07:39:45 UTC | date: check date overflow against time_t When we check whether a timestamp has overflowed, we check only against ULONG_MAX, meaning that strtoul has overflowed. However, we also feed these timestamps to system functions like gmtime, which expect a time_t. On many systems, time_t is actually smaller than "unsigned long" (e.g., because it is signed), and we would overflow when using these functions. We don't know the actual size or signedness of time_t, but we can easily check for truncation with a simple assignment. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 18:12:58 UTC |
| d4b8de0 | Jeff King | 24 February 2014, 07:39:04 UTC | fsck: report integer overflow in author timestamps When we check commit objects, we complain if commit->date is ULONG_MAX, which is an indication that we saw integer overflow when parsing it. However, we do not do any check at all for author lines, which also contain a timestamp. Let's actually check the timestamps on each ident line with strtoul. This catches both author and committer lines, and we can get rid of the now-redundant commit->date check. Note that like the existing check, we compare only against ULONG_MAX. Now that we are calling strtoul at the site of the check, we could be slightly more careful and also check that errno is set to ERANGE. However, this will make further refactoring in future patches a little harder, and it doesn't really matter in practice. For 32-bit systems, one would have to create a commit at the exact wrong second in 2038. But by the time we get close to that, all systems will hopefully have moved to 64-bit (and if they haven't, they have a real problem one second later). For 64-bit systems, by the time we get close to ULONG_MAX, all systems will hopefully have been consumed in the fiery wrath of our expanding Sun. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 18:12:58 UTC |
| 7d9a281 | Jeff King | 24 February 2014, 07:36:22 UTC | t4212: test bogus timestamps with git-log When t4212 was originally added by 9dbe7c3d (pretty: handle broken commit headers gracefully, 2013-04-17), it tested our handling of commits with broken ident lines in which the timestamps could not be parsed. It does so using a bogus line like "Name <email>-<> 1234 -0000", because that simulates an error that was seen in the wild. Later, 03818a4 (split_ident: parse timestamp from end of line, 2013-10-14) made our parser smart enough to actually find the timestamp on such a line, and t4212 was adjusted to match. While it's nice that we handle this real-world case, this meant that we were not actually testing the bogus-timestamp case anymore. This patch adds a test with a totally incomprehensible timestamp to make sure we are testing the code path. Note that the behavior is slightly different between regular log output and "--format=%ad". In the former case, we produce a sentinel value and in the latter, we produce an empty string. While at first this seems unnecessarily inconsistent, it matches the original behavior given by 9dbe7c3d. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 18:12:58 UTC |
| 94eaa80 | David Aguilar | 24 February 2014, 03:12:35 UTC | difftool: support repositories with .git-files Modern versions of "git submodule" use .git-files to setup the submodule directory. When run in a "git submodule"-created repository "git difftool --dir-diff" dies with the following error: $ git difftool -d HEAD~ fatal: This operation must be run in a work tree diff --raw --no-abbrev -z HEAD~: command returned error: 128 core.worktree is relative to the .git directory but the logic in find_worktree() does not account for it. Use `git rev-parse --show-toplevel` to find the worktree so that the dir-diff feature works inside a submodule. Reported-by: Gábor Lipták <gabor.liptak@gmail.com> Helped-by: Jens Lehmann <jens.lehmann@web.de> Helped-by: John Keeping <john@keeping.me.uk> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2014, 17:53:57 UTC |
| b7756d4 | Nguyễn Thái Ngọc Duy | 16 February 2014, 02:28:03 UTC | reset: optionally setup worktree and refresh index on --mixed Refreshing index requires work tree. So we have two options: always set up work tree (and refuse to reset if failing to do so), or make refreshing index optional. As refreshing index is not the main task, it makes more sense to make it optional. This allows us to still work in a bare repository to update what is in the index. Reported-by: Patrick Palka <patrick@parcs.ath.cx> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2014, 22:40:23 UTC |
| aba4727 | Thomas Rast | 16 February 2014, 16:52:34 UTC | diff: do not reuse_worktree_file for submodules The GIT_EXTERNAL_DIFF calling code attempts to reuse existing worktree files for the worktree side of diffs, for performance reasons. However, that code also tries to do the same with submodules. This results in calls to $GIT_EXTERNAL_DIFF where the old-file is a file of the form "Submodule commit $sha1", but the new-file is a directory in the worktree. Fix it by never reusing a worktree "file" in the submodule case. Reported-by: Grégory Pakosz <gregory.pakosz@gmail.com> Signed-off-by: Thomas Rast <tr@thomasrast.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2014, 20:06:08 UTC |
| 5f95c9f | Junio C Hamano | 14 February 2014, 19:35:04 UTC | Git 1.9.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2014, 19:35:04 UTC |
| 9c8ce73 | Michael J Gruber | 13 February 2014, 10:35:08 UTC | release notes: typo fixes Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2014, 19:22:56 UTC |
| 475c52b | Junio C Hamano | 13 February 2014, 21:42:26 UTC | Sync with 1.8.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2014, 21:42:26 UTC |
| 7bbc4e8 | Junio C Hamano | 13 February 2014, 21:40:47 UTC | Git 1.8.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2014, 21:41:53 UTC |
| 2cd8616 | Junio C Hamano | 13 February 2014, 21:38:59 UTC | Merge branch 'bm/merge-base-octopus-dedup' into maint "git merge-base --octopus" used to leave cleaning up suboptimal result to the caller, but now it does the clean-up itself. * bm/merge-base-octopus-dedup: merge-base --octopus: reduce the result from get_octopus_merge_bases() merge-base: separate "--independent" codepath into its own helper | 13 February 2014, 21:38:59 UTC |
| 5032098 | Junio C Hamano | 13 February 2014, 21:38:47 UTC | Merge branch 'jc/revision-range-unpeel' into maint "git log --left-right A...B" lost the "leftness" of commits reachable from A when A is a tag as a side effect of a recent bugfix. This is a regression in 1.8.4.x series. * jc/revision-range-unpeel: revision: propagate flag bits from tags to pointees revision: mark contents of an uninteresting tree uninteresting | 13 February 2014, 21:38:47 UTC |
| c337684 | Junio C Hamano | 13 February 2014, 21:38:34 UTC | Merge branch 'jk/allow-fetch-onelevel-refname' into maint "git clone" would fail to clone from a repository that has a ref directly under "refs/", e.g. "refs/stash", because different validation paths do different things on such a refname. Loosen the client side's validation to allow such a ref. * jk/allow-fetch-onelevel-refname: fetch-pack: do not filter out one-level refs | 13 February 2014, 21:38:34 UTC |
| 21261fa | Junio C Hamano | 13 February 2014, 21:38:25 UTC | Merge branch 'jk/interpret-branch-name-fix' into maint A handful of bugs around interpreting $branch@{upstream} notation and its lookalike, when $branch part has interesting characters, e.g. "@", and ":", have been fixed. * jk/interpret-branch-name-fix: interpret_branch_name: find all possible @-marks interpret_branch_name: avoid @{upstream} past colon interpret_branch_name: always respect "namelen" parameter interpret_branch_name: rename "cp" variable to "at" interpret_branch_name: factor out upstream handling | 13 February 2014, 21:38:25 UTC |
| 7c9b668 | Junio C Hamano | 13 February 2014, 21:38:19 UTC | Merge branch 'rk/send-email-ssl-cert' into maint A recent update to "git send-email" broke platforms where /etc/ssl/certs/ directory exists but cannot be used as SSL_ca_path (e.g. Fedora rawhide). * rk/send-email-ssl-cert: send-email: /etc/ssl/certs/ directory may not be usable as ca_path | 13 February 2014, 21:38:19 UTC |
| 90791e3 | Junio C Hamano | 13 February 2014, 21:38:09 UTC | Merge branch 'sb/repack-in-c' into maint "git repack --max-pack-size=8g" stopped being parsed correctly when the command was reimplemented in C. * sb/repack-in-c: repack: propagate pack-objects options as strings repack: make parsed string options const-correct repack: fix typo in max-pack-size option | 13 February 2014, 21:38:09 UTC |
| b4e931d | Junio C Hamano | 13 February 2014, 21:37:53 UTC | Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint The pathspec matching code, while comparing two trees (e.g. "git diff A B -- path1 path2") was too aggressive and failed to match some paths when multiple pathspecs were involved. * as/tree-walk-fix-aggressive-short-cut: tree_entry_interesting: match against all pathspecs | 13 February 2014, 21:37:53 UTC |
| 0232852 | Nguyễn Thái Ngọc Duy | 13 February 2014, 13:21:14 UTC | t5537: move http tests out to t5539 start_httpd is supposed to be at the beginning of the test file, not the middle of it. The "test_seq" line in "no shallow lines.." test is updated to compensate missing refs that are there in t5537, but not in the new t5539. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2014, 18:10:00 UTC |
| bc97e2d | Junio C Hamano | 12 February 2014, 20:28:47 UTC | Merge git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: de.po: correct message when hiding commits by craft l10n: de.po: translate 28 new messages | 12 February 2014, 20:28:47 UTC |
| 92cd3e3 | Ralf Thielow | 08 February 2014, 21:01:36 UTC | l10n: de.po: correct message when hiding commits by craft The recent translation was giving the idea that all commits based on a graft were meant to be hidden. Make it clear that it is the graft commit itself. Reported-by: David Kastrup <dak@gnu.org> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 12 February 2014, 06:16:03 UTC |
| 0dd2a2c | Ralf Thielow | 03 January 2014, 17:38:12 UTC | l10n: de.po: translate 28 new messages Translate 28 new messages came from git.pot update in df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed) and d57b24b (l10n: git.pot: v1.9 round 2 (1 new)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 12 February 2014, 06:15:55 UTC |
| e265f1f | Junio C Hamano | 11 February 2014, 19:02:05 UTC | Merge git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: zh_CN.po: Disambiguation for rebase l10n: zh_CN.po: translate 1 new message (2211t0f0u) l10n: vi.po (2211t): Updated one new string l10n: Update Swedish translation (2211t0f0u) l10n: fr: 1.9rc2 2211t l10n: git.pot: v1.9 round 2 (1 new) | 11 February 2014, 19:02:05 UTC |
| ff62eca | Nguyễn Thái Ngọc Duy | 06 February 2014, 15:10:39 UTC | fetch-pack: fix deepen shallow over smart http with no-done cap In smart http, upload-pack adds new shallow lines at the beginning of each rpc response. Only shallow lines from the first rpc call are useful. After that they are thrown away. It's designed this way because upload-pack is stateless and has no idea when its shallow lines are helpful or not. So after refs are negotiated with multi_ack_detailed and the server thinks it learned enough, it sends "ACK obj-id ready", terminates the rpc call and waits for the final rpc round. The client sends "done". The server sends another response, which also has shallow lines at the beginning, and the last "ACK obj-id" line. When no-done is active, the last round is cut out, the server sends "ACK obj-id ready" and "ACK obj-id" in the same rpc response. fetch-pack is updated to recognize this and not send "done". However it still tries to consume shallow lines, which are never sent. Update the code, make sure to skip consuming shallow lines when no-done is enabled. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2014, 18:21:33 UTC |
| c9cd60f | Nguyễn Thái Ngọc Duy | 06 February 2014, 15:10:38 UTC | protocol-capabilities.txt: document no-done See 3e63b21 (upload-pack: Implement no-done capability - 2011-03-14) and 761ecf0 (fetch-pack: Implement no-done capability - 2011-03-14) for more information. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2014, 18:21:33 UTC |
| 087e347 | Nguyễn Thái Ngọc Duy | 06 February 2014, 15:10:37 UTC | protocol-capabilities.txt: refer multi_ack_detailed back to pack-protocol.txt pack-protocol.txt explains in detail how multi_ack_detailed works and what's the difference between no multi_ack, multi_ack and multi_ack_detailed. No need to repeat here. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2014, 18:21:33 UTC |
| 32752e9 | Nguyễn Thái Ngọc Duy | 06 February 2014, 15:10:36 UTC | pack-protocol.txt: clarify 'obj-id' in the last ACK after 'done' It's introduced in 1bd8c8f (git-upload-pack: Support the multi_ack protocol - 2005-10-28) but probably better documented in the commit message of 78affc4 (Add multi_ack_detailed capability to fetch-pack/upload-pack - 2009-10-30). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2014, 18:21:33 UTC |
| a876793 | Nguyễn Thái Ngọc Duy | 06 February 2014, 15:10:34 UTC | test: rename http fetch and push test files Make clear which one is for dumb protocol, which one is for smart from their file name. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2014, 18:21:06 UTC |
| 3bb486e | Jeff King | 10 February 2014, 14:39:48 UTC | tests: auto-set LIB_HTTPD_PORT from test name We set the default apache port for each of the httpd tests to the 4-digit test number of the test script. We want these to remain unique so that the tests do not conflict with each other when run in parallel. Instead of doing it manually in each test script, let's just set it from the test name at run time. This is simpler, and is one less thing to be updated when test scripts are renamed (e.g., when being re-rolled or when conflicting after being merged with another topic). Incidentally, this fixes a case where t5537 and t5538 used the same port number (5537), and could conflict with each other when run in parallel. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2014, 18:20:45 UTC |
| 6a70719 | Junio C Hamano | 07 February 2014, 19:56:07 UTC | Git 1.9.0-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 February 2014, 19:56:07 UTC |
| efe5f1d | Junio C Hamano | 07 February 2014, 19:55:11 UTC | Merge branch 'ow/manpages-typofix' Various typofixes, all looked correct. * ow/manpages-typofix: Documentation: fix typos in man pages | 07 February 2014, 19:55:12 UTC |
| c256661 | Junio C Hamano | 07 February 2014, 19:55:10 UTC | Merge branch 'aj/ada-diff-word-pattern' * aj/ada-diff-word-pattern: userdiff: update Ada patterns | 07 February 2014, 19:55:10 UTC |
| 53c2a59 | Junio C Hamano | 07 February 2014, 19:55:06 UTC | Merge branch 'nd/tag-doc' * nd/tag-doc: git-tag.txt: <commit> for --contains is optional | 07 February 2014, 19:55:07 UTC |
| cdbf623 | Junio C Hamano | 06 February 2014, 18:19:33 UTC | check-attr: move to the top of working tree when in non-bare repository Lasse Makholm noticed that running "git check-attr" from a place totally unrelated to $GIT_DIR and $GIT_WORK_TREE does not give expected results. I think it is because the command does not say it wants to call setup_work_tree(). We still need to support use cases where only a bare repository is involved, so unconditionally requiring a working tree would not work well. Instead, make a call only in a non-bare repository. We may want to see if we want to do a similar fix in the opposite direction to check-ignore. The command unconditionally requires a working tree, but it should be usable in a bare repository just like check-attr attempts to be. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2014, 18:19:33 UTC |
| c4a7bce | Junio C Hamano | 06 February 2014, 18:16:27 UTC | t0003: do not chdir the whole test process Moving to some other directory and letting the remainder of the test pieces to expect that they start there is a bad practice. The test that contains chdir itself may fail (or by mistake skipped via the GIT_SKIP_TESTS mechanism) in which case the remainder may operate on files in unexpected places. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2014, 18:16:27 UTC |
| 98b2761 | Jiang Xin | 02 February 2014, 12:46:58 UTC | l10n: zh_CN.po: Disambiguation for rebase Disambiguate the Chinese translation for "rebase", and update other related entries. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 06 February 2014, 15:15:33 UTC |
| 5fe8f49 | Øystein Walle | 05 February 2014, 22:19:43 UTC | Documentation: fix typos in man pages Signed-off-by: Øystein Walle <oystwa@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2014, 22:35:45 UTC |
| 89ba81d | Junio C Hamano | 05 February 2014, 22:14:40 UTC | Sync with 1.8.5.4 | 05 February 2014, 22:14:40 UTC |
| c7b8cf4 | Junio C Hamano | 31 January 2014, 23:14:05 UTC | howto/maintain-git.txt: new version numbering scheme We wanted to call the upcoming release "Git 1.9", with its maintenance track being "Git 1.9.1", "Git 1.9.2", etc., but various third-party tools are reported to assume that there are at least three dewey-decimal components in our version number. Adjust the plan so that vX.Y.0 are feature releases while vX.Y.Z (Z > 0) are maintenance releases. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2014, 22:14:00 UTC |
| 3330a2c | Junio C Hamano | 05 February 2014, 22:05:31 UTC | Git 1.8.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2014, 22:13:23 UTC |
| 01a5774 | Junio C Hamano | 05 February 2014, 22:03:47 UTC | Merge branch 'jc/maint-pull-docfix' into maint The documentation to "git pull" hinted there is an "-m" option because it incorrectly shared the documentation with "git merge". * jc/maint-pull-docfix: Documentation: "git pull" does not have the "-m" option Documentation: exclude irrelevant options from "git pull" | 05 February 2014, 22:03:47 UTC |
| a74a682 | Junio C Hamano | 05 February 2014, 22:03:20 UTC | Merge branch 'ow/stash-with-ifs' into maint The implementation of 'git stash $cmd "stash@{...}"' did not quote the stash argument properly and left it split at IFS whitespace. * ow/stash-with-ifs: stash: handle specifying stashes with $IFS | 05 February 2014, 22:03:20 UTC |
| 3c86474 | Junio C Hamano | 05 February 2014, 22:03:01 UTC | Merge branch 'js/lift-parent-count-limit' into maint There is no reason to have a hardcoded upper limit of the number of parents for an octopus merge, created via the graft mechanism, but there was. * js/lift-parent-count-limit: Remove the line length limit for graft files | 05 February 2014, 22:03:01 UTC |
| ee5788e | Junio C Hamano | 05 February 2014, 22:02:44 UTC | Merge branch 'nd/add-empty-fix' into maint "git add -A" (no other arguments) in a totally empty working tree used to emit an error. * nd/add-empty-fix: add: don't complain when adding empty project root | 05 February 2014, 22:02:44 UTC |
| d11ade7 | Junio C Hamano | 05 February 2014, 22:02:05 UTC | Merge branch 'bc/log-decoration' into maint "git log --decorate" did not handle a tag pointed by another tag nicely. * bc/log-decoration: log: properly handle decorations with chained tags | 05 February 2014, 22:02:05 UTC |
| 2885624 | Junio C Hamano | 05 February 2014, 22:01:23 UTC | Merge branch 'jh/rlimit-nofile-fallback' into maint When we figure out how many file descriptors to allocate for keeping packfiles open, a system with non-working getrlimit() could cause us to die(), but because we make this call only to get a rough estimate of how many is available and we do not even attempt to use up all file descriptors available ourselves, it is nicer to fall back to a reasonable low value rather than dying. * jh/rlimit-nofile-fallback: get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure | 05 February 2014, 22:01:23 UTC |
| a118bee | Junio C Hamano | 05 February 2014, 22:01:09 UTC | Merge branch 'jl/commit-v-strip-marker' into maint "git commit -v" appends the patch to the log message before editing, and then removes the patch when the editor returned control. However, the patch was not stripped correctly when the first modified path was a submodule. * jl/commit-v-strip-marker: commit -v: strip diffs and submodule shortlogs from the commit message | 05 February 2014, 22:01:09 UTC |
| ac0835f | Junio C Hamano | 05 February 2014, 22:00:18 UTC | Merge branch 'tr/send-email-ssl' into maint SSL-related options were not passed correctly to underlying socket layer in "git send-email". * tr/send-email-ssl: send-email: set SSL options through IO::Socket::SSL::set_client_defaults send-email: --smtp-ssl-cert-path takes an argument send-email: pass Debug to Net::SMTP::SSL::new | 05 February 2014, 22:00:18 UTC |
| 1a11195 | Junio C Hamano | 05 February 2014, 21:59:16 UTC | Merge branch 'tb/clone-ssh-with-colon-for-port' into maint Remote repository URL expressed in scp-style host:path notation are parsed more carefully (e.g. "foo/bar:baz" is local, "[::1]:/~user" asks to connect to user's home directory on host at address ::1. * tb/clone-ssh-with-colon-for-port: git_connect(): use common return point connect.c: refactor url parsing git_connect(): refactor the port handling for ssh git fetch: support host:/~repo t5500: add test cases for diag-url git fetch-pack: add --diag-url git_connect: factor out discovery of the protocol and its parts git_connect: remove artificial limit of a remote command t5601: add tests for ssh t5601: remove clear_ssh, refactor setup_ssh_wrapper | 05 February 2014, 21:59:16 UTC |
| bf03d6e | Junio C Hamano | 05 February 2014, 21:58:51 UTC | Merge branch 'nd/transport-positive-depth-only' into maint "git fetch --depth=0" was a no-op, and was silently ignored. Diagnose it as an error. * nd/transport-positive-depth-only: clone,fetch: catch non positive --depth option value | 05 February 2014, 21:58:52 UTC |
| 2171c0c | Junio C Hamano | 05 February 2014, 20:02:29 UTC | Merge branch 'tb/repack-fix-renames' (early part) Finishing touches to the "rewrite repack in C" series. * 'tb/repack-fix-renames' (early part): repack.c: rename and unlink pack file if it exists | 05 February 2014, 20:02:29 UTC |
| 9d7fbfd | Torsten Bögershausen | 02 February 2014, 15:09:56 UTC | repack.c: rename and unlink pack file if it exists When a repo was fully repacked, and is repacked again, we may run into the situation that "new" packfiles have the same name as already existing ones (traditionally packfiles have been named after the list of names of objects in them, so repacking all the objects in a single pack would have produced a packfile with the same name). The logic is to rename the existing ones into filename like "old-XXX", create the new ones and then remove the "old-" ones. When something went wrong in the middle, this sequence is rolled back by renaming the "old-" files back. The renaming into "old-" did not work as intended, because file_exists() was done on "XXX", not "pack-XXX". Also when rolling back the change, the code tried to rename "old-pack-XXX" but the saved ones are named "old-XXX", so this couldn't have worked. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2014, 19:58:49 UTC |
| 39a87a2 | Adrian Johnson | 03 February 2014, 11:33:16 UTC | userdiff: update Ada patterns - Allow extra space in "is new" and "is separate" - Fix bug in word regex for numbers Signed-off-by: Adrian Johnson <ajohnson@redneon.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2014, 18:45:51 UTC |
| 81966ab | Nguyễn Thái Ngọc Duy | 04 February 2014, 02:56:26 UTC | git-tag.txt: <commit> for --contains is optional This goes far back to e84fb2f (branch --contains: default to HEAD - 2008-07-08) where the same parsing code is shared with builtin/tag.c. git-branch.txt correctly states that <commit> for --contains is optional while git-tag.txt does not. Correct it. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2014, 18:35:58 UTC |
| 8376b58 | Jiang Xin | 02 February 2014, 12:46:58 UTC | l10n: zh_CN.po: translate 1 new message (2211t0f0u) Update translation for git v1.9-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 03 February 2014, 02:53:18 UTC |
| afa4128 | Jiang Xin | 03 February 2014, 01:47:27 UTC | Merge branch 'master' of git://github.com/nafmo/git-l10n-sv * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: Update Swedish translation (2211t0f0u) | 03 February 2014, 01:47:27 UTC |
| e8f4a7c | Jiang Xin | 03 February 2014, 01:45:14 UTC | Merge branch 'master' of git://github.com/vnwildman/git * 'master' of git://github.com/vnwildman/git: l10n: vi.po (2211t): Updated one new string | 03 February 2014, 01:45:14 UTC |
| 8620ed5 | Tran Ngoc Quan | 03 February 2014, 00:49:47 UTC | l10n: vi.po (2211t): Updated one new string Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 03 February 2014, 00:49:47 UTC |
| b6c0df8 | Peter Krefting | 02 February 2014, 16:22:21 UTC | l10n: Update Swedish translation (2211t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 02 February 2014, 16:22:21 UTC |
| 893fcc3 | Jean-Noel Avila | 02 February 2014, 13:36:32 UTC | l10n: fr: 1.9rc2 2211t Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 02 February 2014, 13:38:05 UTC |
| d57b24b | Jiang Xin | 01 February 2014, 00:07:02 UTC | l10n: git.pot: v1.9 round 2 (1 new) Generate po/git.pot from v1.9-rc2 for git v1.9 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 01 February 2014, 00:07:02 UTC |
| be961c2 | Junio C Hamano | 31 January 2014, 22:16:06 UTC | Git 1.9-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2014, 22:16:06 UTC |
| e94ea16 | Junio C Hamano | 31 January 2014, 18:52:29 UTC | Merge git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: Bulgarian translation of git (222t21f1967u) po/TEAMS: Added Bulgarian team l10n: remove 2 blank translations on Danish, Dutch l10n: zh_CN.po: translate 27 messages (2210t0f0u) l10n: Update Swedish translation (2210t0f0u) [fr] update french translation 2210/2210 l10n: vi.po (2210t): Updated git-core translation l10n: git.pot: v1.9 round 1 (27 new, 11 removed) | 31 January 2014, 18:52:29 UTC |
| 3de92cd | Junio C Hamano | 31 January 2014, 18:51:57 UTC | Merge branch 'jn/pager-lv-default-env' A finishing touch to its test. * jn/pager-lv-default-env: pager test: make fake pager consume all its input | 31 January 2014, 18:51:57 UTC |
| 52c02f6 | Jonathan Nieder | 30 January 2014, 16:42:32 UTC | pager test: make fake pager consume all its input Otherwise there is a race: if 'git log' finishes writing before the pager terminates and closes the pipe, all is well, and if the pager finishes quickly enough then 'git log' terminates with SIGPIPE. died of signal 13 at /build/buildd/git-1.9~rc1/t/test-terminal.perl line 33. not ok 6 - LESS and LV envvars are set for pagination Noticed on Ubuntu PPA builders, where the race was lost about half the time. Compare v1.7.0.2~6^2 (tests: Fix race condition in t7006-pager, 2010-02-22). Reported-by: Anders Kaseorg <andersk@MIT.EDU> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2014, 17:07:17 UTC |
