Skip to content

[DO NOT MERGE] Rebase to v2.21.0 #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dscho wants to merge 151 commits into from
Closed

[DO NOT MERGE] Rebase to v2.21.0 #122

Changes from 1 commit
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
a2de79d
reset --stdin: trim carriage return from the paths
Apr 5, 2017
15ae0ff
Merge 'gvfs-preamble' into HEAD
dscho Jun 11, 2018
8fb171b
gvfs: start by adding the -gvfs suffix to the version
sanoursa Jan 24, 2017
9fc99b0
gvfs: ensure that the version is based on a GVFS tag
dscho Apr 4, 2017
7e31020
gvfs: add a GVFS-specific header file
Jan 24, 2017
7305e38
gvfs: add the core.gvfs config setting
Jan 24, 2017
ee378e4
gvfs: add the feature to skip writing the index' SHA-1
Jan 24, 2017
dea3597
gvfs: add the feature that blobs may be missing
Jan 24, 2017
cd7014a
gvfs: prevent files to be deleted outside the sparse checkout
May 18, 2016
e439e6a
sparse-checkout: update files with a modify/delete conflict
Feb 22, 2017
9e94a98
sparse-checkout: avoid writing entries with the skip-worktree bit
Mar 1, 2017
5f8e102
fsck: use ERROR_MULTI_PACK_INDEX
derrickstolee Sep 24, 2018
e06eb8e
repack: refactor pack deletion for future use
derrickstolee Dec 17, 2018
13e95e6
Docs: rearrange subcommands for multi-pack-index
derrickstolee Dec 21, 2018
05443a5
multi-pack-index: prepare for 'expire' subcommand
derrickstolee Dec 5, 2018
c9772d2
midx: refactor permutation logic
derrickstolee Dec 5, 2018
6e59547
multi-pack-index: implement 'expire' verb
derrickstolee Dec 5, 2018
aeadfe8
multi-pack-index: prepare 'repack' subcommand
derrickstolee Dec 5, 2018
f295fe6
midx: implement midx_repack()
derrickstolee Dec 5, 2018
57a505d
midx: use more structured data for expire
derrickstolee Jan 4, 2019
0253f80
gvfs: optionally skip reachability checks/upload pack during fetch
May 30, 2016
94e5d2a
Fix reset when using the sparse-checkout feature.
Mar 15, 2017
551acd0
Do not remove files outside the sparse-checkout
Apr 5, 2017
ae101e7
gvfs: ensure all filters and EOL conversions are blocked
Jun 15, 2016
e85d1ba
Add a new run_hook_argv() function
dscho Nov 30, 2016
4445cbe
gvfs: allow "virtualizing" objects
Jan 10, 2017
fe1e47a
gvfs: add global command pre and post hook procs
May 24, 2016
df7ff8e
Hydrate missing loose objects in check_and_freshen()
Mar 15, 2017
1d229a9
Allow hooks to be run before setup_git_directory()
dscho Mar 6, 2017
502045b
Add support for read-object as a background process to retrieve missi…
Jul 18, 2017
a160dbd
gvfs: introduce pre/post command hooks
Jan 24, 2017
b9f19b3
sha1_file: when writing objects, skip the read_object_hook
dscho Sep 8, 2017
5e5e496
t0400: verify that the hook is called correctly from a subdirectory
dscho Mar 16, 2017
d079684
Merge 'read-object-hook' into HEAD
dscho Jun 11, 2018
05e24c6
Pass PID of git process to hooks.
alepauly Apr 10, 2017
43eaae4
pre-command: always respect core.hooksPath
dscho Aug 7, 2017
a7c99e1
Merge 'pre-post-command-hooks' into HEAD
dscho Jun 11, 2018
246f1e4
Merge 'sparse-checkout-fixes' into HEAD
dscho Jun 11, 2018
66bcffe
status: add status.aheadbehind setting
jeffhostetler Jan 9, 2018
4e6e83e
Teach ahead-behind and serialized status to play nicely together
jamill Jan 10, 2018
0d9c5fd
gvfs: refactor loading the core.gvfs config value
Apr 14, 2017
8a3d1e9
status: add warning when a/b calculation takes too long for long/norm…
jeffhostetler Jan 10, 2018
1cce3be
status: add status serialization mechanism
jeffhostetler Aug 22, 2017
1ccd8b2
cache-tree: remove use of strbuf_addf in update_one
Jul 3, 2017
cbc1220
status: ignore status.aheadbehind in porcelain formats
jeffhostetler Feb 5, 2018
24456ab
Merge branch 'serialize_status_gvfs'
dscho Jun 11, 2018
6ebc4ee
status: serialize to path
jeffhostetler Feb 2, 2018
a49236d
fetch: Warn about forced updates after branch list
derrickstolee Feb 15, 2018
bbdfe60
status: reject deserialize in V2 and conflicts
jeffhostetler Feb 7, 2018
029499b
push: add --[no-]show-forced-updates passthrough to fetch
derrickstolee Feb 16, 2018
ec4b184
fetch: Add --[no-]show-forced-updates argument
derrickstolee Feb 1, 2018
a71932d
Merge branch 'ahead-behind-and-serialized-status'
dscho Jun 11, 2018
ee7dcf5
fetch: add documentation for --[no-]show-forced-updates
derrickstolee Feb 21, 2018
7d01a70
Add virtual file system settings and hook proc
benpeart Jan 11, 2018
059a364
Update the virtualfilesystem support
benpeart Jun 7, 2018
bd721de
virtualfilesystem: don't run the virtual file system hook if the inde…
benpeart Aug 1, 2018
555c129
virtualfilesystem: fix bug with symlinks being ignored
benpeart Sep 25, 2018
45dbfaf
virtualfilesystem: check if directory is included
Oct 9, 2018
3b1b6f8
Merge branch 'show-forced-updates'
dscho Jun 11, 2018
53c391e
vfs: fix case where directories not handled correctly
jamill Nov 20, 2018
5390d25
Merge 'forced-updates-after-branch-list'
dscho Jun 11, 2018
bb1c340
status: fix rename reporting when using serialization cache
jeffhostetler Jul 25, 2018
c2a3bef
commit: add generation to pop_most_recent_commit()
derrickstolee Jun 13, 2018
8b6f500
Merge 'virtual-file-system-support'
dscho Jun 11, 2018
a0d2929
status: add comments for ahead_behind_flags in serialization
jeffhostetler Jul 25, 2018
2885646
Merge 'gvfs/ds/generation-numbers-update'
dscho Jun 11, 2018
8ba1998
Merge pull request #6 from jeffhostetler/gvfs-serialize-status-rename
jeffhostetler Jul 26, 2018
8f5767f
serialize-status: serialize global and repo-local exclude file metadata
jeffhostetler Jul 20, 2018
00c5b93
status: deserialization wait
jeffhostetler Jul 25, 2018
328a16e
Merge pull request #1 from jeffhostetler/gvfs-serialize-exclude
jeffhostetler Jul 27, 2018
23af81f
rebase/stash: make post-command hook work again
dscho Oct 12, 2018
c99f315
Merge pull request #7 from jeffhostetler/gvfs-status-serialize-wait
jeffhostetler Jul 31, 2018
3a18fee
read-cache: add post-indexchanged hook
benpeart Mar 16, 2018
44727d0
Merge pull request #36 Avoid `sane_execvp` in `git rebase` and `git s…
derrickstolee Oct 12, 2018
827aafc
read-cache: post-indexchanged hook add skip-worktree bit changing sup…
benpeart Mar 19, 2018
472cd84
send-pack: do not check for sha1 file when GVFS_MISSING_OK set
Nov 16, 2018
520a846
Merge pull request #24 Match multi-pack-index feature from upstream
dscho Oct 18, 2018
7b5e9a5
read-cache: add test for post-indexchanged hook
benpeart Mar 19, 2018
1ac2982
Add documentation for the post-indexchanged hook
Oct 30, 2018
50ede04
Merge pull request #68 send-pack do not check for sha1 file when GVFS…
Nov 27, 2018
24037e0
update the reset --quiet path codepath to pass the correct flags to t…
benpeart Dec 12, 2018
343e1d4
Merge pull request #64 Index changed hook
Nov 29, 2018
424b79e
gvfs: block unsupported commands when running in a GVFS repo
benpeart Dec 6, 2018
ea8025e
Merge pull request #93 from benpeart/reset-quiet-post-indexchanged
benpeart Dec 13, 2018
623bd7f
BRANCHES.md: Add explanation of branches and using forks
Jul 27, 2018
aab0bcb
Merge pull request #91 from benpeart/block-commands
benpeart Dec 13, 2018
712f212
Merge pull request #98 Add explanation of branches and using forks
Dec 19, 2018
e758b5f
Merge pull request #84 Create 'expire' and 'repack' subcommands for m…
derrickstolee Dec 21, 2018
79546de
Merge pull request #107 use more structured data for midx expire
derrickstolee Jan 4, 2019
22c3634
MSVC: include compat/win32/path-utils.h for MSVC, too, for real_path()
csware Apr 8, 2019
4db5c20
trace2: Documentation/technical/api-trace2.txt
jeffhostetler Feb 22, 2019
336f65a
trace2: create new combined trace facility
jeffhostetler Feb 22, 2019
f958588
trace2: collect Windows-specific process information
jeffhostetler Feb 22, 2019
8fab568
trace2:data: add trace2 regions to wt-status
jeffhostetler Feb 22, 2019
0de615f
trace2:data: add editor/pager child classification
jeffhostetler Feb 22, 2019
4364e93
trace2:data: add trace2 sub-process classification
jeffhostetler Feb 22, 2019
7734fde
trace2:data: add trace2 transport child classification
jeffhostetler Feb 22, 2019
bcccfb4
trace2:data: add trace2 hook classification
jeffhostetler Feb 22, 2019
2f8b46c
trace2:data: add trace2 instrumentation to index read/write
jeffhostetler Feb 22, 2019
89b487b
trace2:data: pack-objects: add trace2 regions
derrickstolee Feb 22, 2019
5295014
trace2:data: add subverb to checkout command
jeffhostetler Feb 22, 2019
292f3ee
trace2:data: add subverb to reset command
jeffhostetler Feb 22, 2019
facf05f
trace2:data: add subverb for rebase
jeffhostetler Feb 22, 2019
a57e33c
trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
jeffhostetler Feb 22, 2019
0b8734b
trace2: add for_each macros to clang-format
jeffhostetler Feb 22, 2019
945c03d
Merge branch 'jh-vfs-trace2-p1' into jh-221
jeffhostetler Apr 23, 2019
f2550e3
DROPME: trace2:status: use the_repository rather than s->repo
jeffhostetler Jan 31, 2019
6335cd2
gvfs:trace2:data: add trace2 tracing around read_object_process
jeffhostetler Sep 26, 2018
5ec3e0c
gvfs:trace2:data: status deserialization information
jeffhostetler Sep 26, 2018
14fe80f
gvfs:trace2:data: status serialization
jeffhostetler Jan 7, 2019
92c6ace
gvfs:trace2:data: add vfs stats
jeffhostetler Nov 19, 2018
96f644f
progress: add sparse mode to force 100% complete message
jeffhostetler Mar 21, 2019
c2ce574
trace2:data: add trace2 data to midx
jeffhostetler Mar 21, 2019
7b95007
midx: add progress indicators in multi-pack-index verify
jeffhostetler Mar 21, 2019
e953496
midx: during verify group objects by packfile to speed verification
jeffhostetler Mar 21, 2019
964c2e1
Merge branch 'jh-vfs-trace2-p1-vfs' into jh-221
jeffhostetler Apr 23, 2019
07fe56e
Merge branch 'jh-vfs-midx-verify-too-many-packs' into jh-221
jeffhostetler Apr 23, 2019
d15ed93
config: initialize opts structure in repo_read_config()
jeffhostetler Apr 15, 2019
a0025c9
trace2: refactor setting process starting time
jeffhostetler Apr 15, 2019
5fce9cc
trace2: add absolute elapsed time to start event
jeffhostetler Apr 15, 2019
e34dcf6
trace2: find exec-dir before trace2 initialization
jeffhostetler Apr 15, 2019
999a778
config: add read_very_early_config()
jeffhostetler Apr 15, 2019
498f28b
trace2: use system/global config for default trace2 settings
jeffhostetler Apr 15, 2019
cc88dab
trace2: report peak memory usage of the process
jeffhostetler Apr 15, 2019
a5ba2b9
trace2: clarify UTC datetime formatting
jeffhostetler Apr 15, 2019
c673002
trace2: make SIDs more unique
jeffhostetler Apr 15, 2019
43e2756
trace2: update docs to describe system/global config settings
jeffhostetler Apr 15, 2019
0ae60e8
Merge branch 'jh-vfs-trace2-sid-fix' into jh-221
jeffhostetler Apr 23, 2019
1393cf5
mingw: allow building with an MSYS2 runtime v3.x
dscho Mar 8, 2019
b95ef9d
macOS: make sure that gettext is found
dscho Apr 14, 2019
97ee5fc
t9822: skip tests if file names cannot be ISO-8859-1 encoded
dscho Apr 14, 2019
b897cba
Merge branch 'js/macos-gettext-build'
dscho Apr 24, 2019
d16e36e
Merge branch 'js/iso8895-test-on-apfs'
dscho Apr 24, 2019
6c00e6b
Merge branch 'ss/msvc-path-utils-fix'
dscho Apr 26, 2019
253ca76
trace2:gvfs:experiment: clear_ce_flags_1
jeffhostetler Apr 30, 2019
51804fb
trace2:gvfs:experiment: prime_cache_tree
jeffhostetler Apr 30, 2019
fa5a6dc
trace2:gvfs:experiment: traverse_trees
jeffhostetler Apr 30, 2019
cab7dad
trace2:gvfs:experiment: report_tracking
jeffhostetler Apr 30, 2019
e872b12
Merge pull request #133 from jeffhostetler/gvfs-trace2-checkout-exper…
jeffhostetler May 1, 2019
c569f4b
fetch: avoid calling write_or_die()
peff Mar 5, 2019
de15234
fetch: ignore SIGPIPE during network operation
peff Mar 3, 2019
5dff64c
Merge branch 'jk/no-sigpipe-during-network-transport'
dscho May 3, 2019
7f8e9de
t6500(mingw): use the Windows PID of the shell
dscho May 4, 2019
59a4efb
mingw: allow compiling with GCC 8 and DEVELOPER=1
dscho Mar 29, 2019
2e27281
kwset: allow building with GCC 8
dscho Mar 29, 2019
4ac9d43
fixup! mingw: kill child processes in a gentler way
dscho Apr 3, 2019
18b387b
Merge branch 'dscho/gcc-8-gfw'
dscho Apr 11, 2019
447d760
merge-recursive: avoid confusing logic in was_dirty()
dscho May 21, 2019
a4eec27
merge-recursive: add some defensive coding to was_dirty()
dscho May 21, 2019
61287c2
merge-recursive: teach was_dirty() about the virtualfilesystem
dscho May 21, 2019
f6d0b60
Merge branch 'virtualfilesystem-and-merge-recursive'
dscho May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion merge-recursive.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "submodule.h"
#include "revision.h"
#include "commit-reach.h"
#include "virtualfilesystem.h"

struct path_hashmap_entry {
struct hashmap_entry e;
Expand Down Expand Up @@ -886,7 +887,8 @@ static int was_dirty(struct merge_options *o, const char *path)
{
struct cache_entry *ce;

if (o->call_depth || !was_tracked(o, path))
if (o->call_depth || !was_tracked(o, path) ||
is_excluded_from_virtualfilesystem(path, strlen(path), DT_REG) == 1)
Comment thread
dscho marked this conversation as resolved.
return 0;

ce = index_file_exists(o->unpack_opts.src_index,
Expand Down