diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-18 14:02:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 14:02:38 -0700 |
| commit | 6d011b8e3f36fc5b41d2451f488067ee367d7084 (patch) | |
| tree | efaf523a867e7689c8fc6cfb4b7a223d8cd9028b /t/lib-credential.sh | |
| parent | Merge branch 'ds/rev-parse-required-args' into maint (diff) | |
| parent | merge-recursive.c: tolerate missing files while refreshing index (diff) | |
| download | tgif-6d011b8e3f36fc5b41d2451f488067ee367d7084.tar.xz | |
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
Diffstat (limited to 't/lib-credential.sh')
0 files changed, 0 insertions, 0 deletions