On Fri, May 10, 2013 at 11:31 PM, Jonathan Nieder wrote:
> David Aguilar wrote:
>
>> t0070-fundamental.sh fails on Mac OS X 10.8 by default.
>> Fix it by using Git's regex library.
>
> Can you say more about the failure? What does
>
> ./t0070-fundamental.sh -v
>
> say?
[..snip...]
expec
David Aguilar wrote:
> t0070-fundamental.sh fails on Mac OS X 10.8 by default.
> Fix it by using Git's regex library.
Can you say more about the failure? What does
./t0070-fundamental.sh -v
say?
Curious,
Jonathan
--
To unsubscribe from this list: send the line "unsubscribe git" in
the
David Aguilar wrote:
> Mac OS X Mountain Lion warns that HMAC_Init() and friends are
> deprecated. Use CommonCrypto's HMAC to eliminate the warnings.
Makes sense, and if the #define trick stops working some day
due to some conflicting macro in an openssl header some day, it
would just break the
Hi,
David Aguilar wrote:
> Mac OS X Mountain Lion prints warnings when building git:
>
> warning: 'SHA1_Init' is deprecated
> (declared at /usr/include/openssl/sha.h:121)
>
> Silence the warnings by using the Common Digest SHA-1
> functions for SHA1_Init(), SHA1_Update(), and SHA1_Fin
Paul Mackerras wrote:
> I thought I had replied to this patch; maybe I only thought about it.
>
> Given that we already have a selector to choose between exact and
> regexp matching, it seems more natural to use that rather than add a
> new selector entry. Arguably the "IgnCase" option should be
Hi,
René Scharfe wrote:
> [Subject: t5004: resurrect original empty tar archive test]
[...]
> The different approaches test different things: The existing one is
> for empty trees, for which we know the exact expected output and thus
> we can simply check it without extracting; the new one is for
On Tue, May 07, 2013 at 01:17:18PM -0400, Martin Langhoff wrote:
> I just did git rebase origin/master for the umpteenth time, which
> reminded me this nice patch is still pending.
>
> ping?
I thought I had replied to this patch; maybe I only thought about it.
Given that we already have a select
t0070-fundamental.sh fails on Mac OS X 10.8 by default.
Fix it by using Git's regex library.
Signed-off-by: David Aguilar
---
"make test" fails right now; this fixes it.
t0070-fundamental is how far it got last time.
It's still running now.. :-)
Makefile | 1 +
1 file changed, 1 insertion(+)
d
Mac OS X Mountain Lion warns that HMAC_Init() and friends are
deprecated. Use CommonCrypto's HMAC to eliminate the warnings.
Signed-off-by: David Aguilar
---
This builds upon the patch I sent earlier, so technically it's 2/2
While researching these errors I found this:
http://opensource.apple.
Mac OS X Mountain Lion prints warnings when building git:
warning: 'SHA1_Init' is deprecated
(declared at /usr/include/openssl/sha.h:121)
Silence the warnings by using the Common Digest SHA-1
functions for SHA1_Init(), SHA1_Update(), and SHA1_Final().
Add a COMMON_DIGEST_SHA1 kno
Mac OS X Mountain Lion prints warnings when building git:
warning: 'SHA1_Init' is deprecated
(declared at /usr/include/openssl/sha.h:121)
Silence the warnings by using the Common Digest SHA-1
functions for SHA1_Init(), SHA1_Update(), and SHA1_Final().
Add a COMMON_DIGEST_SHA1 kno
On Fri, May 10, 2013 at 11:04:01AM -0700, Junio C Hamano wrote:
> One thing to notice is that those accessing rev->pending before
> calling prepare_revision_walk(), as opposed to those receiving
> objects in rev->commits via get_revision(), are the only ones that
> care about the context and wants
Filipe Cabecinhas writes:
> It compiles cleanly and runs. I'm running the test suite anyway, but
> don't expect any change from your latest patch.
Heh, I do not think we did write(2) of that many bytes in our test
suite ;-)
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe gi
Hi Junio,
It compiles cleanly and runs. I'm running the test suite anyway, but
don't expect any change from your latest patch.
Thank you,
Filipe
F
On Fri, May 10, 2013 at 4:13 PM, Filipe Cabecinhas wrote:
> Hi Junio,
>
> Thanks for helping. Your text is correct and only diffs from my patc
Hi Junio,
Thanks for helping. Your text is correct and only diffs from my patch
in the #define write(...) part, where I suppose you stripped the
spaced in the arglist.
Thank you,
Filipe
F
On Fri, May 10, 2013 at 4:05 PM, Junio C Hamano wrote:
> Filipe Cabecinhas writes:
>
>> Due to a bu
Junio C Hamano writes:
> Also I have a small suggestion I'd like you to try on top of it,
> which I'll be sending in a separate message.
The first hunk is to match other Makefile knobs the builders can
tweak with minimum documentation.
As you hinted that there may be other platforms that may wa
Filipe Cabecinhas writes:
> Due to a bug in the Darwin kernel, write() calls have a maximum size of
> INT_MAX bytes.
>
> This patch introduces a new compat function: clipped_write
> This function behaves the same as write() but will write, at most, INT_MAX
> characters.
> It may be necessary to i
Due to a bug in the Darwin kernel, write() calls have a maximum size of
INT_MAX bytes.
This patch introduces a new compat function: clipped_write
This function behaves the same as write() but will write, at most, INT_MAX
characters.
It may be necessary to include this function on Windows, too.
Si
Felipe Contreras writes:
> On Fri, May 10, 2013 at 1:38 PM, Junio C Hamano wrote:
>> I should learn to start bugging you folks a lot earlier in the
>> release cycle (except for Jiang, as localization strings will not be
>> finalizable until very late), but anyway, we will soon be tagging
>> the
Jonathan Nieder writes:
> Ramkumar Ramachandra wrote:
>
>> Can we do better by not printing the -v
>> output of the passing tests though?
>
> Not for my use. The output from comprable tests before is often
> useful for comparison.
Perhaps.
But the output from passing
On Fri, May 10, 2013 at 1:38 PM, Junio C Hamano wrote:
> I should learn to start bugging you folks a lot earlier in the
> release cycle (except for Jiang, as localization strings will not be
> finalizable until very late), but anyway, we will soon be tagging
> the hopefully final -rc for the upcom
When force_push is disabled, we need to turn the argument to True.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index c84a7
We only need to get the remote dict once.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index 50ead38..40da4b0 100755
--
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index 14e7395..c84a7b4 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remot
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/test-hg.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-helpers/test-hg.sh
b/contrib/remote-helpers/test-hg.sh
index 8de2aa7..f8d1f9e 100755
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/
We skip it locally, but not for the remote, so let's do so.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index 84901e9..1
In certain situations we might end up pushing garbage revisions (e.g. in
a rebase), and the patches to deal with that haven't been merged yet.
So let's disable forced pushes by default.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 6 +++---
1 file changed, 3 insert
Hi,
A few fixes since last series, plus a few more patches. Simple no-brainers.
Felipe Contreras (6):
remote-hg: disable forced push by default
remote-hg: don't push fake 'master' bookmark
remote-hg: update bookmarks when pulling
remote-hg: test: be a little more quiet
remote-hg: fix ne
Felipe Contreras writes:
> On Fri, May 10, 2013 at 3:28 PM, Junio C Hamano wrote:
>> Felipe Contreras writes:
>>
>>> +test_expect_success 'push update refs failure' '
>>> + (cd local &&
>>> + git checkout update &&
>>> + echo "update fail" >>file &&
>>> + git commit -a -m "updat
On Fri, May 10, 2013 at 3:28 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> +test_expect_success 'push update refs failure' '
>> + (cd local &&
>> + git checkout update &&
>> + echo "update fail" >>file &&
>> + git commit -a -m "update fail" &&
>> + git rev-parse --
Felipe Contreras writes:
> +test_expect_success 'push update refs failure' '
> + (cd local &&
> + git checkout update &&
> + echo "update fail" >>file &&
> + git commit -a -m "update fail" &&
> + git rev-parse --verify testgit/origin/heads/update >expect &&
> + GIT_REMOTE_
The following changes since commit 9b795193a6a7e963db62d9cd8e86752a40940520:
Update draft release notes for 1.8.3 (2013-05-07 22:50:05 -0700)
are available in the git repository at:
git://git.bogomips.org/git-svn.git master
for you to fetch changes up to a7b102302ad9495fb4eb5088ffcb09c44a40
Hi,
I often do:
$ git checkout t-rebase-cleanup
$ git push
$ git checkout -
$ git merge @{u}
$ git checkout rebase.autostash
$ git rebase master
$ git checkout -
# noop
# Aargh!
$ git checkout -
# noop again
Isn't this highly annoying?
Ram
--
To unsub
I went to reference some `rebase -i` discussion that landed in 3ca26e8
(Merge branch 'wk/user-manual', 2013-02-25), and I couldn't find a
version of the manual online that contained the new content. There's
a version on kernel.org [1], but that doesn't seem to have been
updated since February. Th
Hi,
My push.default is current. I often end up doing:
# on master
$ git push
# switch to another terminal
$ git checkout rebase.autostash
$ git rebase master
# go back to previous terminal
# push has failed
This happens because push tries to push rebase.auto
Hey,
On Fri, May 10, 2013 at 9:10 PM, Sebastian Schuberth
wrote:
> On 23.01.2013 20:27, Scott Chacon wrote:
>
>> As you may remember, we did not have a GitTogether last year. Since I
>> miss drinking and talking Git nerdiness with all of you, I'm going to
>> try organizing some face time on a se
Ramkumar Ramachandra wrote:
> Can we do better by not printing the -v
> output of the passing tests though?
Not for my use. The output from comprable tests before is often
useful for comparison. I wouldn't be against such an option for
people who want it, though.
Than
Jonathan Nieder wrote:
> I use "-v -i" together quite frequently when debugging. I also use
> "-v" automatically to debug test failures when tests are invoked
> automatically on machines I do not have access to.
Yeah, it makes sense on remote machines. I just found out about -i,
and the -v -i co
On 23.01.2013 20:27, Scott Chacon wrote:
As you may remember, we did not have a GitTogether last year. Since I
miss drinking and talking Git nerdiness with all of you, I'm going to
try organizing some face time on a semi-regular basis. I would like
to try to do a small Git conference in the US
I tested the patch as I am the same person that bothered about the
behavior a while ago. Please merge.
- Sorry for sending an HTML formatted mail before.
On Thu, May 9, 2013 at 6:30 PM, Heiko Voigt wrote:
> Counting of lines did not skip this line when generating the hunk
> header.
>
> Signed-off
Ramkumar Ramachandra wrote:
> Quite frankly, I think -v is completely useless; who likes to scroll
> through pages of terminal output?
I use "-v -i" together quite frequently when debugging. I also use
"-v" automatically to debug test failures when tests are invoked
automatically on machines I d
On Thu, May 9, 2013 at 10:41 PM, Charles Bailey wrote:
> On Thu, May 09, 2013 at 03:17:30PM -0700, David Aguilar wrote:
>> Generally, "mergetool..cmd" is not general enough since we've
>> always special cased the base vs. no-base code paths and we run
>> different commands depending on whether a b
I should learn to start bugging you folks a lot earlier in the
release cycle (except for Jiang, as localization strings will not be
finalizable until very late), but anyway, we will soon be tagging
the hopefully final -rc for the upcoming release. Please throw me a
"pull this now!" if you have stu
Junio C Hamano writes:
> Michael J Gruber writes:
>
>> diff --git a/object.h b/object.h
>> index 97d384b..695847d 100644
>> --- a/object.h
>> +++ b/object.h
>> @@ -13,6 +13,7 @@ struct object_array {
>> struct object *item;
>> const char *name;
>> unsigned
People not familiar with AsciiDoc may not realize they are
supposed to update *.txt files and not *.html/*.1 files when
preparing patches to the project.
Signed-off-by: Dale Worley
---
Documentation/CodingGuidelines |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/D
Michael J Gruber writes:
> diff --git a/object.h b/object.h
> index 97d384b..695847d 100644
> --- a/object.h
> +++ b/object.h
> @@ -13,6 +13,7 @@ struct object_array {
> struct object *item;
> const char *name;
> unsigned mode;
> + struct obje
Ramkumar Ramachandra wrote:
> I just comment out the test_expect_success and close-quote, and put a
> test_done after it. I would never advocate this GIT_TRACE thing
> anywhere, because I want to put GIT_TRACE=1 (and possibly other
> modifications) where I want it. Locally.
On that note, I'd rea
Junio C Hamano wrote:
> To me, most of them look like responses to valid issues, and that
> holds true even for [PATCH 1/4]. Even though your response may have
> been an incorrect one, the issue that triggered the response is
> still valid---the setting of these variables without explanation
> inv
Jeff King writes:
> On Fri, May 10, 2013 at 10:02:51AM -0700, Junio C Hamano wrote:
>
>> > Make "show" on blobs behave like "diff", i.e. honor "--textconv" by
>> > default and "--no-textconv" when given.
>> [...]
>> So "show" on blobs does show the raw contents by default, but the
>> user can exp
Ramkumar Ramachandra writes:
> Junio C Hamano wrote:
>> Perhaps because this is a test about "rebase" and a typical debugger
>> does not want to trace other "git" things while debugging this?
>
> Okay, let's drop this 4-part series: it's too minor.
Why throw the baby with bathwater?
To me, most
On Fri, May 10, 2013 at 10:02:51AM -0700, Junio C Hamano wrote:
> > Make "show" on blobs behave like "diff", i.e. honor "--textconv" by
> > default and "--no-textconv" when given.
> [...]
> So "show" on blobs does show the raw contents by default, but the
> user can explicitly ask to enable textco
Eric Sunshine writes:
> On Fri, May 10, 2013 at 10:29 AM, Ramkumar Ramachandra
> wrote:
>> test-lib.sh already sets a sane GIT_AUTHOR_{NAME,EMAIL} for all test
>> scripts to use. Don't unnecessarily duplicate the work.
>>
>> Signed-off-by: Ramkumar Ramachandra
>> ---
>> t/t3400-rebase.sh | 4
Michael J Gruber writes:
> Currently, "diff" and "cat-file" for blobs honor "--textconv" options
> (with the former defaulting to "--textconv" and the latter to
> "--no-textconv") whereas "show" does not honor this option, even though
> it takes diff options.
>
> Make "show" on blobs behave like
On Fri, May 10, 2013 at 05:06:07PM +0200, Thomas Rast wrote:
> + if (argc > 1 && !prefixcmp(argv[1], "--")) {
> + const char *subcommand = argv[1] + 2;
> + struct cmdnames main_cmds, other_cmds;
> +
> + memset(&main_cmds, 0, sizeof(main_cmds));
> +
Junio C Hamano wrote:
> Perhaps because this is a test about "rebase" and a typical debugger
> does not want to trace other "git" things while debugging this?
Okay, let's drop this 4-part series: it's too minor.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a mes
Junio C Hamano wrote:
> So it is either (1) the added code is unreachable and unexercised at
> this point in the series, or
Yeah, it's (1).
> Perhaps this should come a bit later in the series?
When exactly? I picked up on your suggestion to separate out the
preparation-for-$backend-to-return s
Thomas Rast wrote:
> [1] correctly observed that we are already wrapping three different
> operations under the git-checkout command.
Incorrect. We merge_trees() and update refs. I see no reason to
create artificial abstractions on top of this.
> [...]
Let's not talk about how gross your imple
Junio C Hamano writes:
> Duy Nguyen writes:
>
>> On Fri, May 10, 2013 at 1:37 PM, Junio C Hamano wrote:
>>> Johannes Sixt writes:
>>> Imagine that a user runs "git rebase" on a history leading to commit
>>> X to create an alternate, improved history that leads to commit Y.
>>> What if we teach
Thomas Rast writes:
> [1] correctly observed that we are already wrapping three different
> operations under the git-checkout command.
It is not April 1st, but perhaps it is in Berlin ;-)
By the way I do not necessarily think that different operations
"checking out specific paths" and "checking
On Fri, May 10, 2013 at 12:30:39AM +0200, Jeff King wrote:
> On Thu, May 09, 2013 at 06:20:18PM +0200, Heiko Voigt wrote:
>
> > +static int config_buf_fgetc(struct config_source *conf)
> > +{
> > + if (conf->buf.pos < conf->buf.len && conf->buf.buf[conf->buf.pos])
> > + return conf->bu
Ramkumar Ramachandra writes:
> Junio C Hamano wrote:
>> Ramkumar Ramachandra writes:
>>
>>> A couple of tests execute 'git rebase' with GIT_TRACE set to 1, but
>>> this trace output is not used anywhere.
>>
>> Isn't it shown in "t4300-*.sh -v" output to help the debugger?
>
> Um, but why the GIT
Ramkumar Ramachandra writes:
> On successful completion of a rebase in git-rebase--$backend.sh, the
> $backend script cleans up on its own and exits. The cleanup routine
> is however, independent of the $backend, and each $backend script
> unnecessarily duplicates this work:
>
> rm -rf "$sta
On Fri, May 10, 2013 at 11:10 AM, Michael J Gruber
wrote:
> From: Junio C Hamano
>
> The diff_opt infrastructure sets flags based on defaults and command
> line options. Currently, it is impossible to detect whether a flag has
> been set as a default or on explicit request.
>
> Amend the structur
Ramkumar Ramachandra writes:
> +finish_rebase () {
> + if test -f "$state_dir/autostash"
> + then
> + stash_sha1=$(cat "$state_dir/autostash")
> + if git stash apply $stash_sha1 2>&1 >/dev/null
> + then
> + echo "Applied autostash"
>
Eric Sunshine writes:
> On Fri, May 10, 2013 at 10:26 AM, Ramkumar Ramachandra
> wrote:
>> On successful completion of a rebase in git-rebase--$backend.sh, the
>> $backend script cleans up on its own and exits. The cleanup routine
>> is however, independent of the $backend, and each $backend sc
Make "grep" honor the "--textconv" option also for the object case, i.e.
when used with an argument "rev:path".
Signed-off-by: Michael J Gruber
---
builtin/grep.c | 11 ++-
object.c | 26 --
object.h | 2 ++
t/t7008-grep-binary
From: Jeff King
Recently and not so recently, we made sure that log/grep type operations
use textconv filters when a userfacing diff would do the same:
ef90ab6 (pickaxe: use textconv for -S counting, 2012-10-28)
b1c2f57 (diff_grep: use textconv buffers for add/deleted files, 2012-10-28)
0508fe5
When a command is supposed to use textconv filters (by default or with
"--textconv") and none are configured then the blob is output without
conversion; the only exception to this rule is "cat-file --textconv".
Make it behave like the rest of textconv aware commands.
Signed-off-by: Michael J Grub
Currently, "git grep" does not honor any textconv filters, with nor
without --textconv. Demonstrate this in the tests.
The default is expected to remain unchanged.
Signed-off-by: Michael J Gruber
---
t/t7008-grep-binary.sh | 31 +++
1 file changed, 31 insertions(+)
Currently, "diff" and "cat-file" for blobs honor "--textconv" options
(with the former defaulting to "--textconv" and the latter to
"--no-textconv") whereas "show" does not honor this option, even though
it takes diff options.
Make "show" on blobs behave like "diff", i.e. honor "--textconv" by
def
From: Junio C Hamano
The diff_opt infrastructure sets flags based on defaults and command
line options. Currently, it is impossible to detect whether a flag has
been set as a default or on explicit request.
Amend the structure so that this detection is possible:
* There is an extra "opt->touch
"git show " honors the --textconv option while "git show "
does not. Demonstrate this in the test.
Since the current behavior is supposed to stay as is, we expect the
default for "git show " to remain --no-textconv.
Signed-off-by: Michael J Gruber
---
t/t4030-diff-textconv.sh | 24 +
This is the "Git Merge edition" of the textconv series. Great
conference, the series struggles to match that.
v3 keeps all defaults as they are (no textconv for blobs by default) and
incorporates Junio's touched_flags patch. I do not need the callback but
left it in.
As for beeing able to choose
[1] correctly observed that we are already wrapping three different
operations under the git-checkout command. To lead that design -- and
the Koan -- to the obvious conclusion, some additional work is
required.
With this patch, you can say
git checkout --reset foo # reset HEAD to foo
gi
Eric Sunshine wrote:
> These values are intentionally bogus. Doesn't this change defeat the
> purpose of 43c2325 (am: use get_author_ident_from_commit instead of
> mailinfo when rebasing; 2010-06-16)?
Oh, oops. I paid too little attention to this series.
Thanks for catching.
--
To unsubscribe fr
On Fri, May 10, 2013 at 10:29 AM, Ramkumar Ramachandra
wrote:
> test-lib.sh already sets a sane GIT_AUTHOR_{NAME,EMAIL} for all test
> scripts to use. Don't unnecessarily duplicate the work.
>
> Signed-off-by: Ramkumar Ramachandra
> ---
> t/t3400-rebase.sh | 4
> 1 file changed, 4 deletion
Junio C Hamano wrote:
> Ramkumar Ramachandra writes:
>
>> A couple of tests execute 'git rebase' with GIT_TRACE set to 1, but
>> this trace output is not used anywhere.
>
> Isn't it shown in "t4300-*.sh -v" output to help the debugger?
Um, but why the GIT_TRACE in just these two places? Can't I
Ramkumar Ramachandra writes:
> In preparation for a later patch that creates $dotest/autostash in
> git-rebase.sh before anything else happens, don't assume that the
> presence of a $dotest directory implies the existence of the $next and
> $last files. The check for the files is in a conditiona
On Fri, May 10, 2013 at 10:26 AM, Ramkumar Ramachandra
wrote:
> diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
> new file mode 100755
> index 000..8386998
> --- /dev/null
> +++ b/t/t3420-rebase-autostash.sh
> @@ -0,0 +1,148 @@
> +#!/bin/sh
> +#
> +# Copyright (c) 2013 R
Ramkumar Ramachandra writes:
> A couple of tests execute 'git rebase' with GIT_TRACE set to 1, but
> this trace output is not used anywhere.
Isn't it shown in "t4300-*.sh -v" output to help the debugger?
> relevant to what we are testing.
>
> Signed-off-by: Ramkumar Ramachandra
> ---
> t/t340
Felipe Contreras writes:
> Commit 664059f (transport-helper: update remote helper namespace)
> updates the namespace when the push succeeds or not; we should do it
> only when it succeeded.
>
> Signed-off-by: Felipe Contreras
> ---
>
> The regression is in 'next' so far.
Thanks.
As you may wel
On Fri, May 10, 2013 at 10:26 AM, Ramkumar Ramachandra
wrote:
> On successful completion of a rebase in git-rebase--$backend.sh, the
> $backend script cleans up on its own and exits. The cleanup routine
> is however, independent of the $backend, and each $backend script
> unnecessarily duplicates
Hi,
I was just going through t3400 when wondering where to put the tests
for rebase.autostash. Here's a set of trivial patches.
Thanks.
Ramkumar Ramachandra (4):
t3400 (rebase): don't set GIT_AUTHOR_{NAME,EMAIL}
t3400 (rebase): downcase a couple of test titles
t3400 (rebase): move lone st
Otherwise they stick out like sore thumbs in the test output, where
all the other titles begin with a lowercase letter.
Signed-off-by: Ramkumar Ramachandra
---
t/t3400-rebase.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index a7
A couple of tests execute 'git rebase' with GIT_TRACE set to 1, but
this trace output is not used anywhere. Remove it, since it is not
relevant to what we are testing.
Signed-off-by: Ramkumar Ramachandra
---
t/t3400-rebase.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
test-lib.sh already sets a sane GIT_AUTHOR_{NAME,EMAIL} for all test
scripts to use. Don't unnecessarily duplicate the work.
Signed-off-by: Ramkumar Ramachandra
---
t/t3400-rebase.sh | 4
1 file changed, 4 deletions(-)
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index b58fa1a..a7ca
'rm -f B' is a lone statement that isn't contained inside any
test_expect_* block. Use test_when_finished to execute it after the
preceding test has finished.
Signed-off-by: Ramkumar Ramachandra
---
t/t3400-rebase.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3400-re
In preparation for a later patch that will create $state_dir/autostash
in git-rebase.sh before anything else can happen, change a `mkdir
$state_dir` call to `mkdir -p $state_dir`. The change is safe,
because this is not a test to detect an in-progress rebase (that is
already done much earlier in g
On successful completion of a rebase in git-rebase--$backend.sh, the
$backend script cleans up on its own and exits. The cleanup routine
is however, independent of the $backend, and each $backend script
unnecessarily duplicates this work:
rm -rf "$state_dir"
git gc --auto
Prepare git-reb
Return control to the caller git-rebase.sh to get these two tasks
rm -fr "$dotest"
git gc --auto
done by it.
Signed-off-by: Ramkumar Ramachandra
---
git-rebase--merge.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
Return control to the caller git-rebase.sh to get these two tasks
rm -fr "$dotest"
git gc --auto
done by it.
Signed-off-by: Ramkumar Ramachandra
---
git-rebase--interactive.sh | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-
This new feature allows a rebase to be executed on a dirty worktree.
It works by creating a temporary stash and storing it in
$state_dir/autostash before the operation, and applying it after a
successful operation. It will be removed along with the $state_dir if
the operation is aborted.
The feat
We currently assume that, if a $dotest directory exists, an am had
been called earlier. This assumption might get our conditional to
match a stray $dotest directory created somewhere else, and result in
failures down the line. So, tighten the conditional by additionally
looking for the file $dotes
We only need to do these two tasks
git gc --auto
rm -fr "$dotest"
ourselves if the script was invoked as a standalone program; when
invoked with --rebasing (from git-rebase--am.sh), cascade control back
to the ultimate caller git-rebase.sh to do this for us.
Signed-off-by: Ramkumar Ramac
In preparation for a later patch that creates $dotest/autostash in
git-rebase.sh before anything else happens, don't assume that the
presence of a $dotest directory implies the existence of the $next and
$last files. The check for the files is in a conditional anyway, but
`cat` is executed on pote
Hi,
The feature is finished with documentation and tests in this
iteration. I've written an extensive t3420 which proves that the
feature works flawlessly. Further, I've made every attempt to
actually explain what I'm doing: I've taken care to inspect all the
return values.
Overall, I'm elated
On Fri, May 10, 2013 at 5:17 AM, Felipe Contreras
wrote:
> --- a/contrib/remote-helpers/git-remote-hg
> +++ b/contrib/remote-helpers/git-remote-hg
> @@ -867,7 +867,7 @@ def do_export(parser):
>
> if bmark == 'master' and 'master' not in parser.repo._bookmarks:
> # fake bookma
It seems that on conflict git 1.8.1.2 removes lines
below the preserved line.
Before merging my master branch onto my staging branch
I have this in the soon to be conflicting file:
[... stuff ...]
lib.printMenuBottom.10.20.typolink.additionalParams =
&print=1&no_cache=1
[... stuff ...]
The
Commit 664059f (transport-helper: update remote helper namespace)
updates the namespace when the push succeeds or not; we should do it
only when it succeeded.
Signed-off-by: Felipe Contreras
---
The regression is in 'next' so far.
git-remote-testgit.sh | 7 ++-
t/t5801-remote-helpers.
Signed-off-by: Felipe Contreras
---
t/t5801-remote-helpers.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 61479c3..352115c 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -175,7 +175,7 @@
1 - 100 of 115 matches
Mail list logo
