New to git... Is it true there is no way to track empty directories? Thanks, T. --

Directly, no. An easy workaround is to drop an empty file (such as a .gitignore) into the directory and track that. Then the directory will come along for the ride. -- Marcus Griep GPG Key ID: 0x5E968152 —— http://www.boohaunt.net את.ψο´ --

If we try to parse objects which don't exist it may be because we are trying to force deletion of a ref exactly because the object the ref currently refers to has been pruned from the object database already. Rather than fail with an exception we should still permit the removal. This also fixes the breakage in the unit tests introduced by Charles' 5a318367 "Refactor of RefUpdate force ...". One of the unit tests for RefUpdate is using a bad ObjectId as the new value for the ref, and uses forceUp...

I rely on ~/.ssh/config to setup host aliases, especially for very common destinations. For example I have the following on most of my systems: Host orcz HostName repo.or.cz User spearce IdentityFile .ssh/id_orcz as not every system I use has my local user name as "spearce". The C Git transport honors these settings just fine for short URLs like "orcz:/srv/git/egit.git" but jgit failed horribly on these as there is no local system named "orcz" on any of my networks. By reading (and...

I think you would need a bit more than that to trigger this "behaviour". Your resolution needs to be such that it is identical to the HEAD where the rebased change is applied to, iow, among the series of commits, the final effect chosen by you from this particular one is not to do anything. So, not just "Now git diff produces an empty diff" in the above sequence, which merely means that the three-way --cc diff between the conflicted parties are resolved by taking from one side, after that "git add...

Git allows access to the gitattributes man page via `git help attributes`, but this is not discoverable via the bash-completion mechanism. This patch adds all current non-command man pages to the completion candidate list. Signed-off-by: Marcus Griep <marcus@griep.us> --- By adding them to the help completion, man pages such as the tutorials, hooks, and .gitattributes are more accessible to random discovery from bash-completion. contrib/completion/git-completion.bash | 6 +++++- ...

I'm not sure I grok what you mean here... These items are already accessible from `git help`, they just aren't discoverable through bash-completion without the patch. -- Marcus Griep GPG Key ID: 0x5E968152 —— http://www.boohaunt.net את.ψο´ --

How about something simple like this? diff --git a/builtin-help.c b/builtin-help.c index 391f749..a49b5c2 100644 --- a/builtin-help.c +++ b/builtin-help.c @@ -446,6 +446,11 @@ int cmd_help(int argc, const char **argv, const char *prefix) return 0; } + if (!strcmp("man-path", argv[0])) { + printf("%s\n", GIT_MAN_PATH); + return 0; + } + switch (help_format) { case HELP_FORMAT_MAN: sh...

Gotcha. A static list buried in git-completion.bash would be a maintenance headache. I can take a look at that some. Would we also want to look at doing something similar with '--' option completion, i.e. invoking the command with '-h' to get the usage and long options, then building the completion list on that rather than the static lists it uses now? The one downside to that is that some completions include trailing '=', which wouldn't be present in a usage list. -- Marcus Griep GPG Key...

-- Shawn. --

It can be either. In a bash-completion list, though, gitk would probably be more recognizable. I'll rehash that one. -- Marcus Griep GPG Key ID: 0x5E968152 —— http://www.boohaunt.net את.ψο´ --

On platforms with $X, make removes any leftover scripts 'a' from earlier builds if a new binary 'a.exe' is now built. However, on cygwin 1.7.0, 'git' and 'git.exe' now consistently name the same file. Test for file equality before attempting a remove, in order to avoid nuking just-built binaries. Signed-off-by: Eric Blake <ebb9@byu.net> --- On cygwin 1.5.x, a script 'a' and binary 'a.exe' could co-exist in the same directory, and exec'ing 'a' tended to favor the script over the binary - ...

These options include: --full: return to full checkout (default) --path: narrow checkout to some areas according to given spec --add-path/--remove-path: adjust current narrow checkout Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin-checkout.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/builtin-checkout.c b/builtin-checkout.c index e95eab9..f2254c6 100644 --- a/builtin-checkout.c +++ b/bui...

This patch teaches unpack_trees() to checkout/remove entries on working directories appropriately when narrow area is changed. There are three kind of changes: - new_narrow_path: reset workdir to a new narrow checkout - add_narrow_path: keep current narrow areas and add more entries - remove_narrow_path: remove some entries from current narrow areas CE_WD_REMOVE is introduced to remove entries from working directories, but still keep them in index Signed-off-by: Nguyễn Thái Ngọc Duy &l...

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- diff-lib.c | 5 +++-- diff.c | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/diff-lib.c b/diff-lib.c index e7eaff9..4fffd31 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -159,7 +159,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option) continue; } - if (ce_uptodate(ce)) + if (ce_uptodate(ce) || ce_no_checkout(ce)) continue; changed = check_removed(ce...

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin-update-index.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/builtin-update-index.c b/builtin-update-index.c index 434cb8e..1d6bb65 100644 --- a/builtin-update-index.c +++ b/builtin-update-index.c @@ -24,8 +24,9 @@ static int info_only; static int force_remove; static int verbose; static int mark_valid_only; -#define MARK_VALID 1 -#define UNMA...

The implementation with insights from Junio turns out smaller and better (and I was thinking about applying it for huge maildir). So there is a bit of changes since the last round. This time I follow "assume unchanged" code path and relax the rules a bit. There are issues I will mention later. From user POV, we can now checkout a single file or a subdirectory (checking out subdirectory non-recursively is possible too). You may start with a narrow clone like: git clone --path="Documentation/*" ...

Hi, s/tg/tg redepend/? Why not move the base-creation code in tg-create.sh to a new function in tg.sh to use here? I know I suggested that code before, but the merge with B' is wasted, so perhaps git checkout P head=$(git rev-parse --verify HEAD^0) result_tree=$(git log -1 --pretty=format:%T P') result_commit=$(git commit-tree "$result_tree" -p P -p B') git update-ref -m "commit (merge): tg-redepend" HEAD \ "$result_commit" "$head" || ... (fail) test -x "$GIT_DIR/hooks/p...

GNU diff's --suppress-blank-empty option makes it so that diff does not add a space or tab before each empty output line of context. With this option, empty context lines are empty also in "git diff" output. Before (and without the option), they'd have a single trailing space. * diff.c (diff_suppress_blank_empty): New global. (git_diff_basic_config): Set it. (builtin_diff): Use it to set the bit in ecbdata, aka ecb.priv. * xdiff-interface.c (xdiff_outf): Honor the new option. * xdiff-interface....

We are using a super repository for our development where all our code resides inside submodules. I'm maintaining this tree, so it's quite common that I change a submodule to point to a different URL according to our needs (ie, another developer is now in charge of one module). So, basically I delete the old submodule "rm -rf module && git rm module", tune .gitmodules and add it again from a different location "git submodule add ssh://server/newpath module". The problem comes when another...

And the prominent example of the deficiency are, as usual, the filesystems of Microsoft house. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> --- t/t3700-add.sh | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-)

Ah... The brackets are allowed. --

Thanks. Applied. --

Ok, it turns out that Don Zickus's patch "Allow emails with boundaries to work again [v2]" fixes the crash. -Kevin Ballard -- Kevin Ballard http://kevin.sb.org kevin@sb.org http://www.tildesoft.com --

Heh, you are too cautious ;-) Both "log --merge" and mergetool have been with us for quite some time, and I certainly do not mind taking [2/2] if not both. --