- 09 Oct, 2012 3 commits
-
-
Michael Schubert committed
-
Diff submodule tests and fixes
Vicent Martí committed -
* tests-clar/status: remove an unused variable * clone: fix -Wmaybe-uninitialized warning
Michael Schubert committed
-
- 08 Oct, 2012 7 commits
-
-
Deploy git_repository_set_head()
Ben Straub committed -
The adds a test for the submodule diff capabilities and then fixes a few bugs with how the output is generated. It improves the accuracy of OIDs in the diff delta object and makes the submodule output more closely mirror the OIDs that will be used by core git.
Russell Belfer committed -
Russell Belfer committed
-
There are a few cases where diff should leave directories in the diff list if we want to match core git, such as when the directory contains a .git dir. That feature was lost when I introduced some of the new submodule handling. This restores that and then fixes a couple of related to diff output that are triggered by having diffs with directories in them. Also, this adds a new flag that can be passed to diff if you want diff output to actually include the file content of any untracked files.
Russell Belfer committed -
Diff: Show submodule diff
Russell Belfer committed -
Fix a bug where ignorecase wasn't applied to ignores
Russell Belfer committed -
Philip Kelley committed
-
- 07 Oct, 2012 15 commits
-
-
nulltoken committed
-
nulltoken committed
-
nulltoken committed
-
nulltoken committed
-
nulltoken committed
-
nulltoken committed
-
nulltoken committed
-
nulltoken committed
-
nulltoken committed
-
nulltoken committed
-
nulltoken committed
-
nulltoken committed
-
nulltoken committed
-
The reference is only needed inside the function. We mistakenly increased the reference counter causing the ODB not to get freed and leaking descriptors.
Carlos Martín Nieto committed -
Storing flushes in the refs vector doesn't let us recognize when the remote is empty, as we'd always introduce at least one element into it. These flushes aren't necessary, so we can simply ignore them.
Carlos Martín Nieto committed
-
- 05 Oct, 2012 5 commits
-
-
We don't have anything useful that we could do with that oid anyway (We need to query the submodule for the HEAD commit instead). Without this, the following code creates the error "Failed to read descriptor: Is a directory" when run against the submod2 test-case: const char* oidstr = "873585b94bdeabccea991ea5e3ec1a277895b698"; git_tree* tree = resolve_commit_oid_to_tree(g_repo, oidstr); git_diff_list* diff = NULL; cl_assert(tree); cl_git_pass(git_diff_workdir_to_tree(g_repo, NULL, tree, &diff));
Sascha Cunz committed -
Sascha Cunz committed
-
1. teach diff.c:maybe_modified to query git_submodule_status for the modification state of a submodule. According to the git_submodule_status docs, it will filter for to-ignore states already. 2. teach diff_output.c:get_workdir_content to check the submodule status again and create a line like: Subproject commit <SHA-1>\n or Subproject comimt <SHA-1>-dirty\n like git.git does.
Sascha Cunz committed -
diff_output.c:get_blob_content used to try to read the submodule commit as a blob in the superproject's odb. Of course it cannot find it and errors out with GIT_ENOTFOUND, implcitly terminating the whole diff output. This patch teaches it to create a text that describes the submodule instead. The text looks like: Subproject commit <SHA1>\n which is what git.git does, too.
Sascha Cunz committed -
Sascha Cunz committed
-
- 02 Oct, 2012 3 commits
-
-
Vicent Marti committed
-
ODB: re-load packfiles on failed lookup
Russell Belfer committed -
Support for the core.ignorecase flag
Russell Belfer committed
-
- 01 Oct, 2012 5 commits
-
-
Win64 cleanups
Vicent Martí committed -
Russell Belfer committed
-
Vicent Marti committed
-
Vicent Marti committed
-
Include tag
Vicent Martí committed
-
- 30 Sep, 2012 2 commits
-
-
Also honor remote.$name.tagopt = --tags.
Carlos Martín Nieto committed -
The local function works for simple cases, but we shouldn't reinvent the wheel just for us.
Carlos Martín Nieto committed
-