Hi Junio,
On Wed, Jun 25, 2014 at 01:41:23PM -0700, Junio C Hamano wrote:
Uwe Kleine-König u.kleine-koe...@pengutronix.de writes:
On Wed, Jun 25, 2014 at 05:05:51AM -0700, Linus Torvalds wrote:
On Wed, Jun 25, 2014 at 2:55 AM, Uwe Kleine-König
u.kleine-koe...@pengutronix.de wrote:
On 6/25/2014 10:15 AM, Eric Sunshine wrote:
On Mon, Jun 23, 2014 at 6:41 AM, Tanay Abhra tanay...@gmail.com wrote:
diff --git a/branch.c b/branch.c
index 660097b..c9a2a0d 100644
--- a/branch.c
+++ b/branch.c
@@ -140,33 +140,25 @@ static int setup_tracking(const char *new_ref, const
char
On 6/25/2014 12:39 PM, Eric Sunshine wrote:
On Mon, Jun 23, 2014 at 6:41 AM, Tanay Abhra tanay...@gmail.com wrote:
Use git_config_get_string instead of git_config to take advantage of
the config hash-table api which provides a cleaner control flow.
You may want to mention as a side-note
On 6/25/2014 1:24 PM, Eric Sunshine wrote:
On Mon, Jun 23, 2014 at 6:41 AM, Tanay Abhra tanay...@gmail.com wrote:
Use git_config_get_string instead of git_config to take advantage of
the config hash-table api which provides a cleaner control flow.
Signed-off-by: Tanay Abhra
On 6/25/2014 1:36 PM, Eric Sunshine wrote:
On Mon, Jun 23, 2014 at 6:41 AM, Tanay Abhra tanay...@gmail.com wrote:
Use git_config_get_string instead of git_config to take advantage of
the config hash-table api which provides a cleaner control flow.
Signed-off-by: Tanay Abhra
On 6/25/2014 7:42 AM, Eric Sunshine wrote:
On Mon, Jun 23, 2014 at 6:41 AM, Tanay Abhra tanay...@gmail.com wrote:
Use git_config_get_string instead of git_config to take advantage of
the config hash-table api which provides a cleaner control flow.
Signed-off-by: Tanay Abhra
On 6/25/2014 9:29 AM, Eric Sunshine wrote:
On Mon, Jun 23, 2014 at 6:41 AM, Tanay Abhra tanay...@gmail.com wrote:
Use git_config_get_string instead of git_config to take advantage of
the config hash-table api which provides a cleaner control flow.
Signed-off-by: Tanay Abhra
Hi,
I thought about adding a test*.sh file after sending the series.
No worries, I will rectify it in the next patch.
Also, I have read all your comments.
Thanks for the review.
Cheers,
Tanay Abhra.
On 6/25/2014 4:49 PM, Eric Sunshine wrote:
On Mon, Jun 23, 2014 at 6:11 AM, Tanay Abhra
Hi.
If a file does not contain newline in the last line, and the file has
changed somewhere
in other branch, and the newline has not been not added in that
change, when I cherry-pick the commit, the commit does contain the
newline in the last line. This sometimes leads to conflict and in
general
Am 20.06.2014 16:42, schrieb Ronnie Sahlberg:
+ errno = ELOOP;
This fails on MinGW and MSVC 2010. Perhaps add this to compat/mingw.h?
#ifndef ELOOP
#define ELOOP EMLINK
#endif
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
My name is Kong Hui from Hong Kong, I want you to be my partner in a
business project.
If Interested Contact me back via my email address.
Thank you,
Mr. Kong Hui.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
On Wed, Jun 25, 2014 at 5:56 AM, Karsten Blees karsten.bl...@gmail.com wrote:
void wt_status_collect(struct wt_status *s)
{
+ uint64_t start = getnanotime();
+
wt_status_collect_changes_worktree(s);
+ trace_performance_since(start, wt_status_collect_changes_worktree);
Hi,
is it possible to know which tags are not yet pushed to a remote via a
completely local command?
(e.g. the list of unpushed _commits_ may be received by ‘git log upstream..’)
I know it is possible to execute 'git ls-remote’ or 'git push --dry-run’, but
both ask the remote server.
I’m
From: Alan Franzoni usern...@franzoni.eu
Signed-off-by: Alan Franzoni usern...@franzoni.eu
---
Documentation/date-formats.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt
index ccd1fc8..284308a 100644
---
On Thu, Jun 26, 2014 at 05:15:05AM +0200, Torsten Bögershausen wrote:
+ */
+static inline int bitset_sizeof(int num_bits)
+{
+ return (num_bits + CHAR_BIT - 1) / CHAR_BIT;
+}
Just a general question about the usage of int here (and at other places):
Is there a special reason for new
On Wed, Jun 25, 2014 at 03:33:42PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
One of the purposes of git replace --edit is to help a
user repair objects which are malformed or corrupted.
Usually we pretty-print trees with ls-tree, which is much
easier to work with
On Thu, Jun 26, 2014 at 5:42 AM, Kirill Likhodedov
kirill.likhode...@jetbrains.com wrote:
is it possible to know which tags are not yet pushed to a remote via a
completely local command?
(e.g. the list of unpushed _commits_ may be received by ‘git log
upstream..’)
I know it is possible to
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
Hmm, maybe. The ... take advantage of the new code refers to the
possibility (or otherwise) of re-using your work to update these
older API functions to the new API style. (also, see Junio's response).
I agree that, while caching the usual
Tanay Abhra tanay...@gmail.com writes:
For the config_cache_free(), would this change be enough?
+static void config_cache_free(void)
+{
+ struct hashmap *config_cache;
+ struct config_cache_entry *entry;
+ struct hashmap_iter iter;
+ if (!hashmap_initialized)
+
Tanay Abhra tanay...@gmail.com writes:
the config hash-table api which provides a cleaner control flow.
api - API
--
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 majord...@vger.kernel.org
More
Tanay Abhra tanay...@gmail.com writes:
+Querying For Specific Variables
+---
+
+For programs wanting to query for specific variables in a non-callback
+manner, the config API provides two functions `git_config_get_string`
+and `git_config_get_string_multi`.They
On Mon, Jun 23, 2014 at 9:15 PM, Jeremy Scott jer...@great-scotts.org wrote:
I just encountered a situation where a merge was made, with no
apparent changes in files (ie no log), but the result was that some
files were deleted.
person A adds some files
person B adds some files from the same
Tanay Abhra tanay...@gmail.com writes:
+ if (!git_config_get_string(imap.user, value))
+ server.user = xstrdup(value);
+ if (!git_config_get_string(imap.pass, value))
+ server.pass = xstrdup(value);
+ if (!git_config_get_string(imap.port, value))
+
Shawn Pearce spea...@spearce.org writes:
On Thu, Jun 26, 2014 at 5:42 AM, Kirill Likhodedov
kirill.likhode...@jetbrains.com wrote:
is it possible to know which tags are not yet pushed to a remote via a
completely local command?
(e.g. the list of unpushed _commits_ may be received by ‘git
Junio C Hamano gits...@pobox.com writes:
When the submodule script that uses git config -f .gitmodules is
converted into C, if the updated config API is ready, it may be able
to do something like these in a single program:
const char *url;
struct config_set *gm_config;
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Too large files may lead to failure to allocate memory. If it happens
here, it could impact quite a few commands that involve
diff. Moreover, too large files are inefficient to compare anyway (and
most likely non-text), so mark them binary and
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
fsck is a tool that error() is more preferred than die(), but many
more preferred without justifying why it is more preferred is
not quite a justification, is it? Also, an object failing to load
in-core is not a missing object, so if your aim is
Am 25.06.2014 05:59, schrieb Eric Sunshine:
On Mon, Jun 23, 2014 at 6:41 AM, Tanay Abhra tanay...@gmail.com wrote:
[...]
/* returns 0 for no pager, 1 for use pager, and -1 for not specified
*/
int check_pager_config(const char *cmd)
{
- struct pager_config c;
- c.cmd =
Jeff King p...@peff.net writes:
I haven't quite convinced myself that the stale logic in the middle is
right. The origin paint_down function checks PARENT1 | PARENT2 to see
if we found a merge base (even though PARENT2 may represent many tips).
Here I check whether we have _any_ left parent
Matthieu Moy matthieu@grenoble-inp.fr writes:
Junio C Hamano gits...@pobox.com writes:
When the submodule script that uses git config -f .gitmodules is
converted into C, if the updated config API is ready, it may be able
to do something like these in a single program:
const char
Andreas Schwab sch...@linux-m68k.org writes:
Shawn Pearce spea...@spearce.org writes:
On Thu, Jun 26, 2014 at 5:42 AM, Kirill Likhodedov
kirill.likhode...@jetbrains.com wrote:
is it possible to know which tags are not yet pushed to a remote via a
completely local command?
(e.g. the list
Am 26.06.2014 21:00, schrieb Junio C Hamano:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Junio C Hamano gits...@pobox.com writes:
When the submodule script that uses git config -f .gitmodules is
converted into C, if the updated config API is ready, it may be able
to do something like
Junio C Hamano gits...@pobox.com writes:
The only time you can say Ah, we've seen this one and no need to
dig further is when you are propagating a colour C and the parent
in question is already painted in C (it is OK to be painted as
reachable from more tips), I would think, so shouldn't the
On 26 Jun 2014, at 23:04 , Junio C Hamano gits...@pobox.com wrote:
Andreas Schwab sch...@linux-m68k.org writes:
Not by default, but it is easy to configure your clone to fetch tags to
a separate namespace.
But then in order to learn what tags the remote has, you need to
talk to the
Junio C Hamano gits...@pobox.com writes:
What does it mean to look for branch --with $commit1 $commit2
(i.e. more than one in the Left set)? If we are trying to see which
branches reach _both_ of these commits, then replace the ablve with
if a commit is already painted as reachable from both
From: Phil Hord phil.h...@gmail.com
On Mon, Jun 23, 2014 at 9:15 PM, Jeremy Scott
jer...@great-scotts.org wrote:
I just encountered a situation where a merge was made, with no
apparent changes in files (ie no log), but the result was that some
files were deleted.
person A adds some files
David Aguilar dav...@gmail.com writes:
105b5d3fbb1c00bb0aeaf9d3e0fbe26a7b1993fc introduced a dependency
on mkdtemp, which is not available on Windows.
Use the original temporary directory behavior when mkdtemp fails.
This makes the code use mkdtemp when available and gracefully
fallback to
David Aguilar dav...@gmail.com writes:
105b5d3fbb1c00bb0aeaf9d3e0fbe26a7b1993fc introduced a dependency
on mkdtemp, which is not available on Windows.
Use the original temporary directory behavior when mkdtemp fails.
This makes the code use mkdtemp when available and gracefully
fallback to
Hi. Thanks for getting back to me.
here is a screenshot from source tree to visualise the scenario:
https://drive.google.com/file/d/0B-Wn7DfHsuhyTEVkRHAzeGVZelpMWjFxZW1kbVBKVlNab3pR/edit?usp=sharing
I will attempt a script to reproduce this later today.
Thanks
On Fri, Jun 27, 2014 at 5:53 AM,
we're all using source tree. I'm really interested to try and
reproduce this so I'll find some time today to do it.
Thanks again
On Fri, Jun 27, 2014 at 6:56 AM, Jeremy Scott jer...@great-scotts.org wrote:
Hi. Thanks for getting back to me.
here is a screenshot from source tree to visualise
Karsten Blees karsten.bl...@gmail.com writes:
Because I had an experience under my belt of a painful refactoring
of the_index which turned out to be not just a single array, I
simply suspect that the final data structure to represent a set of
config-like things will not be just a single
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Fixes accumulated on the 'master' front made into 2.0.1. The topics
in flight continue to separate into two distinct layers (i.e.
- Ursprungligt meddelande -
Från: Alan Franzoni mail...@franzoni.eu
Till: git@vger.kernel.org
Kopia: Alan Franzoni usern...@franzoni.eu
Skickat: torsdag, 26 jun 2014 15:53:32
Ämne: [PATCH] Fix: wrong offset for CET timezone
From: Alan Franzoni usern...@franzoni.eu
Am 26.06.2014 18:50, schrieb Matthieu Moy:
Tanay Abhra tanay...@gmail.com writes:
+if (!git_config_get_string(imap.user, value))
+server.user = xstrdup(value);
+if (!git_config_get_string(imap.pass, value))
+server.pass = xstrdup(value);
+if
On Thu, Jun 26, 2014 at 01:42:04PM -0700, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
105b5d3fbb1c00bb0aeaf9d3e0fbe26a7b1993fc introduced a dependency
on mkdtemp, which is not available on Windows.
Use the original temporary directory behavior when mkdtemp fails.
This
Imagine git does a recursive merge between A and B and finds multiple
common ancestors X1,X2 for these commits.
- Does git try to create an implicit/temporary common ancestor X3 by
merging X1 and X2?
- How should workingtree, index (stage1,2,3) look like if during that
merge of common ancestors a
46 matches
Mail list logo
