I set up a git alias like this:
git config --global alias.popmerge '!git stash pop git merge master'
Then I call it, like this:
git popmerge
The git stash pop is executed, but the git merge master is ignored.
If I run git merge master right after the git popmerge... it sumply runs
as
On Mon, Jul 14, 2014 at 01:02:56PM +0200, David Kastrup wrote:
Jeff King p...@peff.net writes:
As Junio and I discussed earlier in [1], this series makes the
prio_queue struct stable with respect to object insertion (which in turn
means we can use it to replace commit_list in more
Junio C Hamano gits...@pobox.com writes:
Julián Landerreche mani...@gmail.com writes:
OK, I'm mostly convinced.
A more verbose, educational output could read:
(use git pull to fetch newer commits from upstream and update your
local branch)
(use git merge to update your local branch)
Ihre Hilfe,bitte !
Ich bin frau Victoria Baker und bin ca 56 jahre alt und leide von
krebs
Meine Erbschaft ist usd8,9millionen
Die Herkunft/ Von meinem verstorbenen Ehemann.
Ich moechte meine Erbschaft durch Ihre Hilfe in Ihrem Land
investieren.
Meine investitionswuensche sind in der
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 | 24
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/branch.c
Use `git_config_get_value()` instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow.
The function now raises an error instead of dying when a NULL value is found
for key notes.rewritemode.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
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_*()` family instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow.
The function now raises an error instead of dying in cases where a NULL value is
not allowed.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
imap-send.c |
[PATCH v3]: Most of Eric's suggestions has been implemented. See [2] for
discussion.
Also, new helpers introduced in v7 of the config-set API series have
been used.
See [1] for the documentation of the new functions.
This series builds on the top of 5def4132 in pu or topic[1] in
Use `git_config_get_string()` instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow.
The function now raises an error instead of dying when a NULL value is found.
Signed-off-by: Tanay Abhra tanay...@gmail.com
---
alias.c | 27
Use `git_config_get_value()` instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow, also previously
'string_list_add_refs_by_glob()' was called even when the retrieved value
was NULL, correct it while we are at it.
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
---
Consider this as a proof of concept as the others callers have to be rewritten
as well.
I think that it is not
Hi,
Apologies in advance if this is the wrong place, but it looks like the
OSX packages available from http://git-scm.com/download/mac are not
working for at least some people including myself.
What I'm seeing is that any call to invoke git gives an illegal
instruction, crash report is below.
Tanay Abhra tanay...@gmail.com writes:
[PATCH v3]: Most of Eric's suggestions has been implemented. See [2] for
discussion.
Also, new helpers introduced in v7 of the config-set API series have
been used.
See [1] for the documentation of the new functions.
This series builds
Tanay Abhra tanay...@gmail.com writes:
--- a/alias.c
+++ b/alias.c
@@ -1,26 +1,13 @@
#include cache.h
-static const char *alias_key;
-static char *alias_val;
-
-static int alias_lookup_cb(const char *k, const char *v, void *cb)
-{
- const char *name;
- if (skip_prefix(k,
Junio C Hamano venit, vidit, dixit 19.07.2014 00:18:
Dennis Kaarsemaker den...@kaarsemaker.net writes:
My use case for this is checking out the same branch (or commit, so
already on a detached HEAD) in multiple different places to run
independent actions (e.g. make test with different
On 7/21/2014 6:21 PM, Matthieu Moy wrote:
Tanay Abhra tanay...@gmail.com writes:
[PATCH v3]: Most of Eric's suggestions has been implemented. See [2] for
discussion.
Also, new helpers introduced in v7 of the config-set API series have
been used.
See [1] for the documentation
On 20/07/14 13:13, Nguyễn Thái Ngọc Duy wrote:
Locked paths are saved in a linked list so that if something wrong
happens, *.lock are removed. This works fine if we keep cwd the same,
which is true 99% of time except:
- update-index and read-tree hold the lock on $GIT_DIR/index really
On 21/07/14 12:12, Tanay Abhra wrote:
Use `git_config_get_string()` instead of `git_config()` to take advantage of
the config-set API which provides a cleaner control flow.
The function now raises an error instead of dying when a NULL value is found.
Signed-off-by: Tanay Abhra
Tanay Abhra tanay...@gmail.com writes:
Consider this as a proof of concept as the others callers have to be rewritten
as well.
I think that it is not so buggy as it passes all the tests.
Before and after your patch, git_default_config() is called once per
config key. Before the patch, it made
Tanay Abhra tanay...@gmail.com writes:
On 7/21/2014 6:21 PM, Matthieu Moy wrote:
2) Add a by-address parameter to git_configset_get_value that allows the
user to get the file and line information. In your previous patch,
that would mean returning a pointer to the corresponding struct
On Mon, Jul 21, 2014 at 8:27 PM, Ramsay Jones
ram...@ramsay1.demon.co.uk wrote:
+void make_locked_paths_absolute(void)
+{
+ struct lock_file *lk;
+ for (lk = lock_file_list; lk != NULL; lk = lk-next) {
+ if (lk-filename !is_absolute_path(lk-filename)) {
+
On 21/07/14 12:44, Tanay Abhra wrote:
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
---
Consider this as a proof of concept as the others callers have to
On 7/21/2014 7:15 PM, Matthieu Moy wrote:
Tanay Abhra tanay...@gmail.com writes:
On 7/21/2014 6:21 PM, Matthieu Moy wrote:
2) Add a by-address parameter to git_configset_get_value that allows the
user to get the file and line information. In your previous patch,
that would mean
This function tests if $PWD is the same as getcwd() using st_dev and
st_ino. But on Windows these fields are always zero
(mingw.c:do_lstat). If cwd is moved away, I think falling back to $PWD
is wrong. I don't understand the use of $PWD in the first place.
1b9a946 (Use nonrelative paths instead of
+if + git_config_get_string(core.notesref, (const
char**)notes_ref_name);
This cast is needed only because notes_ref_name is declared as
non-const, but a better fix would be to make the variable const, and
remove the cast.
Same casts had to be used in imap-send.c patch, I will
On 21/07/14 14:47, Duy Nguyen wrote:
On Mon, Jul 21, 2014 at 8:27 PM, Ramsay Jones
ram...@ramsay1.demon.co.uk wrote:
+void make_locked_paths_absolute(void)
+{
+ struct lock_file *lk;
+ for (lk = lock_file_list; lk != NULL; lk = lk-next) {
+ if (lk-filename
Tanay Abhra tanay...@gmail.com writes:
On 7/21/2014 7:15 PM, Matthieu Moy wrote:
Tanay Abhra tanay...@gmail.com writes:
On 7/21/2014 6:21 PM, Matthieu Moy wrote:
2) Add a by-address parameter to git_configset_get_value that allows the
user to get the file and line information. In your
Tanay Abhra tanay...@gmail.com writes:
+ if + git_config_get_string(core.notesref, (const
char**)notes_ref_name);
This cast is needed only because notes_ref_name is declared as
non-const, but a better fix would be to make the variable const, and
remove the cast.
Same casts had to
--
Kedves Email felhasználói;
Túllépte a határt 23.432 tárolása az e-postafiók beállítva a
WEB SERVICE / Administrator, és akkor problémái küldött
és a bejövő üzenetek, amíg meg újból érvényesíti az e-mail címét. A
szükséges eljárások
nyújtottak be az alábbi a véleménye, ellenőrizze kattintva
Karsten Blees karsten.bl...@gmail.com writes:
compat/mingw.c needs to #include cache.h for ALLOC_GROW.
Signed-off-by: Karsten Blees bl...@dcon.de
---
Thanks!
compat/mingw.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/compat/mingw.c b/compat/mingw.c
index bd45950..c725a3e 100644
Karsten Blees karsten.bl...@gmail.com writes:
On Windows, the command line is a Unicode string, it is not possible to
pass arbitrary bytes to a program. Disable tests that try to do so.
Signed-off-by: Karsten Blees bl...@dcon.de
---
Thanks; will replace.
--
To unsubscribe from this list:
Erik Faye-Lund kusmab...@gmail.com writes:
On Thu, Jul 17, 2014 at 5:37 PM, Stepan Kasal ka...@ucw.cz wrote:
From: Pat Thoyts pattho...@users.sourceforge.net
On Windows the application command line is provided as unicode and in
mingw-git we convert that to utf-8. So these tests that require
Duy Nguyen pclo...@gmail.com writes:
On Mon, Jul 21, 2014 at 8:27 PM, Ramsay Jones
ram...@ramsay1.demon.co.uk wrote:
+void make_locked_paths_absolute(void)
+{
+ struct lock_file *lk;
+ for (lk = lock_file_list; lk != NULL; lk = lk-next) {
+ if (lk-filename
Am 21.07.2014 04:33, schrieb Jeff King:
On Sun, Jul 20, 2014 at 06:49:54PM +0200, René Scharfe wrote:
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 56f85e2..c4958b6 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -535,10 +535,10 @@ int cmd_init_db(int argc, const char
curious: I am only an occasional programmer in C. I read Linus'
post that C++ is a horrible language.
alas, I wonder why people like Linus, who live in C, do not
design C 11.1---a preprocessor or preprocessor replacement that
adds some modest niceties to the language. For example, forward
John Keeping j...@keeping.me.uk writes:
Signed-off-by: John Keeping j...@keeping.me.uk
---
As these ;; are separators not terminators, this is not strictly
necessary. Squashing it into a change that adds more case arms to
this case statement is of course not just good but necessary,
though.
Hi Junio,
On Mon, 21 Jul 2014, Junio C Hamano wrote:
Oh by the way, can somebody remind me why we spell these as
NOT_MINGW, instead of !MINGW?
I guess that is my mistake; when I introduced the use of NOT_MINGW I was
simply unaware of the !MINGW syntax.
Let's use the latter consistently?
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 | 24
1 file changed, 4
Tanay Abhra tanay...@gmail.com writes:
+ git_config_get_string(imap.folder, (const char**)imap_folder);
The same why (const char **)--is that an API mistake? question
applies here and other calls to git_config_get_string() in this
patch.
--
To unsubscribe from this list: send the line
Junio C Hamano gits...@pobox.com writes:
Tanay Abhra tanay...@gmail.com writes:
-if (cb.value)
-strbuf_addstr(buf, cb.value);
+strbuf_addstr(buf, v);
+free((char*)v);
In this cast, I smell an API mistake to insist an extra constness to
the output parameter of
Matthieu Moy matthieu@grenoble-inp.fr writes:
In general, most strings one manipulates are const char *, it's
frequent to modify a pointer to a string, but rather rare to modify the
string itself.
We seem to have a disagreement. Unlike git_config_get_value() that
lets callers peek the
On 7/21/2014 11:29 PM, Junio C Hamano wrote:
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 | 24
Introduce the GIT_GUI_LIB_DIR environment variable, to tell git-gui
where to look for TCL libs. This allows a git-gui which has been
built with a prefix of /foo to be run out of directory /bar. This is
the equivalent of GIT_EXEC_PATH or GITPERLLIB but for git-gui's TCL
libraries.
Signed-off-by:
Yi EungJun semtlen...@gmail.com writes:
From: Yi EungJun eungjun...@navercorp.com
Add an Accept-Language header which indicates the user's preferred
languages defined by $LANGUAGE, $LC_ALL, $LC_MESSAGES and $LANG.
Examples:
LANGUAGE= -
LANGUAGE=ko:en - Accept-Language: ko, en; q=0.9,
Jeff King p...@peff.net writes:
On Sun, Jul 20, 2014 at 06:49:54PM +0200, René Scharfe wrote:
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 56f85e2..c4958b6 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -535,10 +535,10 @@ int cmd_init_db(int argc, const char **argv,
Am 21.07.2014 19:45, schrieb Johannes Schindelin:
Hi Junio,
On Mon, 21 Jul 2014, Junio C Hamano wrote:
Oh by the way, can somebody remind me why we spell these as
NOT_MINGW, instead of !MINGW?
I guess that is my mistake; when I introduced the use of NOT_MINGW I was
simply unaware of
Junio C Hamano gits...@pobox.com writes:
Oh by the way, can somebody remind me why we spell these as
NOT_MINGW, instead of !MINGW?
Simple answer seems to be that !ANYTHING appeared only at bdccd3c1
(test-lib: allow negation of prerequisites, 2012-11-14) but at that
version already 5 test
Thanks, will replace and let's move it to 'next' this week.
--
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:
John Keeping j...@keeping.me.uk writes:
Signed-off-by: John Keeping j...@keeping.me.uk
---
As these ;; are separators not terminators, this is not strictly
necessary. Squashing it into a change that adds more case arms to
this case statement is of
Introduce the GIT_GUI_LIB_DIR environment variable, to tell git-gui
where to look for TCL libs. This allows a git-gui which has been
built with a prefix of /foo to be run out of directory /bar. This is
the equivalent of GIT_EXEC_PATH or GITPERLLIB but for git-gui's TCL
libraries.
Signed-off-by:
Hello,
We are currently working on a single sign on setup for our git install. We are
using git 2.0.2 (ubuntu) plus apache/2.2.22 mod_auth_kerb on the
server side. Here some scenario we are trying to accomplish :
-Without Kerberos ticket stored.
Git ask for username/password.
Result =
David Turner dtur...@twopensource.com writes:
Introduce the GIT_GUI_LIB_DIR environment variable, to tell git-gui
where to look for TCL libs. This allows a git-gui which has been
built with a prefix of /foo to be run out of directory /bar. This is
the equivalent of GIT_EXEC_PATH or
On Mon, 2014-07-21 at 14:06 -0700, Junio C Hamano wrote:
David Turner dtur...@twopensource.com writes:
Introduce the GIT_GUI_LIB_DIR environment variable, to tell git-gui
where to look for TCL libs. This allows a git-gui which has been
built with a prefix of /foo to be run out of
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
Oh by the way, can somebody remind me why we spell these as
NOT_MINGW, instead of !MINGW?
Simple answer seems to be that !ANYTHING appeared only at bdccd3c1
(test-lib: allow negation of prerequisites,
test_have_prereq does understand multiple predicates given as
separate arguments, but that is by accident. We should list the
prerequisites just like we use them as the (first) optional
parameter for test_expect_success, concatenated with commas, for
consistency.
Signed-off-by: Junio C Hamano
Junio C Hamano gits...@pobox.com writes:
So here is the first of the two small/trivial patch series.
To prepare the first one, I did git grep -e '\NOT_' t/ to the
result of applying Stepan's series and edited the hits manually.
And then compared the result with running
$ perl -p -i -e
The caret (^) is used as a markup symbol in AsciiDoc. Due to the
inability of AsciiDoc to parse a line containing an unmatched caret, it
omitted the line from the output, resulting in the man page missing the
end of a sentence. Escape this caret so that the man page ends up with
the complete
brian m. carlson wrote:
The caret (^) is used as a markup symbol in AsciiDoc. Due to the
inability of AsciiDoc to parse a line containing an unmatched caret, it
omitted the line from the output, resulting in the man page missing the
end of a sentence.
Wow. Usually asciidoc is more
On Mon, Jul 21, 2014 at 05:06:50PM -0400, Jean-Francois Bouchard wrote:
Hello,
We are currently working on a single sign on setup for our git install. We are
using git 2.0.2 (ubuntu) plus apache/2.2.22 mod_auth_kerb on the
server side. Here some scenario we are trying to accomplish :
On Mon, Jul 21, 2014 at 04:14:38PM -0700, Jonathan Nieder wrote:
brian m. carlson wrote:
The caret (^) is used as a markup symbol in AsciiDoc. Due to the
inability of AsciiDoc to parse a line containing an unmatched caret, it
omitted the line from the output, resulting in the man page
Dear. Friend,
I am Vice Chairman, Board of Directors Hang Seng Bank Hong Kong.
Dr.Raymond Chien; A deceased client of mine, that shares the same
last name as yours, Died without a next of kin. $16,M in my Branch.
Contact Email: drhraymo...@yahoo.com.hk
Regards,
Dr Raymond.
--
To unsubscribe from
62 matches
Mail list logo
