nike high heels online shop http://www.schuhenikewelt.de/nike-high-heels
Flugreisen weitestgehend weiterhin wiedergeboren einmal mehr, die Ware
einige exquisite Leichtathletik nike air passt größten britischen Schuh
Layout werden. Wir haben gesehen, Nike geschieht zu tun brauchen in diesen
Junio C Hamano wrote:
Or inside less that is spawned by git log -p, I often say this:
/^commit .*|^diff --git .*ENTER
and navigate with 'n' and 'p'.
Hm, that implies an interesting trick. If I run
LESS='FRSX +/^commit |^diff --git ' git log -p
then 'n' and shift+'n' can be
Benoît Person benoit.per...@ensimag.fr writes:
On 16 June 2013 22:18, Matthieu Moy matthieu@grenoble-inp.fr wrote:
benoit.per...@ensimag.fr writes:
changes from the V2:
- Add a way to test, without installation, code that uses GitMediawiki.pm.
This still needs to be documented, even
In its current form, when an user wants to filter specific ref using
--refs option, she needs to give something like --refs=refs/tags/v1.*.
This is not intuitive as users might think it's enough to give just
actual tag name part like --refs=v1.*. It applies to refs other than
just tags too.
Junio C Hamano gits...@pobox.com writes:
Thomas Rast tr...@inf.ethz.ch writes:
Isn't it a bit of an academic question?
...
And once you have that, it seems a nicer and cleaner idea to generate
'fixup! A' each time, instead of a successive sequence of
fixup! A
fixup! fixup! A
Here's the promised reroll. It integrates everyone's suggestions (I
hope I didn't miss any), most notably the two by Peff:
* --valgrind-parallel only does the valgrind wrapper setup in the
children, avoiding lock contention and confusion because it tries to
wrap the wrappers.
* more careful
It's already used twice, and we will have more of the same kind of
matching in a minute.
Signed-off-by: Thomas Rast tr...@inf.ethz.ch
---
t/test-lib.sh | 41 -
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
This is not really meant for external use, and thus not documented. It
allows the next commit to neatly distinguish between sub-tests and the
main run.
The format is intentionally not valid TAP. The use in the next commit
would not result in anything valid either way, and it seems better to
make
With the new --valgrind-only=pattern option, one can enable
--valgrind at a per-test granularity, exactly analogous to
--verbose-only from the previous commit.
The options are wired such that --valgrind implies --verbose (as
before), but --valgrind-only=pattern implies
--verbose-only=pattern
1b3185f (MALLOC_CHECK: various clean-ups, 2012-09-14) moved around the
MALLOC_CHECK_ and MALLOC_PERTURB_ assignments, intending to limit
their effect to only the test runs. However, they were actually
enabled only during test cleanup. Call setup/teardown_malloc_check
also around the evaluation
With the new --verbose-only=pattern option, one can enable --verbose
at a per-test granularity. The pattern is matched against the test
number, e.g.
./t-basic.sh --verbose-only='2[0-2]'
to see only the full output of test 20-22, while showing the rest in the
one-liner format.
As
With the new --valgrind-parallel=n option, we support running the
tests in a single test script under valgrind in parallel using 'n'
processes.
This really follows the dumbest approach possible, as follows:
* We spawn the test script 'n' times, using a throw-away
TEST_OUTPUT_DIRECTORY. Each
set_rev_name is a possible expensive operation. If a submodule has
changes in it, set_rev_name was called twice.
Solution is to move set_rev_name so it's only called once, no matter the
codepath taken.
Signed-off-by: Fredrik Gustafsson iv...@iveqy.com
---
git-submodule.sh | 4 ++--
1 file
I think there's a bug in git pull. Doing a git pull in a fresh repository
without any commits removes files in the index.
Example:
$ mkdir foo
$ cd foo
$ git init
$ touch file1 file2
$ git add file1
$ ls
file1 file2
$ git pull https://github.com/sos4nt/empty.git master
$ ls
Junio C Hamano gits...@pobox.com writes:
+* `matching` - push the refspec :. In other words, push all
+ branches having the same name in both ends, even if it means
+ non-fast-forward updates. This is for those who prepare all the
+ branches into a publishable shape and then push them
When in the middle of a rebase, it can be annoying to go in .git
in order to find the SHA1 of the commit where the rebase stopped.
git-status now includes this information in its default output.
With this new information, the message is now shorter, to avoid
too long lines.
The new message looks
Hi,
[I rarely do reviews on this list, so feel free to ignore this.]
On 17 June 2013 13:10, Mathieu Lienard--Mayor
mathieu.lienard--ma...@ensimag.imag.fr wrote:
diff --git a/wt-status.c b/wt-status.c
index bf84a86..5f5cddf 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -885,8 +885,19 @@
Mathieu Lienard--Mayor:
+ /*
+* If the file stopped-sha does not exist
+* we go back to the old output saying a commit
+* instead of providing the commit's SHA1.
+*/
+ if (!stopped_sha) {
+ stopped_sha = a commit;
+
Hi,
For Below issue , O/S is Windows7.
Regards,
Justin,
---
Sun Certified
It was missed in the option list while mentioned from the general
description. Add it for completeness.
Signed-off-by: Namhyung Kim namhy...@gmail.com
---
Documentation/git-config.txt |9 +
1 file changed, 9 insertions(+)
diff --git a/Documentation/git-config.txt
Le 2013-06-17 15:10, Peter Krefting a écrit :
Mathieu Lienard--Mayor:
+ /*
+* If the file stopped-sha does not exist
+* we go back to the old output saying a commit
+* instead of providing the commit's SHA1.
+*/
+ if (!stopped_sha) {
+
On Mon, Jun 17, 2013 at 01:28:30PM +, justin.sathyanat...@accenture.com
wrote:
1.Iam getting error attached when cloning of repository is done:
What error?
2.Also, when file is tried to be added,it gives error below:
$ git add *
fatal: unable to stat
On Mon, 17 Jun 2013 13:28:30 +
justin.sathyanat...@accenture.com wrote:
For Below issue , O/S is Windows7.
[...]
1.Iam getting error attached when cloning of repository is done:
What error?
2.Also, when file is tried to be added,it gives error below:
$ git add *
fatal: unable to stat
On Mon, 17 Jun 2013 17:47:07 +0400
Konstantin Khomoutov kostix+...@007spb.ru wrote:
For Below issue , O/S is Windows7.
1.Iam getting error attached when cloning of repository is done:
What error?
Okay, the Microsoft Word document with two screenshots has been
scrubbed by the list software
Mathieu Liénard--Mayor:
Actually, at first I dealt with it this way:
status_printf_ln(s, color,
_(Splitting %s while rebasing branch '%s' on '%s'.),
stopped_sha ? stopped_sha : _(a commit),
);
Would this be more suitable for translators ?
Le 2013-06-17 15:54, Peter Krefting a écrit :
Mathieu Liénard--Mayor:
Actually, at first I dealt with it this way:
status_printf_ln(s, color,
_(Splitting %s while rebasing branch '%s' on
'%s'.),
stopped_sha ? stopped_sha : _(a commit),
Thomas Rast tr...@inf.ethz.ch writes:
Conveniently enough we have seen both already ;-) Andrew's version for
commit.c could use a bit of refactorization, since it inserts the same
code in two places, but then it's about the same complexity as the
change for rebase.
I'm not sure it's worth
Matthieu Moy matthieu@grenoble-inp.fr writes:
But then the place to warn loudly is the doc for --force. What about
this?
Sounds sensible. I am not sure if --all is all that common to be
singled out, though. I always push these out refspecs, like
[remote origin]
Hello,
I made a small script for easier rebasing of development branches. It
is useful in case you are developing in multiple (private) branches
and you want to rebase your branches onto upstream often.
You can find it here:
https://github.com/dankeder/git-rebranch
How it works:
1. Define the
Am 6/17/2013 15:57, schrieb Mathieu Liénard--Mayor:
Le 2013-06-17 15:54, Peter Krefting a écrit :
Mathieu Liénard--Mayor:
Actually, at first I dealt with it this way:
status_printf_ln(s, color,
_(Splitting %s while rebasing branch '%s' on '%s'.),
stopped_sha ?
Namhyung Kim namhyung@lge.com writes:
In its current form, when an user wants to filter specific ref using
--refs option, she needs to give something like --refs=refs/tags/v1.*.
This is not intuitive as users might think it's enough to give just
actual tag name part like --refs=v1.*.
I
Junio C Hamano gits...@pobox.com writes:
Wouldn't it make more sense to see if the given pattern matches a
tail substring of the ref, instead of using the hardcoded strip
refs/heads/, refs/tags or refs/, and then match once logic? That
way, --refs=origin/* can find refs/remotes/origin/master
Antoine Pelisse apeli...@gmail.com writes:
So here is a more thorough description of the option:
- real changes are interesting
OK, I think I can understand it.
- blank lines that are close enough (less than context size) to
interesting changes are considered interesting (recursive
Olivier, did you upload your hacked version anywhere?
I also need something like this.
--
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/majordomo-info.html
Johannes Sixt j.s...@viscovery.net writes:
Am 6/17/2013 15:57, schrieb Mathieu Liénard--Mayor:
Le 2013-06-17 15:54, Peter Krefting a écrit :
Mathieu Liénard--Mayor:
Actually, at first I dealt with it this way:
status_printf_ln(s, color,
_(Splitting %s while rebasing branch
I have a question about GIT remote repos. Here is my scenario.
1. Work client has a repo (origin, branch of master).
2. Due to contractual issues I need to host a remote copy of this repo that my
developers can utilize while we get the contractual issues resolved as
development must continue.
On Mon, Jun 17, 2013 at 8:39 AM, Joel McGahen vin4bacc...@me.com wrote:
What I need to understand is how to
a) Connect my developer's VM local repos to the new remote repo I created so
they can continue to work.
b) Once the contractual issues are resolved reconnect the developer's local
Thanks William. You response is much appreciated.
Should I have just changed the origin URL in the first place to point to my new
local repo? What I did was to just add another remote with a different name
(temp_repo). So if I do git remote I see origin and temp_repo. I then pushed
to
On Mon, Jun 17, 2013 at 11:39:44AM -0400, Joel McGahen wrote:
I have a question about GIT remote repos. Here is my scenario.
1. Work client has a repo (origin, branch of master).
2. Due to contractual issues I need to host a remote copy of this repo that
my developers can utilize while we
From: Matthieu Moy matthieu@grenoble-inp.fr
Sent: Monday, June 17, 2013 12:09 PM
Junio C Hamano gits...@pobox.com writes:
+* `matching` - push the refspec :. In other words, push all
+ branches having the same name in both ends, even if it means
+ non-fast-forward updates. This is for
Philip Oakley philipoak...@iee.org writes:
+ Note that `--force` applies to all the refs that are pushed,
+ hence using `git push --all --force`, or `git push --force`
+ with `push.default` set to `matching` may override refs other
+ than the current branch (including
On Mon, Jun 17, 2013 at 9:56 AM, Joel McGahen vin4bacc...@me.com wrote:
Should I have just changed the origin URL in the first place to point to my
new local repo? What I did was to just add another remote with a different
name (temp_repo). So if I do git remote I see origin and temp_repo. I
The behavior of git push --force is rather clear when it updates only
one remote ref, but running it when pushing several branches can really
be dangerous. Warn the users a bit more and give them the alternative to
push only one branch.
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
Ramkumar Ramachandra artag...@gmail.com writes:
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index bf08d4e..739624e 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -188,10 +188,9 @@ test_expect_success 'status when rebasing -i in edit
mode' '
Junio C Hamano gits...@pobox.com writes:
Will replace what has been queued on 'pu'.
... after fixing an indentation error, that is.
--
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
On Mon, Jun 17, 2013 at 6:18 PM, Junio C Hamano gits...@pobox.com wrote:
Antoine Pelisse apeli...@gmail.com writes:
So here is a more thorough description of the option:
- real changes are interesting
OK, I think I can understand it.
- blank lines that are close enough (less than context
Junio C Hamano gits...@pobox.com writes:
In other words, the order I was anticipating to see after the
discussion (this is different from saying A series that is not
ordered like this is unacceptable) was:
wt-status: remove unused field in grab_1st_switch_cbdata
This is an unrelated
From: Matthieu Moy matthieu@grenoble-inp.fr
Sent: Monday, June 17, 2013 6:20 PM
Philip Oakley philipoak...@iee.org writes:
+ Note that `--force` applies to all the refs that are pushed,
+ hence using `git push --all --force`, or `git push --force`
+ with `push.default`
This target was only used to create user-manual.pdf with dblatex
using a separate style definition than was used for user-manual.html.
These two style definitions had to be maintained separately and
so made improvements to user-manual.html unnecessarily hard.
Signed-off-by: Thomas Ackermann
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
This is to be squashed into jc/push-2.0-default-to-simple
(Noticed while writing the other patch about --force)
Documentation/git-push.txt | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-push.txt
Mathieu Lienard--Mayor mathieu.lienard--ma...@ensimag.imag.fr
writes:
When in the middle of a rebase, it can be annoying to go in .git
in order to find the SHA1 of the commit where the rebase stopped.
git-status now includes this information in its default output.
With this new information,
Ramkumar Ramachandra artag...@gmail.com writes:
+ test $# == 1 ||
This is broken under POSIX shells. No need to resend (will locally
patch up).
--
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
On Mon, Jun 17, 2013 at 6:18 PM, Junio C Hamano gits...@pobox.com wrote:
Antoine Pelisse apeli...@gmail.com writes:
So here is a more thorough description of the option:
- real changes are interesting
OK, I think I can understand it.
- blank lines that are close enough (less than context
Ralf Thielow ralf.thie...@gmail.com writes:
When cherry-pick is in progress, 'git status' gives the advice to
run git commit to finish the cherry-pick. However, this won't continue
the sequencer.
git status should give the advice of running git cherry-pick --continue
or git cherry-pick
2013/6/17 Junio C Hamano gits...@pobox.com:
Ralf Thielow ralf.thie...@gmail.com writes:
When cherry-pick is in progress, 'git status' gives the advice to
run git commit to finish the cherry-pick. However, this won't continue
the sequencer.
git status should give the advice of running git
Can someone take a look at this and let me know what I'm doing wrong?
Also, what's the best way to test filters? I can't really do -Debug or
really even print various output.
https://github.com/ag4ve/github-test
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a
Matthieu Moy matthieu@imag.fr writes:
The behavior of git push --force is rather clear when it updates only
one remote ref, but running it when pushing several branches can really
be dangerous. Warn the users a bit more and give them the alternative to
push only one branch.
Matthieu Moy matthieu@imag.fr writes:
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
This is to be squashed into jc/push-2.0-default-to-simple
(Noticed while writing the other patch about --force)
Thanks.
Note that this has to further change if Ram's triangular push fix
comes
Antoine Pelisse apeli...@gmail.com writes:
+ unsigned long changes = ULONG_MAX;
Let me explain what changes means, as I know it will help the rest
of the message:
It counts the number of *added* blank lines we have ignored since
lxch (needed to calculate the distance between lxch and
Makes sense; thanks.
--
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/majordomo-info.html
Dennis Kaarsemaker den...@kaarsemaker.net writes:
I'm doing daily builds of git, using many workers and a shared git.git,
with per-worker checkouts
OK, so GIT_DIR is explicitly specified in these workers.
Makes sense.
--
To unsubscribe from this list: send the line unsubscribe git in
the
Junio C Hamano gits...@pobox.com writes:
Dennis Kaarsemaker den...@kaarsemaker.net writes:
I'm doing daily builds of git, using many workers and a shared git.git,
with per-worker checkouts
OK, so GIT_DIR is explicitly specified in these workers.
Makes sense.
Actually it does not. What
David Aguilar dav...@gmail.com writes:
On Sun, Jun 16, 2013 at 10:51 AM, John Keeping j...@keeping.me.uk wrote:
Instead of needing a wrapper to call the diff/merge command, simply
provide the diff_cmd and merge_cmd functions for user-specified tools in
the same way as we do for built-in
John Keeping j...@keeping.me.uk writes:
Signed-off-by: John Keeping j...@keeping.me.uk
---
Thanks; will directly apply 1/2 on maint. I am not absolutely sure
about this one, where variables related to an optional info
support used to be in one place but with the patch only infodir is
Ralf Thielow ralf.thie...@gmail.com writes:
2013/6/17 Junio C Hamano gits...@pobox.com:
Ralf Thielow ralf.thie...@gmail.com writes:
When cherry-pick is in progress, 'git status' gives the advice to
run git commit to finish the cherry-pick. However, this won't continue
the sequencer.
git
Am 16.06.2013 02:56, schrieb Junio C Hamano:
One thing renaming df_conficts to conflicts really proves is that
this field is not used by the traverse_trees machinery at all.
Before this patch, the bits in conflicts (now df_conflicts) mask had
the semantics that is not consistent with the
Am 16.06.2013 16:18, schrieb John Keeping:
Changes since v3:
* There are four new patches, three of which are style fixes for
existing tests and one fixes an existing error message to return a
more accurate path when recursing.
* You now cannot run git submodule add relative URL from
René Scharfe rene.scha...@lsrfire.ath.cx writes:
The information is only useful for the unpack_trees callback, and
info-data is a more appropriate place to hang such a callback
specific data.
Perhaps we should use info-data field to point at
struct {
struct
Junio C Hamano gits...@pobox.com writes:
Note that this has to further change if Ram's triangular push fix
comes before 2.0.
I didn't follow precisely this topic. In any case, better have this in
the patch, if only as a reminder that this part will need to be updated.
I am not sure if these
On 13-06-17 01:52 PM, Matthieu Moy wrote:
The behavior of git push --force is rather clear when it updates only
one remote ref, but running it when pushing several branches can really
be dangerous. Warn the users a bit more and give them the alternative to
push only one branch.
Signed-off-by:
+ } else if (changes != ULONG_MAX
+xch-i1 + changes - (lxch-i1 + lxch-chg1)
max_common) {
+ break;
If we are no longer in interesting zone (changes != ULONG_MAX), it
means we will stop if the distance is too big.
changes is used in
Marc Branchaud marcn...@xiplink.com writes:
On 13-06-17 01:52 PM, Matthieu Moy wrote:
The behavior of git push --force is rather clear when it updates only
one remote ref, but running it when pushing several branches can really
be dangerous. Warn the users a bit more and give them the
Am 17.06.2013 22:44, schrieb Junio C Hamano:
René Scharfe rene.scha...@lsrfire.ath.cx writes:
The information is only useful for the unpack_trees callback, and
info-data is a more appropriate place to hang such a callback
specific data.
Perhaps we should use info-data field to point at
The following snippet illustrates the problem:
$ uname -srvm
Linux 3.9.5-smp #2 SMP Mon Jun 10 02:54:26 CDT 2013 i686
$ git --version
git version 1.8.3
$ git clone https://github.com/torvalds/linux.git
Cloning into 'linux'...
fatal: unable to access
On Tue, 18 Jun 2013, LCD 47 wrote:
Cloning with the git protocol works as expected.
A search on the net shows people having the same problem more than an year
ago, and the solution there seems to imply that Git can't cope with async
DNS in curl:
On 18 June 2013, Daniel Stenberg dan...@haxx.se wrote:
On Tue, 18 Jun 2013, LCD 47 wrote:
Cloning with the git protocol works as expected.
A search on the net shows people having the same problem more than an
year ago, and the solution there seems to imply that Git can't cope
with
Am 17.06.2013 22:44, schrieb Junio C Hamano:
René Scharfe rene.scha...@lsrfire.ath.cx writes:
The information is only useful for the unpack_trees callback, and
info-data is a more appropriate place to hang such a callback
specific data.
Perhaps we should use info-data field to point at
Antoine Pelisse apeli...@gmail.com writes:
Re-reading note: OK, This last sentence (If not we will eventually be
too far and break) is actually a bug. We might break before we find
something interesting while we should keep going. For example in such
a case, we should display like this, but
René Scharfe rene.scha...@lsrfire.ath.cx writes:
Am 17.06.2013 22:44, schrieb Junio C Hamano:
... Or, perhaps we can
- add df_conflict to struct unpack_trees_options;
- have traverse_info-data point at struct unpack_trees_options as
before; and
- save the old value of
René Scharfe rene.scha...@lsrfire.ath.cx writes:
How about going into the opposite direction and moving df_conflicts
handling more into traverse_tree? If the function saved the mask
and dirmask in traverse_info then callbacks could calculate the
cumulated d/f conflicts by walking the info
From: Brandon Casey draf...@gmail.com
remote_find_tracking() populates the query struct with an allocated
string in the dst member. So, we do not need to xstrdup() the string,
since we can transfer ownership from the query struct (which will go
out of scope at the end of this function) to our
From: Brandon Casey draf...@gmail.com
Prior to commit fa83a33b, the 'git checkout' DWIMery would create a
new local branch if the specified branch name did not exist and it
matched exactly one ref in the remotes namespace. It searched
the remotes namespace for matching refs using a simple
From: Brandon Casey draf...@gmail.com
Curl requires that we manage any strings that we pass to it as pointers.
So, we should not be overwriting this strbuf after we've passed it to
curl.
Additionally, it is unnecessary since we only prompt for the user name
and password once, so we end up
git-prompt.sh lacks tests for PROMPT_COMMAND mode.
Add tests for:
* pcmode prompt without colors
* pcmode prompt with colors for bash
* pcmode prompt with colors for zsh
Having these tests enables an upcoming refactor in
a safe way.
Signed-off-by: Eduardo R. D'Avila erdav...@gmail.com
---
254
From: SZEDER Gábor sze...@ira.uka.de
Use 'file' instead of ' file', in accordance with the coding
guidelines.
Signed-off-by: SZEDER Gábor sze...@ira.uka.de
---
t/t9903-bash-prompt.sh | 232 -
1 file changed, 116 insertions(+), 116 deletions(-)
__git_ps1_colorize_gitstring() sets color codes and
builds the prompt gitstring. It has duplicated code
to handle color codes for bash and zsh shells.
__git_ps1() also has duplicated logic to build the
prompt gitstring.
Remove duplication of logic to build gitstring in
From: SZEDER Gábor sze...@ira.uka.de
Hi,
displaying the git-specific bash prompt on Windows/MinGW takes quite
long, long enough to be noticeable. This is mainly caused by the
numerous fork()s and exec()s to create subshells and run git or other
commands, which are rather expensive on Windows.
From: SZEDER Gábor sze...@ira.uka.de
Also move the shebang line into the here document.
Signed-off-by: SZEDER Gábor sze...@ira.uka.de
---
t/t9903-bash-prompt.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index
The use of colors in a prompt is only possible in
pcmode (using the variable PROMPT_COMMAND).
Enable color prompt in non-pcmode (using the variable
PS1) for both Bash and ZSH.
Signed-off-by: Eduardo R. D'Avila erdav...@gmail.com
---
15 9 contrib/completion/git-prompt.sh
19 0
From: SZEDER Gábor sze...@ira.uka.de
__git_ps1() finds out the path to the repository by using the
__gitdir() helper function. __gitdir() is basically just a wrapper
around 'git rev-parse --git-dir', extended with support for
recognizing a remote repository given as argument, to use the path
From: SZEDER Gábor sze...@ira.uka.de
__git_ps1() runs the '$(git symbolic-ref HEAD)' command substitution
to find out whether we are on a branch and to find out the name of
that branch. This imposes the overhead of fork()ing a subshell and
fork()+exec()ing a git process.
Since HEAD is in most
From: SZEDER Gábor sze...@ira.uka.de
During an ongoing interactive rebase __git_ps1() finds out the name of
the rebased branch, the total number of patches and the number of the
current patch by executing a '$(cat .git/rebase-merge/FILE)' command
substitution for each. That is not quite the most
From: SZEDER Gábor sze...@ira.uka.de
Currently __gitdir() is duplicated in the git completion and prompt
scripts, while its tests are in the prompt test suite. This patch
series is about to change __git_ps1() in a way that it won't need
__gitdir() anymore and __gitdir() will be removed from the
From: SZEDER Gábor sze...@ira.uka.de
When describing a detached HEAD according to the $GIT_PS1_DESCRIBE
environment variable fails, __git_ps1() runs the '$(cut -c1-7
.git/HEAD)' command substitution to put the 7 hexdigits abbreviated
commit object name in the prompt. This imposes the overhead of
From: SZEDER Gábor sze...@ira.uka.de
Signed-off-by: SZEDER Gábor sze...@ira.uka.de
---
t/t9903-bash-prompt.sh | 9 +
1 file changed, 9 insertions(+)
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index 1047c664..48460ef6 100755
--- a/t/t9903-bash-prompt.sh
+++
From: SZEDER Gábor sze...@ira.uka.de
... to gain one level of indentation for the bulk of the function.
(The patch looks quite unreadable, you'd better check it with 'git
diff -w'.)
Signed-off-by: SZEDER Gábor sze...@ira.uka.de
---
contrib/completion/git-prompt.sh | 201
From: SZEDER Gábor sze...@ira.uka.de
Before setting $PS1, __git_ps1() uses a command substitution to
redirect the output from a printf into a variable. Spare the overhead
of fork()ing a subshell by using 'printf -v var' to directly assign
the output to a variable.
zsh's printf doesn't support
From: SZEDER Gábor sze...@ira.uka.de
When enabled, the bash prompt can indicate the presence of untracked
files with a '%' sign. __git_ps1() checks for untracked files by running the
'$(git ls-files --others --exclude-standard)' command substitution,
and displays the indicator when there is no
From: SZEDER Gábor sze...@ira.uka.de
From the four '$(git rev-parse --opt)' command substitutions
__git_ps1() executes three in its main code path:
- the first to get the path to the .git directory ('--git-dir'),
- the second to check whether we're inside the .git directory
From: SZEDER Gábor sze...@ira.uka.de
When the environment variable $GIT_PS1_SHOWSTASHSTATE is set
__git_ps1() checks the presence of stashes by running 'git rev-parse
--verify refs/stash'. This command not only checks that the
'refs/stash' ref exists but also, well, verifies that it's a valid
1 - 100 of 110 matches
Mail list logo
