Fabian Ruch:
2. Notice ourselves that the end-result of the whole squash is an
empty commit, and stop to let the user deal with it.
This patch chooses the second alternative. Either way seems OK. The
crucial consensus of the discussion was to silently throw away empty
interim
Junio C Hamano gits...@pobox.com writes:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Tanay Abhra tanay...@gmail.com writes:
...
+ grep line 7.*.git/config\|.git/config.*line 7 result
+'
This is still dependant on the locale (line is translated). You need
to use test_i18ngrep
Nico Williams n...@cryptonector.com wrote:
On Wed, Aug 06, 2014 at 08:31:18PM +0200, Jakub Narębski wrote:
On Wed, Aug 6, 2014 at 6:26 PM, Nico Williams n...@cryptonector.com wrote:
My proposal was to put this sort of ancillary history info in a
branch object (and that branches should
[Patch v9]: Changed the grep statements in patch 7/8 and 8/8.
[Patch v8]: git_die_config now allows custom error messages.
new tests are now not too reliant on specific strings.
[Patch v7]: style nit corrected. (1/8) is Matthieu's translation patch.
git_die_config_linenr() helper
From: Matthieu Moy matthieu@imag.fr
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
config.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/config.c b/config.c
index a191328..34940fd 100644
--- a/config.c
+++ b/config.c
@@ -457,9 +457,9 @@
Add `git_die_config` that dies printing the line number and the file name
of the highest priority value for the configuration variable `key`. A custom
error message is also printed before dying, specified by the caller, which can
be skipped if `err` argument is set to NULL.
It has usage in
From: Matthieu Moy matthieu@imag.fr
If a callback returns a negative value to `git_config*()` family,
they call `die()` while printing the line number and the file name.
Currently the printed line number is off by one, thus printing the
wrong line number.
Make `linenr` point to the line we
Currently `git_config()` returns an integer signifying an error code.
During rewrites of the function most of the code was shifted to
`git_config_with_options()`. `git_config_with_options()` normally
returns positive values if its `config_source` parameter is set as NULL,
as most errors are fatal,
Store file name and line number for each key-value pair in the cache
during parsing of the configuration files.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
cache.h | 5 +
config.c | 16 ++--
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/cache.h b/cache.h
Add tests for `git_config_get_string_const()`, check whether it
dies printing the line number and the file name if a NULL
value is retrieved for the given key.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
t/t1308-config-set.sh | 10 ++
test-config.c | 10 ++
2 files
Of all the functions in `git_config*()` family, `git_config()` has the
most invocations in the whole code base. Each `git_config()` invocation
causes config file rereads which can be avoided using the config-set API.
Use the config-set API to rewrite `git_config()` to use the config caching
layer
Semantic errors (for example, for alias.* variables NULL values are
not allowed) in configuration files cause a die printing the line
number and file name of the offending value.
Add a test documenting that such errors cause a die printing the
accurate line number and file name.
Signed-off-by:
Tanay Abhra tanay...@gmail.com writes:
[Patch v9]: Changed the grep statements in patch 7/8 and 8/8.
Good. I think it adresses all previous comments.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
On 08/05/2014 02:40 PM, Ronnie Sahlberg wrote:
Please see
https://github.com/rsahlberg/git/tree/backend-struct-db-2
for an example of a pluggable backend for refs storage.
This series contain changes to make it possible to add new backends
for handling/storage of refs and implements one new
Inspired by 2147fa7e (2014-07-31 git-push: fix link in man page),
I grepped through the whole tree searching for 'gitlink:' occurrences.
Signed-off-by: Stefan Beller stefanbel...@gmail.com
---
contrib/convert-objects/git-convert-objects.txt | 2 +-
contrib/examples/git-svnimport.txt
On Thu, Aug 07, 2014 at 12:38:48PM +0100, Tony Finch wrote:
I have been fiddling around in this area.
What I want to be able to do is develop fixes for open source code
that I run, and get those fixes upstream. This means I need a rebasing
workflow, to keep the patches up-to-date and to deal
On Wed, Aug 06, 2014 at 04:51:52PM -0700, Jonathan Nieder wrote:
Junio C Hamano wrote:
Jonathan Nieder jrnie...@gmail.com writes:
2. Submodules aware of their superproject and of the parent's branches.
In other words, submodules would act as though under refs/ they
had a
Use `git_config_get_*()` family instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
fetch-pack.c | 35 ---
1 file changed, 8 insertions(+), 27 deletions(-)
diff
Use `git_config_get_*()` family instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
rerere.c | 43 ---
1 file changed, 12 insertions(+), 31 deletions(-)
Use `git_config_get_value()` instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
pager.c | 40 +---
1 file changed, 13 insertions(+), 27 deletions(-)
diff
Use `git_config_get_bool()` family instead of `git_config()` to take advantage
of
the config-set API which provides a cleaner control flow.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
archive.c | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/archive.c
Use `git_config_get_string()` instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
alias.c | 25 ++---
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/alias.c
Use `git_config_get_bool()` family instead of `git_config()` to take advantage
of
the config-set API which provides a cleaner control flow.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
daemon.c | 26 --
1 file changed, 4 insertions(+), 22 deletions(-)
diff --git
[v2]: git_die_config() messages changed. Diff between v1 and v2 is at the
bottom.
The ta/config-set API is more or less solidified.
This series builds on the top of 4c715ebb in pu (ta/config-set). On top of it,
it also requires series [1] (Rewrite `git_config()` using config-set API) for
proper
Use `git_config_get_bool()` family instead of `git_config()` to take advantage
of
the config-set API which provides a cleaner control flow.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
http-backend.c | 31 ---
1 file changed, 12 insertions(+), 19 deletions(-)
Use `git_config_get_*()` family instead of `git_config()` to take
advantage of the config-set API which provides a cleaner control flow.
Use an intermediate value, as `version` can not be used directly in
git_config_get_int() due to incompatible type.
Signed-off-by: Tanay Abhra
Use `git_config_get_*()` family instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
imap-send.c | 60 ++--
1 file changed, 26
Use `git_config_get_*()` family instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
builtin/gc.c | 51 ---
1 file changed, 20 insertions(+), 31
Use `git_config_get_string()` instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
branch.c | 27 +++
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git
git 2.0.4 on ubuntu 14.04 64
1. new repo
2. commit test.txt to master:
line1
line1
3. branch and checkout branch1
4. make and commit the following change to branch1:
#line1
#line2
5. checkout master
6. make and commit the following change to master:
line1
#line2
7. merge branch1, git sees a
Duy Nguyen pclo...@gmail.com writes:
On Thu, Aug 7, 2014 at 7:34 AM, Jonathan Nieder jrnie...@gmail.com wrote:
Package: git
Version: 1:2.0.0-1
Tags: upstream
$ git init foo
Initialized empty Git repository in /tmp/t/foo/.git/
$ cd foo
$ echo hi README
$ git add -N README
$
Stefan Beller stefanbel...@gmail.com writes:
Inspired by 2147fa7e (2014-07-31 git-push: fix link in man page),
I grepped through the whole tree searching for 'gitlink:' occurrences.
Signed-off-by: Stefan Beller stefanbel...@gmail.com
---
Thanks; I did the same earlier but only for
Nico Williams n...@cryptonector.com wrote:
On Thu, Aug 07, 2014 at 12:38:48PM +0100, Tony Finch wrote:
But [a rebasing workflow] is inconvenient for deploying the patched
version to production (which is the point of developing the fixes) - I
want a fast-forwarding branch for that.
I'm
Tanay Abhra tanay...@gmail.com writes:
Use `git_config_get_string()` instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
branch.c | 27 +++
1 file changed, 7
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
Valgrind confirms, one less unreachable block ;-).
builtin/log.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/log.c b/builtin/log.c
index 4389722..e4d8122 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -857,20 +857,21 @@
On Thu, Aug 07, 2014 at 05:42:34PM +0100, Tony Finch wrote:
Nico Williams n...@cryptonector.com wrote:
On Thu, Aug 07, 2014 at 12:38:48PM +0100, Tony Finch wrote:
But [a rebasing workflow] is inconvenient for deploying the patched
version to production (which is the point of developing
Nico Williams n...@cryptonector.com wrote:
On Thu, Aug 07, 2014 at 05:42:34PM +0100, Tony Finch wrote:
The problem is that the production branch gets copied around: pushed to
the repo server, pulled by other team members, etc. Forced pushes
are accident-prone, as is resetting a rebased
Use `git_config_get_string()` instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow. While we are at
it, return -1 if we find no value for the queried variable. Original code
returned 0 for all cases, which was checked by `add_branch_desc()` in
Matthieu Moy wrote:
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
Valgrind confirms, one less unreachable block ;-).
This belongs in the commit message.
[...]
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -857,20 +857,21 @@ static void add_branch_description(struct strbuf *buf,
Tanay Abhra tanay...@gmail.com writes:
[v2]: git_die_config() messages changed. Diff between v1 and v2 is at the
bottom.
I went through the series once more, and all the changes look good.
v3 for PATCH 11/11 addresses my comment about the commit message in v2.
Reviewed-by: Matthieu Moy
Hi,
meanlo...@gmail.com wrote:
2. commit test.txt to master:
line1
line1
3. branch and checkout branch1
4. make and commit the following change to branch1:
#line1
#line2
5. checkout master
6. make and commit the following change to master:
line1
#line2
7. merge branch1, git sees a
Tanay Abhra tanay...@gmail.com writes:
diff --git a/Documentation/technical/api-config.txt
b/Documentation/technical/api-config.txt
index 21f280c..0d8b99b 100644
--- a/Documentation/technical/api-config.txt
+++ b/Documentation/technical/api-config.txt
@@ -155,6 +155,19 @@ as well as
Matthieu Moy matthieu@grenoble-inp.fr writes:
Tanay Abhra tanay...@gmail.com writes:
--- a/cache.h
+++ b/cache.h
@@ -1406,8 +1406,14 @@ extern int git_config_get_bool(const char *key, int
*dest);
[...]
+struct key_value_info {
+const char *filename;
+int linenr;
+};
[...]
Jonathan Nieder jrnie...@gmail.com writes:
Matthieu Moy wrote:
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
Valgrind confirms, one less unreachable block ;-).
This belongs in the commit message.
[...]
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -857,20 +857,21 @@ static void
On 07/08/14 12:59, Tanay Abhra wrote:
Store file name and line number for each key-value pair in the cache
during parsing of the configuration files.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
cache.h | 5 +
config.c | 16 ++--
2 files changed, 19 insertions(+),
Junio C Hamano gits...@pobox.com writes:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Tanay Abhra tanay...@gmail.com writes:
--- a/cache.h
+++ b/cache.h
@@ -1406,8 +1406,14 @@ extern int git_config_get_bool(const char *key, int
*dest);
[...]
+struct key_value_info {
+ const
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
On 07/08/14 12:59, Tanay Abhra wrote:
Store file name and line number for each key-value pair in the cache
during parsing of the configuration files.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
cache.h | 5 +
config.c | 16
Matthieu Moy matthieu@grenoble-inp.fr writes:
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
...
diff --git a/cache.h b/cache.h
...
+struct key_value_info {
+ const char *filename;
+ int linenr;
+};
+
I haven't checked, but does this series now include a user for
this struct
Tanay Abhra tanay...@gmail.com writes:
11 files changed, 114 insertions(+), 250 deletions(-)
Nice reduction.
--
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
Junio C Hamano gits...@pobox.com writes:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
...
diff --git a/cache.h b/cache.h
...
+struct key_value_info {
+ const char *filename;
+ int linenr;
+};
+
I haven't checked, but does this
Matthieu Moy matthieu@grenoble-inp.fr writes:
Why is this needed? Are you now using key_value_info outside config.c?
Or is it a leftover from a previous experiment?
Has this been resolved in the new round?
Tanay explained in another subthread why this was needed. For callers
iterating
Jeff King p...@peff.net writes:
See the patch below, which I think could replace the top three from
jk/stash-list-p (or really, could replace the whole series, and the
bottom three could go into their own topic).
Sounds sensible. Let's split those three changes into a separate
topic
On Wed, Aug 6, 2014 at 7:59 PM, Fabian Ruch baf...@gmail.com wrote:
The to-do list commands `squash` and `fixup` apply the changes
introduced by the named commit to the tree but instead of creating
a new commit on top of the current head it replaces the previous
commit with a new commit that
On Thu, Aug 7, 2014 at 12:47 PM, Tony Finch d...@dotat.at wrote:
Nico Williams n...@cryptonector.com wrote:
Either way I retain the old HEAD with some name.
Hmm, yes, I can see that would work. However my previous workflow was
rather branch-heavy and I found the accumulation of names
On Thu, Aug 7, 2014 at 6:38 AM, Tony Finch d...@dotat.at wrote:
So I have a small tool which maintains a publication branch which tracks
the head of a rebasing branch. It's reasonably satisfactory so far...
https://git.csx.cam.ac.uk/x/ucs/git/git-repub.git
... though the structure of the
Hello
I created a post on SO about this; pasting it here for convenience:
= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
http://stackoverflow.com/questions/25193518/fixing-branches-disconnected-from-master
After completing a repository migration, we noticed that
This is the updated Bulgarian translation og git-gui. It has been
synced with git gitk.
I have just checked the archives of the mailing list - the patch was
never sent, just the previous version of the cover letter. Resending
so that it can be merged for 2.1.
Kind regards:
al_shopov
Alexander
57 matches
Mail list logo
