[PATCH v1.5 2/3] bash prompt: remove a redundant 'git diff' option

To get the dirty state indicator __git_ps1() runs 'git diff' with '--quiet --exit-code' options. '--quiet' already implies '--exit-code', so the latter is unnecessary and can be removed. Signed-off-by: SZEDER Gábor --- Reworded the Subject: line, because it sounded as if the

[RFC] OS X El Capitan + Xcode ships without SSL header?!

Hi, I cannot build Git on a clean machine with OS X El Capitan 10.11, Xcode 7.1.1 and Xcode command line tools because of missing OpenSSL headers. It looks like as there are no OpenSSL headers at all. I only found this weird non working version:

Hello.

База поставщиков и клиентов Вашего конкурента Максим Архимедов email base-concurrent3@yandex. ru +7-929-968-9Ч-Ч3 -- 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

Remote reference deleted on git fetch

Hi, I have enabled fetch.prune and when I do a push of an existing branch and fetch that branch the remote reference is deleted. Is this a bug or expected behavior? Doing the following commands on an existing repository: $ git config fetch.prune true $ git checkout -b bug/bug-1 Switched to a new

Downloading Git on Mac

For a project I am helping with, I am going through a coding program and it required the students to download Git. Majority of the students including myself are using Macs and it won’t open the program for me. I did recently install the new update on my computer, could this have anything to do

[PATCH v1] blame: add support for --[no-]progress option

Will also affect annotate Signed-off-by: Edmundo Carmona Antoranz --- Documentation/blame-options.txt | 7 +++ Documentation/git-blame.txt | 9 - builtin/blame.c | 39 --- 3 files changed, 51

Re: [PATCH v1] blame: add support for --[no-]progress option

Hey, guys! Time for some more patch destruction. On Sat, Nov 21, 2015 at 11:11 PM, Edmundo Carmona Antoranz wrote: -static void assign_blame(struct scoreboard *sb, int opt) +static void assign_blame(struct scoreboard *sb, int opt, int show_progress) Would it be better to

Re: [PATCH 3/2] test: factor out helper function test_must_contain

Am 20.11.2015 um 21:50 schrieb René Scharfe: Extract a helper function for searching for a pattern in a file and printing the whole file if the pattern is not found. It is useful when starting tests with --verbose for debugging purposes. +# Check if a file contains an expected pattern.

Re: [PATCH 3/2] test: factor out helper function test_must_contain

Am 21.11.2015 um 09:11 schrieb Johannes Sixt: > Am 20.11.2015 um 21:50 schrieb René Scharfe: >> Extract a helper function for searching for a pattern in a file and >> printing the whole file if the pattern is not found. It is useful >> when starting tests with --verbose for debugging purposes. >

[PATCH v2 2/3] git-p4: add option to system() to return subshell status

Add an optional parameter ignore_error to the git-p4 system() function. If used, it will return the subshell exit status rather than throwing an exception. Signed-off-by: Luke Diamand --- git-p4.py | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git

[PATCH 2/3] bash prompt: remove a redundant command line option

To get the dirty state indicator __git_ps1() runs 'git diff' with '--quiet --exit-code' options. '--quiet' already implies '--exit-code', so the latter is unnecessary and can be removed. Signed-off-by: SZEDER Gábor --- contrib/completion/git-prompt.sh | 2 +- 1 file changed,

[PATCH 3/3] bash prompt: indicate dirty index even on orphan branches

__git_ps1() doesn't indicate dirty index while on an orphan branch. To check the dirtiness of the index, __git_ps1() runs 'git diff-index --cached ... HEAD', which doesn't work on an orphan branch, because HEAD doesn't point to a valid commit. Run 'git diff ... --cached' instead, as it does the

[PATCH 1/3] bash prompt: test dirty index and worktree while on an orphan branch

There is only a single test exercising the dirty state indicator on an orphan branch, and in that test neither the index nor the worktree are dirty. Add two failing tests to check the dirty state indicator while either the index is dirty or while both the index and the worktree are dirty on an

[PATCH v2 1/3] git-p4: add failing test for submit from detached head

git-p4 can't submit from a detached head. This test case demonstrates the problem. Signed-off-by: Luke Diamand --- t/t9800-git-p4-basic.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index

[PATCH v2 3/3] git-p4: work with a detached head

When submitting, git-p4 finds the current branch in order to know if it is allowed to submit (configuration "git-p4.allowSubmit"). On a detached head, detecting the branch would fail, and git-p4 would report a cryptic error. This change teaches git-p4 to recognise a detached head and submit

[PATCH v2 0/2] git-p4: allow submission from detached head

I'm resending my reroll of my earlier patch to teach git-p4 about detached heads. It uses Junio's suggestion of calling "git symbolic-ref" to determine if we're on a detached head, rather than parsing text strings. Luke Diamand (3): git-p4: add failing test for submit from detached head