Re: Best practices/conventions for tags and references in commit message

2014-05-27 Thread Johan Herland
Search the mailing list archives for git-interpret-trailers. It's coming. :) ...Johan On Tue, May 27, 2014 at 1:26 PM, Thomas Koch wrote: > Hi, > > different projects or tools have conventions to include machine parsable > information in commit messages, e.g.: > > Closes: #42 > Thanks: my mothe

Re: [RFC 3/3] tests: Add 'rebase -i commits that overwrite untracked files'

2014-05-27 Thread Michael Haggerty
On 05/27/2014 12:19 AM, Fabian Ruch wrote: > If a todo list will cherry-pick a commit that adds some file and the > working tree already contains a file with the same name, the rebase > sequence for that todo list will be interrupted and the cherry-picked > commit will be lost after the rebasing pr

gitk's truncated tags

2014-05-27 Thread Ondrej Oprala
Hi, is there any way to display full tag names in gitk, for tag names longer than 16 characters? The way 1.8.x did things? Thanks, Ondrej -- 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.ker

Re: [RFC 2/3] rebase -i: Reschedule tasks that failed before the index was touched

2014-05-27 Thread Michael Haggerty
Hi, Overall, this approach seems reasonable. Please see the inline comments below. On 05/27/2014 12:19 AM, Fabian Ruch wrote: > When `rebase--interactive` processes a task, it removes the item from > the todo list and appends it to another list of executed tasks. If a > `pick` (this includes `sq

Best practices/conventions for tags and references in commit message

2014-05-27 Thread Thomas Koch
Hi, different projects or tools have conventions to include machine parsable information in commit messages, e.g.: Closes: #42 Thanks: my mother, my wife Git-Dch: Ignore Commit-Id: 50M3R34LLYR4ND0MB1TSANDNUMB3R5 (see thread: "RFE: support change-id generation natively" for Commit-Id) ("Git-Dch:

Re: [PATCH 01/15] builtin/add.c: rearrange xcalloc arguments

2014-05-27 Thread Brian Gesiak
Oomph, how embarrassing. Thanks for pointing that out! Would it be better if I rerolled the patches? - Brian Gesiak On Tue, May 27, 2014 at 12:25 PM, Eric Sunshine wrote: > On Mon, May 26, 2014 at 11:33 AM, Brian Gesiak wrote: >> xcalloc takes two arguments: the number of elements and their si

Re: [PATCH v10 11/12] Documentation: add documentation for 'git interpret-trailers'

2014-05-27 Thread Johan Herland
On Tue, May 27, 2014 at 10:21 AM, Michael Haggerty wrote: > tl;dr: This patch series wants to introduce a permanent new Git data > format. The current version can write trailers in formats that it is > incapable of reading, which I consider broken. I advocate a stricter > specification of the fo

Kedves felhasználók e-mailben;

2014-05-27 Thread (webmail update 2014)
-- Kedves felhasználók e-mailben; Túllépte 23432 box set Web Service / Admin, és akkor nem lesz probléma a küldő és fogadhat e-maileket, amíg újra ellenőrizni. Kérjük, frissítse kattintva linkre, és töltse ki az adatokat, hogy ellenőrizze a számla Kérjük, kövesse az alábbi linkre, és majd másol

[PATCH] config: respect '~' and '~user' in mailmap.file

2014-05-27 Thread Øystein Walle
git_config_string() does not handle '~' and '~user' as part of the value. Using git_config_pathname() fixes this. Signed-off-by: Øystein Walle --- config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.c b/config.c index 314d8ee..ec7af5f 100644 --- a/config.c +++ b/c

Re: [PATCH v10 11/12] Documentation: add documentation for 'git interpret-trailers'

2014-05-27 Thread Michael Haggerty
tl;dr: This patch series wants to introduce a permanent new Git data format. The current version can write trailers in formats that it is incapable of reading, which I consider broken. I advocate a stricter specification of the format of trailers, at least until we get feedback from users that th

[PATCH 09/10] lib-prompt-tests.sh: add variable for string that encodes percent in PS1

2014-05-27 Thread Richard Hansen
To add a literal percent character to a Zsh prompt, the string "%%" is used in PS1. Bash and POSIX shells simply use "%". To accommodate this difference, use ${percent} where a percent character is expected and define the percent variable in the set_ps1_format_vars function. Signed-off-by: Richa

[PATCH 07/10] t9903: move prompt tests to a new lib-prompt-tests.sh file

2014-05-27 Thread Richard Hansen
This is a step toward creating a new test script that runs the same prompt tests as t9903 but with Zsh instead of Bash. Signed-off-by: Richard Hansen --- t/lib-prompt-tests.sh | 632 + t/t9903-bash-prompt.sh | 605 +

[PATCH 02/10] t9903: put the Bash pc mode prompt test cases in a function

2014-05-27 Thread Richard Hansen
This is a step toward invoking the same pc mode test cases twice: once with PS1 parameter expansion enabled and once with it disabled. Signed-off-by: Richard Hansen --- t/t9903-bash-prompt.sh | 236 + 1 file changed, 120 insertions(+), 116 deletion

[PATCH 06/10] t9903: move PS1 color code variable definitions to lib-bash.sh

2014-05-27 Thread Richard Hansen
Define a new 'set_ps1_format_vars' function in lib-bash.sh that sets the c_red, c_green, c_lblue, and c_clear variables. Call this function from run_pcmode_tests(). This is a step toward moving the shell prompt tests to a separate library file so that they can be reused to test prompting in Zsh.

[PATCH 10/10] t9904: new __git_ps1 tests for Zsh

2014-05-27 Thread Richard Hansen
These are the same tests as in t9903, but run in zsh instead of bash. Signed-off-by: Richard Hansen --- t/lib-zsh.sh | 30 ++ t/t9904-zsh-prompt.sh | 10 ++ 2 files changed, 40 insertions(+) create mode 100644 t/lib-zsh.sh create mode 100755 t/t9904

[PATCH 08/10] lib-prompt-tests.sh: put all tests inside a function

2014-05-27 Thread Richard Hansen
Modify lib-prompt-tests.sh so that it does nothing when sourced except define a function for running the prompt tests (plus some "private" helper functions). Signed-off-by: Richard Hansen --- t/lib-prompt-tests.sh | 802 - t/t9903-bash-prompt.sh |

[PATCH 05/10] t9903: include "Bash" in test names via new $shellname var

2014-05-27 Thread Richard Hansen
Define a new 'shellname' variable in lib-bash.sh and use it in the prompt test names. This is a step toward moving the shell prompt tests to a separate library file so that they can be reused to test prompting in Zsh. Signed-off-by: Richard Hansen --- t/lib-bash.sh | 2 ++ t/t9903-bas

[PATCH 03/10] t9903: move test name prefix to a separate variable

2014-05-27 Thread Richard Hansen
This is a step toward reusing the same test cases after disabling PS1 parameter expansion. Signed-off-by: Richard Hansen --- t/t9903-bash-prompt.sh | 20 +++- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index c691

[PATCH 04/10] t9903: run pc mode tests again with PS1 expansion disabled

2014-05-27 Thread Richard Hansen
Bash has a shell option that makes it possible to disable parameter expansion in PS1. Test __git_ps1's ability to detect and react to disabled PS1 expansion by running the "pc mode" tests twice: once with PS1 parameter expansion enabled and once with it disabled. Signed-off-by: Richard Hansen -

[PATCH 01/10] t9903: remove Zsh test from the suite of Bash prompt tests

2014-05-27 Thread Richard Hansen
This test is about to become redundant: All of the Bash prompt tests will be moved into a separate library file that will also be used by a new Zsh-specific test script. Signed-off-by: Richard Hansen --- t/t9903-bash-prompt.sh | 11 --- 1 file changed, 11 deletions(-) diff --git a/t/t9

[PATCH 00/10] Zsh prompt tests

2014-05-27 Thread Richard Hansen
This series adds test cases for running __git_ps1 (see contrib/completion/git-prompt.sh) from Zsh. This series also adds more Bash test cases to test how __git_ps1 reacts to disabling Bash's PS1 parameter expansion. (This is related to adding Zsh test cases: Zsh doesn't perform parameter expansi

Re: [PATCH v3 2/5] commit test: Change $PWD to $(pwd)

2014-05-27 Thread David Kastrup
Johannes Sixt writes: > That said, it is not wrong to use $(pwd) with test_set_editor, it's just > unnecessarily slow. Any shell that knows $(...) is pretty sure to have pwd as a built-in. I don't think Git will run on those kind of ancient shells reverting to /bin/pwd here. The autoconf manual

<    1   2