[PATCH] diff: Pass 'changes found' flag to external diff tools

ot invok the external diff tool on files for which GIT_DIFF_FOUND_CHANGES is set to false. (c) Update documentation and create unit tests. Signed-off-by: Zoltan Klinger --- Documentation/git.txt| 11 +-- diff.c | 12 git-difftool--helper.sh | 39

[PATCH] grep: fix match highlighting for combined patterns with context lines

e of the match. The output of the same command after the change: $ git grep -n -C2 -e foo --and -e bar testfile testfile-1-foo a testfile-2-foo b testfile:3:*foo* *bar* testfile:4:baz *bar* *foo* testfile-5-bar x testfile-6-bar y Signed-off-by: Zoltan Klinger --- grep.

Re: [PATCH] grep: fix match highlighting for combined patterns with context lines

> Junio C Hamano writes: > > It turns out that the result of such a change becomes more readable > than the original, in that it makes it clear that reinspection of > the lines are done only for matched ones and not context lines. > > Agree, it looks much clearer now. Happy if you squashed your ch

Re: [PATCH][RFC] grep: add color.grep.matchcontext and color.grep.matchselected

I like René's approach, too. It's more flexible, supports the old behaviour and it scratches my itch as well. Don't mind if you dropped my patch and used René's instead. >> Only *very* lightly tested, and a test for t/is missing anyway. Just >> wanted to quickly show what I meant. You'd set colo

[PATCH] log: fix indentation for --graph --show-signature

Mon Jun 23 09:45:27 2014 -0400 | | | | Minor URL updates In log-tree.c modify show_sig_lines() function to call graph_show_oneline() after each line of gpg information it has printed in order to preserve the level of indentation for the next output line. Reported-by: Jason Pyeron Signed-off-by: Z

[PATCH v2] log: fix indentation for --graph --show-signature

Mon Jun 23 09:45:27 2014 -0400 | | | | Minor URL updates In log-tree.c modify show_sig_lines() function to call graph_show_oneline() after each line of gpg information it has printed in order to preserve the level of indentation for the next output line. Reported-by: Jason Pyeron Signed-off-by:

[PATCH] difftool: Change prompt to display the number of files in the diff queue

ternal program. (2) Modify git-difftool--helper.sh script to display the counter and the diff queue count values in the difftool prompt. (3) Update git.txt documentation (4) Update t4020-diff-external.sh test script Signed-off-by: Zoltan Klinger --- Documentation/git.txt| 6 +- diff.c

[PATCH v2] difftool: Change prompt to display the number of files in the diff queue

e count values in the difftool prompt. (3) Update git.txt documentation (4) Update t4020-diff-external.sh test script Signed-off-by: Zoltan Klinger --- Reworked the patch to use environment variables instead of command line arguments for making the counter and total values available to external scri

[PATCH v3] difftool: Change prompt to display the number of files in the diff queue

e count values in the difftool prompt. (3) Update git.txt documentation (4) Update t4020-diff-external.sh test script Signed-off-by: Zoltan Klinger --- Reworked patch to use run_command_v_opt_cd_env() function when invoking the external diff program. Modified test script to use write_scrip

Unused #include statements

Hello there, Since reading a post [1] about removing some unnecessary #include statements from a git C source file I've been intrigued to see how many more might be lurking in the code base. After a bit of digging around, my brute force approach of 'remove as many #includes as possible while maki

Re: Unused #include statements

Robert, Peff and Junio. Thank you all for your feedback. It's clear now what sort of analysis I should aim towards. Thanks, Zoltan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org

[PATCH] git-clean: Display more accurate delete messages

r Removed untracked_file1 Now it displays only the file and directory names that got actually deleted. Signed-off-by: Zoltan Klinger --- Hi there, My first patch. Hope you find it useful. Looking forward to your feedback. Cheers, Zoltan builtin/clean.c | 64 +++

Re: [PATCH] git-clean: Display more accurate delete messages

>> Hrm, following your discussion (ellided above), I would have >> expected that you would show >> >> Removing directory foo/bar >> Removing untracked_file1 > > Also it would be nice to have warnings about undeleted directories since this > git > clean behavior (or the work around to pass

Re: [PATCH] git-clean: Display more accurate delete messages

>> Use git clean --force --force to delete all untracked git repositories > > But I am not sure if this is ever sane. Especially the one that > removes an embedded repository is suspicious. "git clean" should > not ever touch it with or without --superforce or any other command. My original inte

[PATCH v2] git-clean: Display more accurate delete messages

and directory names that got actually deleted and shows warnings about ignored untracked git repositories. Signed-off-by: Zoltan Klinger Reported-by: Soren Brinkmann --- Have updated patch with feedback received from Junio and Soren Brinkmann builtin/clean.c | 78

Re: [PATCH v2] git-clean: Display more accurate delete messages

Thanks for the feedback. > My reading of the above is that "lst" after sorting is expected to > have something like: > > a/ > a/b/ > a/b/to-be-removed > a/to-be-removed > > and we first show "a/", remember that prefix in "dir", not show > "a/b/" because it matches p

Re: [PATCH] builtin/clean.c: Fix some sparse warnings

Thanks, Ramsay. I am rewriting the whole patch to do things a better way (as kindly suggested by Junio). So the print_filtered() function is going to disappear, but thanks for pointing out the problems with the existing code. Cheers, Zoltan On 21 December 2012 05:33, Ramsay Jones wrote: > > Spars

[PATCH v3] git-clean: Display more accurate delete messages

hat got actually deleted and shows warnings about ignored untracked git repositories. Reported-by: Soren Brinkmann Signed-off-by: Zoltan Klinger --- builtin/clean.c | 149 --- 1 file changed, 120 insertions(+), 29 deletions(-) diff --git a/b

Re: [PATCH v3] git-clean: Display more accurate delete messages

> The updated code structure is much nicer than the previous round, > but I am somewhat puzzled how return value of remove_dirs() and > &gone relate to each other. Surely when gone is set to zero, > remove_dirs() is reporting that the directory it was asked to remove > recursively did not go away,

[PATCH v4] git-clean: Display more accurate delete messages

hat got actually deleted and shows warnings about ignored untracked git repositories. Reported-by: Soren Brinkmann Signed-off-by: Zoltan Klinger --- builtin/clean.c | 158 +-- 1 file changed, 129 insertions(+), 29 deletions(-) diff --git a/b

Re: [PATCH v4] git-clean: Display more accurate delete messages

> I wonder whether it's possible to make the output more consistent, > as in: > > Removing tracked_dir/some_untracked_file > Removing untracked_file > Skipping repository untracked_foo/frotz.git > Removing untracked_foo/bar > Removing untracked_foo/emptydir > Skipping reposi

Re: [PATCH v4] git-clean: Display more accurate delete messages

> I think the code before this patch used to say "Would not remove" > and "Not removing" in certain cases to report the paths that the > command decided not to remove, but after this patch these two > messages no longer appear in the patch. > > Is it expected, are we losing information, or...? > I

[PATCH v5] git-clean: Display more accurate delete messages

ry untracked_some.git/ Now it displays only the file and directory names that got actually deleted and shows the name of the untracked git repositories it ignored. Reported-by: Soren Brinkmann Signed-off-by: Zoltan Klinger --- builtin/clean.c | 156

[PATCH] git-prompt.sh: Show where rebase is at when interrupted by a merge conflict

-prompt.sh to reflect changes introduced by this patch. Signed-off-by: Zoltan Klinger --- contrib/completion/git-prompt.sh | 21 - git-rebase--interactive.sh |5 + t/t9903-bash-prompt.sh |6 +++--- 3 files changed, 24 insertions(+), 8 deletions

[PATCH v2] bash-prompt.sh: Show where rebase is at when interrupted by a merge conflict

-prompt.sh to reflect changes introduced by this patch. Signed-off-by: Zoltan Klinger --- Changes since previous patch: * Fix typo in commit message * Make prompt easier to read by replacing '|' character with space * Modify test cases to have more than one commit to ap

[BUG] git-check-ignore: Segmentation fault

Hi there, The new git-check-ignore command seg faults when (1) it is called with single dot path name at $GIT_DIR level _AND_ (2) and .gitignore has at least one directory pattern. Git version: 1.8.2.rc0.16.g20a599e Reproduce the bug: $ git --version git version 1.8.2.rc0.16.g20