There are two important changes in this round:
1. Rebased on latest master, resolving all conflicts (all in t5516).
I ran the testsuite immediately after resolving the conflicts, so
everything should be good.
2. Peff's suggestion to avoid using test_must_fail on compound
statements. I'v
A small segment where handle_config() parses the branch.remote
configuration variable can be simplified using git_config_string().
Signed-off-by: Ramkumar Ramachandra
---
remote.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/remote.c b/remote.c
index ca1edd9..34ddc5b
The file was originally created in bcdb34f (Test wildcard push/fetch,
2007-06-08), and only contained tests that exercised wildcard
functionality at the time. In subsequent commits, many other tests
unrelated to wildcards were added but the test description was never
updated. Fix this.
Helped-by
From: Jeff King
Many of the tests in t5516 look like:
mk_empty &&
git push testrepo ... &&
check_push_result $commit heads/master
It's reasonably easy to see what is being tested, with the
exception that "testrepo" is a magic global name (it is
implicitly used in the helpers, but we have
Currently, do_push() in push.c calls remote_get(), which gets the
configured remote for fetching and pushing. Replace this call with a
call to pushremote_get() instead, a new function that will return the
remote configured specifically for pushing. This function tries to
work with the string push
This new configuration variable defines the default remote to push to,
and overrides `branch..remote` for all branches. It is useful
in the typical triangular-workflow setup, where the remote you're
fetching from is different from the remote you're pushing to.
Signed-off-by: Ramkumar Ramachandra
This new configuration variable overrides `remote.pushdefault` and
`branch..remote` for pushes. When you pull from one
place (e.g. your upstream) and push to another place (e.g. your own
publishing repository), you would want to set `remote.pushdefault` to
specify the remote to push to for all bra
Junio C Hamano wrote:
> Ramkumar Ramachandra writes:
>> Ouch. Please drop this patch; I'll resubmit when I feel confident
>> about my change.
>
> No, let's not do that. I will forget and end up spending time to
> read the same patch again.
All three look good to me. Thanks for doing this: I le
Junio C Hamano wrote:
> we can silence Perlcritique, even though we do not gain much safety
> by doing so.
Nit: it's perlcritic; critique is used to refer to the output of a critic.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.
On 04/01/2013 06:56 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Because the primary use case of this option is to implement end-user
>> input validation, I think it would be helpful to clarify use of the
>> peeler here. Perhaps
>> ...
>
> A "SQUASH???" patch on top of your original
Junio C Hamano wrote:
> Note that we leave "return undef;" in validate_address on purpose,
> even though Perlcritic may complain. The primary "return" site of
> the function returns whatever is in the scaler variable $address, so
> it is pointless to change only the other "return undef;" to "retur
While I was in the middle of suggesting documentation for this new
syntax, I discovered that you already added documentation to your repo
but didn't mention the new version on the mailing list (or maybe I
overlooked it). It would be helpful if you would submit your own
changes to the mailing list
On Thu, Mar 28, 2013 at 4:23 PM, Ramkumar Ramachandra
wrote:
> Would we consider shipping some themes with gitk, in contrib/ perhaps?
It does not seem like anyone is against it. I am not sure how gitk
development integrates into git's, but I guess we will have to wait
until the patch is integrate
While proof-reading the user-manual I noticed some issues with
glossary-content.txt:
- There is some outdated, misleading or irrelevant information which might only
confuse
new Git users and should therefore be removed.
- The entries for object, object name and SHA1 lacked a little bit of
cons
Signed-off-by: Thomas Ackermann
---
Documentation/glossary-content.txt | 28 +---
1 file changed, 5 insertions(+), 23 deletions(-)
diff --git a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index eb7ba84..ab02238 100644
--- a/Documentation/glos
Signed-off-by: Thomas Ackermann
---
Documentation/glossary-content.txt | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index ab02238..05bfebc 100644
--- a/Documentation/glossary-content.txt
Signed-off-by: Thomas Ackermann
---
Documentation/glossary-content.txt | 65 ++
1 file changed, 3 insertions(+), 62 deletions(-)
diff --git a/Documentation/glossary-content.txt
b/Documentation/glossary-content.txt
index 05bfebc..1c9c522 100644
--- a/Document
On Mon, Apr 1, 2013 at 11:19 PM, Felipe Contreras
wrote:
> On Mon, Apr 1, 2013 at 11:01 PM, Jeff King wrote:
>> On Mon, Apr 01, 2013 at 10:51:20PM -0600, Felipe Contreras wrote:
>>
>>> > So in fetch_with_import, we have a remote-helper, and we have a
>>> > bidirectional pipe to it. We then call g
Hi,
Here's the second version of the patches incorporating input from Junio and
Peff.
The first patch does all the work, the second patch uses it; basically, this is
needed so the transport-helper code is able to check if the remote-helper child
is stilll running. Without this support, the statu
And persistent_waitpid() to recover the information from the last run.
Signed-off-by: Felipe Contreras
---
run-command.c | 53 +++--
run-command.h | 5 +
2 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/run-command.c b/run-comma
Otherwise transport-helper will continue checking for refs and other
things what will confuse the user more.
---
git-remote-testgit| 11 +++
t/t5801-remote-helpers.sh | 19 +++
transport-helper.c| 8
3 files changed, 38 insertions(+)
diff --git a/
This way the test reliably succeeds (in catching the failure).
Not sure what's the proper way to do this, but here it is for the
record.
Signed-off-by: Felipe Contreras
---
git-remote-testgit| 1 +
t/t5801-remote-helpers.sh | 2 +-
transport-helper.c| 3 +++
3 files changed, 5 i
Do not merge!
Signed-off-by: Felipe Contreras
---
run-command.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/run-command.c b/run-command.c
index b900c6e..2bb3dcf 100644
--- a/run-command.c
+++ b/run-command.c
@@ -246,6 +246,11 @@ static int wait_or_whine(struct child_process *cmd, pi
The code uses division by 1024. Also, the manual uses "KiB".
Signed-off-by: Mihai Capotă
---
builtin/count-objects.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index 9afaa88..ecc13b0 100644
--- a/builtin/count-objects.
Hi,
I think I have stumbled on a bug in the -d option of git filter-branch.
It seems like in the final stage of filter-branch, regardless of where
-d is set, it will make updates to the "working directory" as being the
parent of the -d directory, and the actual working directory is left as
it were
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Il 01/04/2013 11:29, Felipe Contreras ha scritto:
>
>
> On Thu, Feb 28, 2013 at 12:59 PM, Manlio Perillo
> mailto:manlio.peri...@gmail.com>> wrote:
>
>
> [1] Basically, on my system I need the following change at the end of
> the file:
On Tue, Apr 02, 2013 at 01:10:28PM +0530, Ramkumar Ramachandra wrote:
> Jeff King (1):
> t5516 (fetch-push): drop implicit arguments from helper functions
>
> Ramkumar Ramachandra (5):
> remote.c: simplify a bit of code using git_config_string()
> t5516 (fetch-push): update test description
Signed-off-by: Matthieu Moy
---
t/t7512-status-help.sh | 7 ---
wt-status.c| 8 ++--
wt-status.h| 1 +
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index d745cf4..bf08d4e 100755
--- a/t/t7512-status
The first thing filter-branch does is to create a temporary
directory, either ".git-rewrite" in the current directory
(which may be the working tree or the repository if bare),
or in a directory specified by "-d". We then chdir to
$tempdir/t as our temporary working directory in which to run
tree f
This is the logical equivalent for "git status" of 3ee4452 (bash: teach
__git_ps1 about REVERT_HEAD).
Signed-off-by: Matthieu Moy
---
> --- a/contrib/completion/git-prompt.sh
> +++ b/contrib/completion/git-prompt.sh
> @@ -282,6 +282,8 @@ __git_ps1 ()
> r="|MERGING"
>
On Sat, Mar 30, 2013 at 09:45:51AM +, Jan Larres wrote:
> I am trying to write a custom archiving script that checks the
> export-ignore attribute to know which files from an ls-files output it
> should skip. Through this I noticed that for files in directories for
> which the export-ignore (o
Felipe Contreras writes:
> And this is a workaround:
>
> --- a/contrib/completion/git-completion.zsh
> +++ b/contrib/completion/git-completion.zsh
> @@ -66,7 +66,7 @@ __gitcomp_file ()
>
> local IFS=$'\n'
> compset -P '*[=:]'
> - compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
>
Sorry for the late reply,
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> When the commands give an actual output (e.g. when ran with -v), the
>> output is visually mixed with the warning. The newline makes the actual
>> output more visible.
>>
>> Signed-off-by: Matthieu Moy
>> ---
>
> It w
On Tue, Apr 02, 2013 at 10:31:30AM -0400, Jeff King wrote:
> On Sat, Mar 30, 2013 at 09:45:51AM +, Jan Larres wrote:
>
> > I am trying to write a custom archiving script that checks the
> > export-ignore attribute to know which files from an ls-files output it
> > should skip. Through this I
Ramkumar Ramachandra writes:
> Junio C Hamano wrote:
>> Note that we leave "return undef;" in validate_address on purpose,
>> even though Perlcritic may complain. The primary "return" site of
>> the function returns whatever is in the scaler variable $address, so
>> it is pointless to change onl
Michael Haggerty writes:
> On 04/01/2013 06:56 PM, Junio C Hamano wrote:
>> Junio C Hamano writes:
>>
>>> Because the primary use case of this option is to implement end-user
>>> input validation, I think it would be helpful to clarify use of the
>>> peeler here. Perhaps
>>> ...
>>
>> A "SQUA
Jeff King writes:
> On Mon, Apr 01, 2013 at 12:57:17PM -0700, Junio C Hamano wrote:
>
>> The user could have said "git merge $(git rev-parse v1.0.0)"; we
>> shouldn't mark it as "Merge commit '1598fb...'" as the merge
>> name, even though such an invocation might be crazy.
>>
>> We could eve
On Tue, Apr 02, 2013 at 08:02:13AM -0700, Junio C Hamano wrote:
> >> + if (remote_head->util) {
> >> + struct merge_remote_desc *desc;
> >> + desc = merge_remote_util(remote_head);
> >> + if (desc && desc->obj && desc->obj->type == OBJ_TAG) {
> >> + str
Michael Haggerty writes:
> Off topic: Your patch reminds me of something else that surprised me:
> there is no "$userstring^{tag}". I suppose it would be a bit ambiguous,
> given that tags can point at tags, and it would also be less useful than
> the other suffixes. But its absence irked the c
Thomas Ackermann writes:
> While proof-reading the user-manual I noticed some issues with
> glossary-content.txt:
>
> - There is some outdated, misleading or irrelevant information which might
> only confuse
> new Git users and should therefore be removed.
> - The entries for object, object nam
Hi,
I have a problem with git (1.7.9 and 1.8.2.357.gcc3e4eb) and https transport
to gerrit server (2.5.1-3-g719dfc7). I'm producing the problem on Cygwin but my
colleagues have same issue on Linux as well.
Gerrit server is matching corporate policies with single sign on, so after
three failed log
Thomas Ackermann writes:
> -[[def_directory]]directory::
> - The list you get with "ls" :-)
> -
The text indeed has a room for improvement, but it probably makes
sense to have an entry for `directory` here, as folks who are used
to say "Folders" may not know what it is.
> -[[def_evil_merge]
Thomas Ackermann writes:
> Signed-off-by: Thomas Ackermann
> ---
> Documentation/glossary-content.txt | 12 ++--
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/glossary-content.txt
> b/Documentation/glossary-content.txt
> index ab02238..05bfebc 100644
Thomas Ackermann writes:
> Signed-off-by: Thomas Ackermann
> ---
> Documentation/glossary-content.txt | 65
> ++
> 1 file changed, 3 insertions(+), 62 deletions(-)
>
> diff --git a/Documentation/glossary-content.txt
> b/Documentation/glossary-content.txt
>
Jeff King writes:
> Yes, it is the expected behavior, though I cannot offhand think of
> anything that would break if we did apply it recursively.
Conceptually that breaks our brain. "All files in doc/ directories
are text" and "doc/ directory is text" are two different things, no?
--
To unsub
On Tue, Apr 02, 2013 at 06:54:40PM +0300, Mikko Rapeli wrote:
> I have client side logs with GIT_CURL_VERBOSE=1 but from intranet so can't
> publish them directly. Here's roughly what the log shows:
Maybe this is simpler summary:
$ grep "HTTP\/1.1" log.txt
> GET ...info/refs?service=git-upload-pa
On 04/02/2013 04:57 PM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> On 04/01/2013 06:56 PM, Junio C Hamano wrote:
>>> Junio C Hamano writes:
>>>
Because the primary use case of this option is to implement end-user
input validation, I think it would be helpful to clarify use o
On Tue, Apr 02, 2013 at 09:11:02AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > Yes, it is the expected behavior, though I cannot offhand think of
> > anything that would break if we did apply it recursively.
>
> Conceptually that breaks our brain. "All files in doc/ directories
> ar
Matthieu Moy writes:
> I'm fine with either dropping my patch or applying it as-is (with
> s/newline/blank line/ in the commit message).
OK; let's insert it immediately after e24afab09137 (add: make
pathless 'add [-u|-A]' warning a file-global function, 2013-03-19),
like the attached.
I'd prefe
On 04/02/2013 05:45 PM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> Off topic: Your patch reminds me of something else that surprised me:
>> there is no "$userstring^{tag}". I suppose it would be a bit ambiguous,
>> given that tags can point at tags, and it would also be less useful th
Jeff King writes:
> On Tue, Apr 02, 2013 at 09:11:02AM -0700, Junio C Hamano wrote:
>
>> Jeff King writes:
>>
>> > Yes, it is the expected behavior, though I cannot offhand think of
>> > anything that would break if we did apply it recursively.
>>
>> Conceptually that breaks our brain. "All f
Matthieu Moy writes:
> Felipe Contreras writes:
>
>> And this is a workaround:
>>
>> --- a/contrib/completion/git-completion.zsh
>> +++ b/contrib/completion/git-completion.zsh
>> @@ -66,7 +66,7 @@ __gitcomp_file ()
>>
>> local IFS=$'\n'
>> compset -P '*[=:]'
>> - compadd -Q
On Tue, Apr 02, 2013 at 09:43:30AM -0700, Junio C Hamano wrote:
> > In some systems, yes, but git does not have any notion of "doc/" as an
> > item (after all, we track content in files, not directories), so I do
> > not see what it means to specify a directory except to say "everything
> > under
On 02.04.13 01:40, Jeff King wrote:
> On Mon, Apr 01, 2013 at 11:46:00PM +0200, Antoine Pelisse wrote:
>
>> On Mon, Apr 1, 2013 at 11:14 PM, Felipe Contreras
>> wrote:
>>> +export TEST_LINT :=
>>
>> I think "test-lint-executable" still makes sense here.
>
> Also test-lint-shell-syntax, which fin
Running make inside contrib/remote-helpers failes in "test-lint-duplicates"
This was because the regexp to check for duplicate numbers strips everything
after the first "-" in the filename, including the prefix.
As a result, 2 pathnames like
"/contrib/remote-helpers/test-bzr.sh" and
"/con
Michael Haggerty writes:
> On 04/02/2013 05:45 PM, Junio C Hamano wrote:
>
>> Also, v1.8.2^{tag} would be give the tag itself, while master^{tag}
>> would not report the commit "master" but would error out, which
>> would be useless. You are better off doing `git cat-file -t foo`
>> and seeing i
Junio C Hamano writes:
> diff --git a/builtin/add.c b/builtin/add.c
> index a4028ee..db02233 100644
> --- a/builtin/add.c
> +++ b/builtin/add.c
> @@ -57,7 +57,9 @@ static void warn_pathless_add(void)
> " git add %s .\n"
> " (or git add %s .)\n"
>
>
> I think we can just drop "See ... for details" from here. Besides,
> why just "push" and not "fetch"?
>
I just kept the original reference which only linked to git-push.
---
Thomas
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vg
Hi!
It looks like git branch --set-upstream-to doesn't function with
1.8.1.3 until I run --set-upstream. Is this a known bug?
root@fuji-current:/usr/src # git branch --set-upstream-to
origin/pjdfstest-onefs pjdfstest-onefs
fatal: Not a valid object name: 'origin/pjdfstest-onefs'.
root@fu
On Tue, Apr 2, 2013 at 6:53 PM, Torsten Bögershausen wrote:
> ---
> contrib/remote-helpers/Makefile| 3 +-
> contrib/remote-helpers/t5810-test-bzr.sh | 143 +++
> contrib/remote-helpers/t5820-test-hg-bidi.sh | 243 +++
> contrib/remote-helpers/t5821-test-hg-h
Junio C Hamano writes:
> Would it help users more to have that as part of the instruction at
> the beginning of contrib/completion/git-completion.zsh where it
> already says "here is how you use it via fpath", than leaving it
> here in the list archive?
Juging from the answers I got, I do not th
Hi,
It seems the git man pages (or HTML pages) are not installed by default
when you install git as described in the http://git-scm.com/book
I propose to add a note to
http://git-scm.com/book/en/Getting-Started-Installing-Git along those lines:
Getting the git manpages from
"https://cod
On Tue, Apr 02, 2013 at 12:51:28PM -0400, Jeff King wrote:
> But let's take a step back. I think Jan is trying to do a very
> reasonable thing: come up with the same set of paths that git-archive
> would. What's the best way to solve that? Recursive application of
> attributes is one way, but is t
Jeff King writes:
> On Tue, Apr 02, 2013 at 09:43:30AM -0700, Junio C Hamano wrote:
>
>> > In some systems, yes, but git does not have any notion of "doc/" as an
>> > item (after all, we track content in files, not directories), so I do
>> > not see what it means to specify a directory except to
Thomas Ackermann writes:
>
>>
>> I think we can just drop "See ... for details" from here. Besides,
>> why just "push" and not "fetch"?
>>
>
> I just kept the original reference which only linked to git-push.
That is only because the last example the "See ... for details"
refers to is about
On Tue, Apr 02, 2013 at 10:07:01AM -0700, Garrett Cooper wrote:
> It looks like git branch --set-upstream-to doesn't function with
> 1.8.1.3 until I run --set-upstream. Is this a known bug?
No, but I do not think that is exactly what is going on.
> root@fuji-current:/usr/src # git branch
>
> The text indeed has a room for improvement, but it probably makes
> sense to have an entry for `directory` here, as folks who are used
> to say "Folders" may not know what it is.
>
I assumed the number of such people so low that it's not worth
to keep this - to most people obvious - explana
David Tonhofer writes:
> It seems the git man pages (or HTML pages) are not installed by
> default when you install git as described in the
> http://git-scm.com/book
>
> I propose to add a note to
> http://git-scm.com/book/en/Getting-Started-Installing-Git along those
> lines:
>
> Getting the git
Jeff King writes:
> On Tue, Apr 02, 2013 at 01:10:28PM +0530, Ramkumar Ramachandra wrote:
>
>> Jeff King (1):
>> t5516 (fetch-push): drop implicit arguments from helper functions
>>
>> Ramkumar Ramachandra (5):
>> remote.c: simplify a bit of code using git_config_string()
>> t5516 (fetch-p
On Apr 2, 2013, at 10:23 AM, Jeff King wrote:
> On Tue, Apr 02, 2013 at 10:07:01AM -0700, Garrett Cooper wrote:
>
>>It looks like git branch --set-upstream-to doesn't function with 1.8.1.3
>> until I run --set-upstream. Is this a known bug?
>
> No, but I do not think that is exactly what i
>
> That is only because the last example the "See ... for details"
> refers to is about 'git push', isn't it?
>
This is correct but there was no direct link to git-fetch in the first example
and I did not check which combination of man pages gives the complete
definition of refspecs ...
---
On Tue, Apr 02, 2013 at 06:53:28PM +0200, Torsten Bögershausen wrote:
> > I think the check for duplicate-numbers is the only one that does not
> > make sense.
> []
> Not sure about that, I send a suggestion of a patch in a minute.
> Highlights:
> 1) - rename the contrib test cases and assigns re
Mihai Capotă writes:
> The code uses division by 1024. Also, the manual uses "KiB".
>
> Signed-off-by: Mihai Capotă
> ---
> builtin/count-objects.c |2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/count-objects.c b/builtin/count-objects.c
> index 9afaa88..ecc1
Jonathan Nieder wrote:
> Elated is probably not the right word. More "annoyed at being told
> their work is ugly without an accompanying concrete and actionable bug
> report". :)
If I had an actionable report, I'd have started hammering patches
instead of wasting everyone's time here. I'm was pr
On Tue, Apr 2, 2013 at 10:53 AM, Torsten Bögershausen wrote:
> Rename the tests in contrib/remote-helpers into
> t5810-test-bzr.sh,
> t5820-test-hg-bidi.sh,
> t5821-test-hg-hg-git.sh,
> t5830-test-hg.sh
>
> Feed the numbers used in contrib/remote-helpers into t/Makefile
> and check that numbering
Hey-
I've recently started looking into the possibility of having git support
multiple in-progress sequencers, and wanted to solicit opinions for how best to
do it. The use case is primarily for cherry-pick - i.e. I often have need to
cherry pick a large set of commits to an older kernel,
On Tue, Apr 02, 2013 at 10:30:35AM -0700, Garrett Cooper wrote:
> I push the branch to origin/ and then things tend to work, but since I
> obviously had been doing things wrong what's the correct order of
> operations for creating a branch and setting the upstream
> appropriately?
Once you have p
On Tue, Apr 02, 2013 at 10:28:20AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Tue, Apr 02, 2013 at 01:10:28PM +0530, Ramkumar Ramachandra wrote:
> >
> >> Jeff King (1):
> >> t5516 (fetch-push): drop implicit arguments from helper functions
> >>
> >> Ramkumar Ramachandra (5):
>
On Tue, Apr 02, 2013 at 11:14:49PM +0530, Ramkumar Ramachandra wrote:
> > If you are curious, at a quieter time it might be useful to ask for
> > pointers to the discussions that led to the current design, and folks
> > on the list might be glad to help.
>
> Will do. The search on GMane is no go
Jonathan Nieder writes:
> If you are curious, at a quieter time it might be useful to ask for
> pointers to the discussions that led to the current design, and folks
> on the list might be glad to help.
Not on the current design but the discussion before that round that
influenced the outcome gr
Neil Horman writes:
> I've recently started looking into the possibility of having git support
> multiple in-progress sequencers, and wanted to solicit opinions for how best
> to
> do it The thoughts I had were:
>
> 1) A per branch sequence directory...
> 2) Augment the git-stash comma
Thomas Ackermann writes:
>> Even though I personally am slightly in favor of removal, I suspect
>> that is primarily because I already know what Git tag is, and it is
>> different from the type tag in the Lisp-speak.
>>
> I assumed the cardinality of the set of Lisp users is so small that
> this
Jens Lehmann wrote:
> But I think we recently learned to support that use case with
> submodules. I think there are two floating models:
>
> - Tracked:
> [...]
>
> - Untracked:
> Some people just want "the newest" tip of a branch checked out in
> the submodule and update that from time to time
Ramkumar Ramachandra wrote:
> I should be able to
> add in magit.git into my dotfiles repository
For this, ideally what we'd want is a file that lists repositories
that should be cloned at the same time as cloning the dotfiles
repository, to reconst
On Tue, Apr 02, 2013 at 01:51:13PM -0400, Jeff King wrote:
> Things slowly improve as people make suggestions. I think the thing that
> might have helped here is better advice when "set-upstream-to" is
> pointed to a ref that does not exist.
>
> Patches coming in a minute.
Or 60 minutes. :)
I'm
These tests pass with the current code, but let's make sure
we don't accidentally break the behavior in the future.
Note that our tests expect failure when we try to set the
upstream to or from a missing branch. Technically we are
just munging config here, so we do not need the refs to
exist. But
Am 02.04.2013 00:48, schrieb Junio C Hamano:
> Johannes Sixt writes:
>
>> Using 'git rerere forget .' after a merge that involved binary files
>> runs into an infinite loop if the binary file contains a zero byte.
>> Replace a strchrnul by memchr because the former does not make progress
>> as so
Hi,
Here is the next round of patches for remote-hg, some which have been
contributed through github.
Fortunately it seems to be working for the most part, but there are some
considerable issues while pushing branches and tags.
Dusty Phillips (1):
remote-hg: add missing config variable in doc
This message is duplicated, and is quite long. Let's factor
it out, which avoids the repetition and the long lines. It
will also make future patches easier as we tweak the
message.
While we're at it, let's also mark it for translation.
Signed-off-by: Jeff King
---
branch.c | 7 +--
1 file c
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index 328c2dc..d0dfb1e 100755
--- a/contrib/remote-helpers/git-remot
From: Dusty Phillips
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 4
1 file changed, 4 insertions(+)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index d0dfb1e..844ec50 100755
--- a/contrib/remote-helpers/git-remot
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index 844ec50..19eb4db 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-h
From: Peter van Zetten
Set the maximum number of splits to make when dividing the diff stat
lines based on space characters.
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/g
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 7 +++
contrib/remote-helpers/test-hg-bidi.sh | 1 +
contrib/remote-helpers/test-hg-hg-git.sh | 1 +
3 files changed, 9 insertions(+)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/g
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/test-hg-bidi.sh | 5 ++---
contrib/remote-helpers/test-hg-hg-git.sh | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/contrib/remote-helpers/test-hg-bidi.sh
b/contrib/remote-helpers/test-hg-bidi.sh
index fe38e49..
We can't use stdout for that in remote helpers.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index b200e60..874ccd4 100755
--- a/contrib/re
Will be useful for remote bookmarks.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 38 +++-
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
in
No functional changes.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 20
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index 73d79cb..11162a2 100755
---
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 5 +
1 file changed, 5 insertions(+)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index 11162a2..160f486 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/rem
Ideally we shouldn't do this, as it's not recommended in mercurial
documentation, but there's no other way to push multiple bookmarks (on
the same branch), which would be the behavior most similar to git.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 2 +-
1 file cha
1 - 100 of 179 matches
Mail list logo
