git/t, branch v2.2.0

Merge branch 'tb/no-relative-file-url'

2014-11-19T21:47:53Z

* tb/no-relative-file-url: t5705: the file:// URL should be absolute

Merge branch 'da/difftool'

2014-11-18T18:16:55Z

Fix-up to a new feature in 'master'. * da/difftool: difftool: honor --trust-exit-code for builtin tools

difftool: honor --trust-exit-code for builtin tools

2014-11-14T21:40:38Z

run_merge_tool() was not setting $status, which prevented the exit code for builtin tools from being forwarded to the caller. Capture the exit status and add a test to guarantee the behavior. Reported-by: Adria Farres <14farresa@gmail.com> Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

t5705: the file:// URL should be absolute

2014-11-13T18:41:56Z

The test misused a URL "file://." to mean "relative to here", which we no longer accept. In a file:// URL, typically there is no host, and RFC1738 says that file:/// should be used. Update t5705 to use a working URL. Reported-by: Michael Blume Signed-off-by: Torsten Bögershausen Signed-off-by: Junio C Hamano

Merge branch 'jk/fetch-reflog-df-conflict'

2014-11-12T19:59:58Z

Fix-up a test for portability. * jk/fetch-reflog-df-conflict: t1410: fix breakage on case-insensitive filesystems

t1410: fix breakage on case-insensitive filesystems

2014-11-10T17:38:53Z

Two tests recently added to t1410 create branches "a" and "a/b" to test d/f conflicts on reflogs. Earlier, unrelated tests in that script create the path "A/B" in the working tree. There's no conflict on a case-sensitive filesystem, but on a case-insensitive one, "git log" will complain that "a/b" is both a revision and a working tree path. We could fix this by using a "--" to disambiguate, but we are probably better off using names that are less confusing to make it more clear that they are unrelated to the working tree files. This patch turns "a/b" into "one/two". Reported-by: Michael Blume Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'tm/line-log-first-parent'

2014-11-06T18:52:37Z

"git log --first-parent -L..." used to crash. * tm/line-log-first-parent: line-log: fix crash when --first-parent is used

Merge branch 'jk/fetch-reflog-df-conflict'

2014-11-06T18:52:32Z

Corner-case bugfixes for "git fetch" around reflog handling. * jk/fetch-reflog-df-conflict: ignore stale directories when checking reflog existence fetch: load all default config at startup

line-log: fix crash when --first-parent is used

2014-11-04T20:47:35Z

line-log tries to access all parents of a commit, but only the first parent has been loaded if "--first-parent" is specified, resulting in a crash. Limit the number of parents to one if "--first-parent" is specified. Reported-by: Eric N. Vander Weele Signed-off-by: Tzvetan Mikov Signed-off-by: Junio C Hamano

ignore stale directories when checking reflog existence

2014-11-04T20:18:44Z

When we update a ref, we have two rules for whether or not we actually update the reflog: 1. If the reflog already exists, we will always append to it. 2. If log_all_ref_updates is set, we will create a new reflog file if necessary. We do the existence check by trying to open the reflog file, either with or without O_CREAT (depending on log_all_ref_updates). If it fails, then we check errno to see what happened. If we were not using O_CREAT and we got ENOENT, the file doesn't exist, and we return success (there isn't a reflog already, and we were not told to make a new one). If we get EISDIR, then there is likely a stale directory that needs to be removed (e.g., there used to be "foo/bar", it was deleted, and the directory "foo" was left. Now we want to create the ref "foo"). If O_CREAT is set, then we catch this case, try to remove the directory, and retry our open. So far so good. But if we get EISDIR and O_CREAT is not set, then we treat this as any other error, which is not right. Like ENOENT, EISDIR is an indication that we do not have a reflog, and we should silently return success (we were not told to create it). Instead, the current code reports this as an error, and we fail to update the ref at all. Note that this is relatively unlikely to happen, as you would have to have had reflogs turned on, and then later turned them off (it could also happen due to a bug in fetch, but that was fixed in the previous commit). However, it's quite easy to fix: we just need to treat EISDIR like ENOENT for the non-O_CREAT case, and silently return (note that this early return means we can also simplify the O_CREAT case). Our new tests cover both cases (O_CREAT and non-O_CREAT). The first one already worked, of course. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano