Sajan Parikh writes:
> By syncing my code folder and git repositories in this way, do I risk
> borking any repositories? I'm 99% confident I'm not, since everything
> is in .git/, and there are not external databases or log files that
> need to be updated. Just making sure though.
You're right
On Wed, Jul 16, 2014 at 9:19 PM, Max Kirillov wrote:
> Hi.
>
> On Sun, Jul 13, 2014 at 11:50:59AM +0700, Nguyễn Thái Ngọc Duy wrote:
>> +MULTIPLE CHECKOUT MODE
>> +---
>
> This generates incorrect html for me, making all section
> until next heading "EXAMPLES" into a pr
Hi.
On Sun, Jul 13, 2014 at 11:50:59AM +0700, Nguyễn Thái Ngọc Duy wrote:
> +MULTIPLE CHECKOUT MODE
> +---
This generates incorrect html for me, making all section
until next heading "EXAMPLES" into a preformatted text. If I
justify the line of dashes to be the exactly
On all my laptops and desktops, I have a directory at /home/sajan/Code
where all my active projects and repositories live.
/home/sajan/Code/repository1
/home/sajan/Code/repository2
/home/sajan/Code/repository3
...etc...
Up until now I've relied on pushing and pulling to and from my Gitlab
ser
This is a [issue from
TortoiseGit](https://code.google.com/p/tortoisegit/issues/detail?id=2233).
After doing some test, I report it here.
The following is the testing information I have tested.
### Folder Structure
```
Test
|-- myrepo
| |-- bar.txt
| |-- foo.txt
|
|-- myrepo.git
Call commit_list_count() instead of open-coding it repeatedly.
Signed-off-by: Rene Scharfe
---
builtin/blame.c| 5 +
builtin/for-each-ref.c | 16 ++--
commit.c | 7 +--
line-log.c | 13 +
pretty.c | 7 +--
5
René Scharfe wrote:
> Avoid code duplication and let strbuf_addstr() call strlen() for us.
Nice.
> Signed-off-by: Rene Scharfe
> ---
> builtin/commit.c | 2 +-
> diff.c | 12 ++--
> path.c | 6 +++---
> 3 files changed, 10 insertions(+), 10 deletions(-)
Reviewed-
Avoid code duplication and let strbuf_addstr() call strlen() for us.
Signed-off-by: Rene Scharfe
---
builtin/commit.c | 2 +-
diff.c | 12 ++--
path.c | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
in
I had a look at the changes in origin/pu and they look sane to me.
make test passes all tests too.
regards
ronnie sahlberg
On Wed, Jul 16, 2014 at 3:16 PM, Junio C Hamano wrote:
> Ronnie Sahlberg writes:
>
>> On Tue, Jul 15, 2014 at 4:33 PM, Ronnie Sahlberg wrote:
>>> This is the next 20
On Wed, Jul 16, 2014 at 3:01 PM, Junio C Hamano wrote:
> Here are the topics that have been cooking. Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'.
>
> We would need to start slowing down to prepare for -rc0 preview at
> the end of
In _commit, ENOTDIR can happen in the call to lock_ref_sha1_basic, either when
we lstat the new refname and it returns ENOTDIR or if the name checking
function reports that the same type of conflict happened. In both cases it
means that we can not create the new ref due to a name conflict.
For the
No external users call write_ref_sha1 any more so lets declare it static.
Signed-off-by: Ronnie Sahlberg
---
refs.c | 10 --
refs.h | 3 ---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/refs.c b/refs.c
index 69cbca5..6c7a9d2 100644
--- a/refs.c
+++ b/refs.c
@@ -2643,6
Change s_update_ref to use a ref transaction for the ref update.
Signed-off-by: Ronnie Sahlberg
---
builtin/fetch.c | 33 +++--
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 92fad2d..383c385 100644
--- a/builti
Signed-off-by: Ronnie Sahlberg
---
git-compat-util.h | 6 ++
wrapper.c | 18 ++
2 files changed, 24 insertions(+)
diff --git a/git-compat-util.h b/git-compat-util.h
index b6f03b3..426bc98 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -704,12 +704,18 @@ vo
Move the check for check_refname_format from lock_any_ref_for_update
to lock_ref_sha1_basic. At some later stage we will get rid of
lock_any_ref_for_update completely.
If lock_ref_sha1_basic fails the check_refname_format test, set errno to
EINVAL before returning NULL. This to guarantee that we w
We call read_ref_full with a pointer to flags from rename_ref but since
we never actually use the returned flags we can just pass NULL here instead.
Reviewed-by: Jonathan Nieder
Signed-off-by: Ronnie Sahlberg
---
refs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/refs.c
Signed-off-by: Ronnie Sahlberg
---
wrapper.c | 14 ++
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/wrapper.c b/wrapper.c
index bc1bfb8..740e193 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -429,14 +429,12 @@ int xmkstemp_mode(char *template, int mode)
static int warn_
Add an err argument to delete_loose_ref so that we can pass a descriptive
error string back to the caller. Pass the err argument from transaction
commit to this function so that transaction users will have a nice error
string if the transaction failed due to delete_loose_ref.
Signed-off-by: Ronnie
Change the reference transactions so that we pass the reflog message
through to the create/delete/update function instead of the commit message.
This allows for individual messages for each change in a multi ref
transaction.
Reviewed-by: Jonathan Nieder
Signed-off-by: Ronnie Sahlberg
---
branch
This is the third and final part of the original 48 patch series for
basic transaction support.
It is used ontop of the previous two series :
* rs/ref-transaction-0 (2014-07-14) 19 commits
* rs/ref-transaction-1 (2014-07-16) 20 commits
This version implements some changes suggested by mhagger for
Skip using the lock_any_ref_for_update wrapper and call lock_ref_sha1_basic
directly from the commit function.
Reviewed-by: Jonathan Nieder
Signed-off-by: Ronnie Sahlberg
---
refs.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/refs.c b/refs.c
index f29f18a..d
We currently do not handle badly named refs well :
$ cp .git/refs/heads/master .git/refs/heads/master.@\*@\\.
$ git branch
fatal: Reference has invalid format: 'refs/heads/master.@*@\.'
$ git branch -D master.@\*@\\.
error: branch 'master.@*@\.' not found.
But we can not reall
Allow passing a list of refs to skip checking to name_conflict_fn.
There are some conditions where we want to allow a temporary conflict and skip
checking those refs. For example if we have a transaction that
1, guarantees that m is a packed refs and there is no loose ref for m
2, the transaction w
Ronnie Sahlberg writes:
> On Tue, Jul 15, 2014 at 4:33 PM, Ronnie Sahlberg wrote:
>> This is the next 20 patches from my originally big patch series and follow
>> the previous 19 patches that is now in juns tree.
>> These patches were numbered 20-39 in the original 48-patch series.
>>
>> Changes
Karsten Blees writes:
> There is no fchmod() on native Windows platforms (MinGW and MSVC), and the
> equivalent Win32 API (SetFileInformationByHandle) requires Windows Vista.
>
> Use chmod() instead.
>
> Signed-off-by: Karsten Blees
> ---
I am wondering if it is saner to just revert the fchmod(
The latest maintenance release Git v2.0.2 is now available at
the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.0.2'
tag and the 'maint' branch that the tag points at:
url = https://kernel
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
We would need to start slowing down to prepare for -rc0 preview at
the end of this week and then feature freeze. Some topics that
joined 'next'
Use the existing argv_array member instead of providing our own. This
way we don't have to initialize or clean it up explicitly.
Signed-off-by: Rene Scharfe
---
run-command.c | 15 ---
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/run-command.c b/run-command.c
index
Add support for configuring default sort ordering for git tags. Command
line option will override this configured value, using the exact same
syntax.
Cc: Jeff King
Signed-off-by: Jacob Keller
Signed-off-by: Junio C Hamano
---
Based on what's in Junio's tree, this patch includes some minor chang
On Wed, 2014-07-16 at 14:40 -0700, Junio C Hamano wrote:
> "Keller, Jacob E" writes:
>
> >> After all, it seems to me that the one in
> >>
> >> http://thread.gmane.org/gmane.comp.version-control.git/253346
> >>
> >> struck the right balance among various abuses; let's use the error
> >> rep
On 07/16/2014 03:23 PM, John Keeping wrote:
Change from v1:
- add a test case
Test case is working fine for me. It passes with the patch and fails
without. However, it does seem to cause all the rest of the test cases
to fail if it fails. Is there some cleanup missing?
Ted.
--
To un
"Keller, Jacob E" writes:
>> After all, it seems to me that the one in
>>
>> http://thread.gmane.org/gmane.comp.version-control.git/253346
>>
>> struck the right balance among various abuses; let's use the error
>> reporter from that version, instead of going down this rabbit hole.
>>
>> T
On Wed, 2014-07-16 at 10:59 -0700, Junio C Hamano wrote:
> "Keller, Jacob E" writes:
>
> > On Tue, 2014-07-15 at 19:42 -0400, Jeff King wrote:
> >> On Tue, Jul 15, 2014 at 04:32:59PM -0700, Jacob Keller wrote:
> >>
> >> > +static void error_bad_sort_config(const char *err, va_list params)
> >> >
John Keeping writes:
> When the `--fork-point` argument was added to `git rebase`, we changed
> the value of $upstream to be the fork point instead of the point from
> which we want to rebase. When $orig_head..$upstream is empty this does
> not change the behaviour, but when there are new change
On Wed, 2014-07-16 at 10:59 -0700, Junio C Hamano wrote:
> "Keller, Jacob E" writes:
>
> > On Tue, 2014-07-15 at 19:42 -0400, Jeff King wrote:
> >> On Tue, Jul 15, 2014 at 04:32:59PM -0700, Jacob Keller wrote:
> >>
> >> > +static void error_bad_sort_config(const char *err, va_list params)
> >> >
There was no way to get the current error routine now, and I figured
that a stack was a simple way of saving the old routine.
Essentially these two paths would be the same as a "save/restore" except
we manage it via a stack. I don't really see how that would end up any
different. I mean I don't mi
git-rebase supports the option `--root` both with and without
`--onto`. In rebase root mode it replays all commits reachable from a
branch on top of another branch, including the very first commit. In
case `--onto` is not specified, that other branch is temporarily
provided by creating an empty com
When using `git format-patch --ignore-if-in-upstream` we are only
allowed to give a single revision range. In the next commit we will
want to add an additional exclusion revision in order to handle fork
points correctly, so convert `git-rebase--am` to use a symmetric
difference with `--cherry-pick
On Tue, Jul 8, 2014 at 7:19 AM, Michael Haggerty wrote:
> On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
>> Add an err argument to delete_loose_ref so that we can pass a descriptive
>> error string back to the caller. Pass the err argument from transaction
>> commit to this function so that transa
On 14-07-16 12:01 PM, Fabian Ruch wrote:
> Hi Marc,
>
> I forgot to cc your mailbox when I posted this patch last week. Do you
> still remember whether there was a particular reason why
> pick_one_preserving_merges wasn't touched by the commit b499549 ("Teach
> rebase the --no-ff option."), by any
"Keller, Jacob E" writes:
> On Tue, 2014-07-15 at 19:42 -0400, Jeff King wrote:
>> On Tue, Jul 15, 2014 at 04:32:59PM -0700, Jacob Keller wrote:
>>
>> > +static void error_bad_sort_config(const char *err, va_list params)
>> > +{
>> > + vreportf("warning: tag.sort has ", err, params);
>> > +}
>>
Karsten Blees writes:
> MinGW and MSVC before 2010 don't define ELOOP, use EMLINK (aka "Too many
> links") instead.
>
> Signed-off-by: Karsten Blees
> ---
Thanks; will apply directly to 'master'.
> compat/mingw.h | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/compat/mingw.h b/com
Duy Nguyen writes:
>> If you do not
>> use the extra temporary file, you start from "index.lock" left by
>> "add -i", write the updated index into "index.lock" and if you fail
>> to write, you have to roll back the entire "index"---you lose the
>> option to use the index left by "add -i" wi
Tanay Abhra writes:
> I think it would be unnecessary for the current iteration.
> Currently git_configset_add_file has only two possible return values
> -1 or 0.
Yes. My point is just to check that statement in tests. (I'm usually
wary of statements like "is obviously true so I don't need to te
Tanay Abhra writes:
> On 7/16/2014 9:36 PM, Matthieu Moy wrote:
>> Tanay Abhra writes:
>>> +static void git_config_check_init(void)
>>> +{
>>> + if (the_config_set.hash_initialized)
>>> + return;
>>> + git_configset_init(&the_config_set);
>>> + git_config(config_set_callback, &th
I think it would be unnecessary for the current iteration.
Currently git_configset_add_file has only two possible return values
-1 or 0. I could add specialized error values for ENOENT or ENOTDIR
or EACCES, but the logs show that we silently ignore the first two.
I can add an access warn for the th
On 7/16/2014 9:36 PM, Matthieu Moy wrote:
> Tanay Abhra writes:
>
>> implemented as a thin wrapper around the `config_set` API.
>>
>> Signed-off-by: Matthieu Moy
>> Signed-off-by: Tanay Abhra
>> Documentation/technical/api-config.txt | 137 +
>> cache.h
Signed-off-by: Matthieu Moy
---
Documentation/technical/api-config.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/technical/api-config.txt
b/Documentation/technical/api-config.txt
index fc0e379..8a86e45 100644
--- a/Documentation/technical/api-config.txt
++
Signed-off-by: Matthieu Moy
---
I won't fight for this, but I think it makes sense.
t/t1308-config-set.sh | 4 ++--
test-config.c | 10 ++
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index ea031bf..f0307b7 100755
-
Signed-off-by: Matthieu Moy
---
t/t1308-config-set.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 4752fd9..ea031bf 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -150,8 +150,8 @@ test_expec
Tanay Abhra writes:
> implemented as a thin wrapper around the `config_set` API.
>
> Signed-off-by: Matthieu Moy
> Signed-off-by: Tanay Abhra
> Documentation/technical/api-config.txt | 137 +
> cache.h| 30
> config.c
Hi Marc,
I forgot to cc your mailbox when I posted this patch last week. Do you
still remember whether there was a particular reason why
pick_one_preserving_merges wasn't touched by the commit b499549 ("Teach
rebase the --no-ff option."), by any chance?
Kind regards,
Fabian
Fabian Ruch writes
On 07/15/2014 09:43 AM, Woody Wu wrote:
> I have tried some methods introduced in the network, but always
> failed. Some big files committed by me to a very old branch then the
> files deleted and new branches were continuously created. Now the
> checkout directory has grown to about 80 megabytes.
Expose the `config_set` C API as a set of simple commands in order to
facilitate testing. Add tests for the `config_set` API as well as for
`git_config_get_*()` family for the usual config files.
Signed-off-by: Matthieu Moy
Signed-off-by: Tanay Abhra
---
.gitignore| 1 +
Makefile
Currently `git_config()` uses a callback mechanism and file rereads for
config values. Due to this approach, it is not uncommon for the config
files to be parsed several times during the run of a git program, with
different callbacks picking out different variables useful to themselves.
Add a `con
Tanay Abhra writes:
> +# 'check_config get_* section.key value' verifies that the entry for
> +# section.key is 'value'
> +check_config () {
> + if test "$1" = expect_code
> + then
> + expect_code="$2" && shift && shift
> + else
> + expect_code=0
> + fi &&
Expose the `config_set` C API as a set of simple commands in order to
facilitate testing. Add tests for the `config_set` API as well as for
`git_config_get_*()` family for the usual config files.
Signed-off-by: Matthieu Moy
Signed-off-by: Tanay Abhra
---
.gitignore| 1 +
Makefile
Currently `git_config()` uses a callback mechanism and file rereads for
config values. Due to this approach, it is not uncommon for the config
files to be parsed several times during the run of a git program, with
different callbacks picking out different variables useful to themselves.
Add a `con
Am 16.07.2014 11:29, schrieb Stepan Kasal:
>> * t7001-mv: 6
>> cp -P fails in MinGW - perhaps use the long option forms (--no-dereference)?
>
> "cp -P" fails with our 2001-edition of cp, so msysgit had to revert:
> https://github.com/msysgit/git/commit/6d3e23d4
>
> But I was ashamed to mention th
Hi all,
we're running into a problem with the rename detection; we're
at num_src=27320 and num_create=46731, which means that 'matrix'
would still be enumerable in int32, but... well, I don't yet know
where exactly it refuses to perform rename detection. I've tried to
set needed_rename_limit to 2^
Am 16.07.2014 07:33, schrieb Johannes Sixt:
> Am 16.07.2014 00:54, schrieb Karsten Blees:
>> There is no fchmod() on native Windows platforms (MinGW and MSVC), and the
>> equivalent Win32 API (SetFileInformationByHandle) requires Windows Vista.
>>
>> Use chmod() instead.
>>
>> Signed-off-by: Karste
On Tue, Jul 15, 2014 at 11:45 PM, Junio C Hamano wrote:
> What is the real point of "writing into *.lock and renaming"? It
> serves two purposes: (1) everybody adheres to that convention---if
> we managed to take the lock "index.lock", nobody else will compete
> and interfere with us until we ren
Hello Karsten,
thanks for your analysis. Most of the patches you refer to are simply
switching off tests for MINGW; let me comment on the remaining ones:
> * t0110-urlmatch-normalization: 1
>
> Passing binary data on the command line...would have to
> teach test-urlmatch-normalization.c to read
Simplify the code and get rid of some magic constants by using
argv_array to build the argument list for cmd_blame. Be lazy and let
the OS release our allocated memory, as before.
Signed-off-by: Rene Scharfe
---
builtin/annotate.c | 12 +---
1 file changed, 5 insertions(+), 7 deletions(
64 matches
Mail list logo
