From 7dd9ab0c8b3ca7ae03d54e741e7a554c192ef02f Mon Sep 17 00:00:00 2001 From: Yacine Belkadi Date: Sun, 16 Sep 2012 18:06:11 +0200 Subject: [PATCH 1/5] completion: add --no-edit to git-commit Signed-off-by: Yacine Belkadi Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ffedce751c..d743e56d18 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1014,7 +1014,8 @@ _git_commit () --*) __gitcomp " --all --author= --signoff --verify --no-verify - --edit --amend --include --only --interactive + --edit --no-edit + --amend --include --only --interactive --dry-run --reuse-message= --reedit-message= --reset-author --file= --message= --template= --cleanup= --untracked-files --untracked-files= From 2ce4fee8785f5c3cc7955fcc9dff8d516f8c95f7 Mon Sep 17 00:00:00 2001 From: "Wesley J. Landaker" Date: Mon, 17 Sep 2012 08:22:15 -0600 Subject: [PATCH 2/5] Documentation: indent-with-non-tab uses "equivalent tabs" not 8 Update the documentation of the core.whitespace option "indent-with-non-tab" to correctly reflect that it catches the use of spaces instead of the equivalent tabs, rather than a fixed number. Signed-off-by: Wesley J. Landaker Signed-off-by: Junio C Hamano --- Documentation/config.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index a95e5a4ac9..122e3c4996 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -559,8 +559,9 @@ core.whitespace:: * `space-before-tab` treats a space character that appears immediately before a tab character in the initial indent part of the line as an error (enabled by default). -* `indent-with-non-tab` treats a line that is indented with 8 or more - space characters as an error (not enabled by default). +* `indent-with-non-tab` treats a line that is indented with space + characters instead of the equivalent tabs as an error (not enabled by + default). * `tab-in-indent` treats a tab character in the initial indent part of the line as an error (not enabled by default). * `blank-at-eof` treats blank lines added at the end of file as an error From 6108b04b708f6aa5d4a9349a240b5261fdab0cdf Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Mon, 17 Sep 2012 03:21:55 +0200 Subject: [PATCH 3/5] git-jump: ignore (custom) prefix in diff mode Matching the default file prefix b/ does not yield any results if config option diff.noprefix or diff.mnemonicprefix is enabled. Signed-off-by: Mischa POSLAWSKY Acked-by: Jeff King Signed-off-by: Junio C Hamano --- contrib/git-jump/git-jump | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump index a33674e47a..dc90cd6379 100755 --- a/contrib/git-jump/git-jump +++ b/contrib/git-jump/git-jump @@ -21,9 +21,9 @@ open_editor() { } mode_diff() { - git diff --relative "$@" | + git diff --no-prefix --relative "$@" | perl -ne ' - if (m{^\+\+\+ b/(.*)}) { $file = $1; next } + if (m{^\+\+\+ (.*)}) { $file = $1; next } defined($file) or next; if (m/^@@ .*\+(\d+)/) { $line = $1; next } defined($line) or next; From d9fcff2f498d398132cc9a14f7402e77ff1c5991 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Mon, 17 Sep 2012 12:38:51 +0100 Subject: [PATCH 4/5] Add missing -z to git check-attr usage text for consistency with man page Signed-off-by: Adam Spiers Signed-off-by: Junio C Hamano --- builtin/check-attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/check-attr.c b/builtin/check-attr.c index 44c421eb0f..9000c2db51 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -9,7 +9,7 @@ static int cached_attrs; static int stdin_paths; static const char * const check_attr_usage[] = { "git check-attr [-a | --all | attr...] [--] pathname...", -"git check-attr --stdin [-a | --all | attr...] < ", +"git check-attr --stdin [-z] [-a | --all | attr...] < ", NULL }; From 5805853f228acafe1d45edeef780cd1b00b952aa Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Mon, 17 Sep 2012 22:36:18 +0530 Subject: [PATCH 5/5] t/perf: add "trash directory" to .gitignore Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano --- t/perf/.gitignore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/perf/.gitignore b/t/perf/.gitignore index 50f5cc1ed9..982eb8e3a9 100644 --- a/t/perf/.gitignore +++ b/t/perf/.gitignore @@ -1,2 +1,3 @@ -build/ -test-results/ +/build/ +/test-results/ +/trash directory*/