git/submodule.c, branch v1.7.11

Merge branch 'hv/submodule-alt-odb'

2012-05-23T20:35:06Z

When peeking into object stores of submodules, the code forgot that they might borrow objects from alternate object stores on their own. By Heiko Voigt * hv/submodule-alt-odb: teach add_submodule_odb() to look for alternates

teach add_submodule_odb() to look for alternates

2012-05-14T18:56:42Z

Since we allow to link other object databases when loading a submodules database we should also load possible alternates. Signed-off-by: Heiko Voigt Signed-off-by: Junio C Hamano

push: teach --recurse-submodules the on-demand option

2012-03-30T16:02:55Z

When using this option git will search for all submodules that have changed in the revisions to be send. It will then try to push the currently checked out branch of each submodule. This helps when a user has finished working on a change which involves submodules and just wants to push everything in one go. Signed-off-by: Fredrik Gustafsson Mentored-by: Jens Lehmann Mentored-by: Heiko Voigt Signed-off-by: Junio C Hamano

Refactor submodule push check to use string list instead of integer

2012-03-30T15:58:31Z

This allows us to tell the user which submodules have not been pushed. Additionally this is helpful when we want to automatically try to push submodules that have not been pushed. Signed-off-by: Heiko Voigt Signed-off-by: Junio C Hamano

Teach revision walking machinery to walk multiple times sequencially

2012-03-30T15:57:49Z

Previously it was not possible to iterate revisions twice using the revision walking api. We add a reset_revision_walk() which clears the used flags. This allows us to do multiple sequencial revision walks. We add the appropriate calls to the existing submodule machinery doing revision walks. This is done to avoid surprises if future code wants to call these functions more than once during the processes lifetime. Signed-off-by: Heiko Voigt Signed-off-by: Junio C Hamano

submodule: use diff_tree_combined_merge() instead of diff_tree_combined()

2011-12-18T02:23:24Z

Use diff_tree_combined_merge() instead of open-coding it. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano

use struct sha1_array in diff_tree_combined()

2011-12-18T02:21:37Z

Maintaining an array of hashes is easier using sha1_array than open-coding it. This patch also fixes a leak of the SHA1 array in diff_tree_combined_merge(). Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano

Merge branch 'jl/submodule-status-failure-report'

2011-12-14T07:00:52Z

* jl/submodule-status-failure-report: diff/status: print submodule path when looking for changes fails

diff/status: print submodule path when looking for changes fails

2011-12-08T19:15:01Z

diff and status run "git status --porcelain" inside each populated submodule to see if it contains changes (unless told not to do so via config or command line option). When that fails, e.g. due to a corrupt submodule .git directory, it just prints "git status --porcelain failed" or "Could not run git status --porcelain" without giving the user a clue where that happened. Add '"in submodule %s", path' to these error strings to tell the user where exactly the problem occurred. Reported-by: Seth Robertson Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano

Merge branch 'ab/clang-lints'

2011-12-05T23:12:34Z

* ab/clang-lints: cast variable in call to free() in builtin/diff.c and submodule.c apply: get rid of useless x < 0 comparison on a size_t type