On 09/13/2014 09:41 AM, Johannes Sixt wrote:
Am 06.09.2014 um 09:50 schrieb Michael Haggerty:
It's bad manners. Especially since, if unlink_or_warn() failed, the
memory wasn't restored to its original contents.
I do not see how the old code did not restore the file name. Except for
this
On 09/14/2014 08:27 AM, Michael Haggerty wrote:
On 09/13/2014 09:41 AM, Johannes Sixt wrote:
Am 06.09.2014 um 09:50 schrieb Michael Haggerty:
It's bad manners. Especially since, if unlink_or_warn() failed, the
memory wasn't restored to its original contents.
I do not see how the old code
On Sat, Sep 13, 2014 at 10:23:03PM -0700, Junio C Hamano wrote:
On Sat, Sep 13, 2014 at 7:00 PM, Perry Hutchison per...@pluto.rain.com
wrote:
David Aguilar dav...@gmail.com wrote:
Add a #ifndef guard to ensure that common-cmds.h can only
be included by help.c.
This strikes me as a
If the stderr of git credential-cache is redirected to a
pipe, the reader on the other end of a pipe may be surprised
that the pipe remains open long after the process exits.
This happens because we may auto-spawn a daemon which is
long-lived, and which keeps stderr open.
We can solve this by
Teach check-header.sh to ensure that the first included header in .c
files is either git-compat-util.h, builtin.h, or cache.h.
Ensure that common-cmds.h is only included by help.c.
Move the logic into functions so that we can skip parts of the check.
Signed-off-by: David Aguilar
CodingGuidelines states that the first #include in C files should be
git-compat-util.h or another header file that includes it, such as
cache.h or builtin.h.
Tweak the tiny minority of files that do not follow this advice.
This makes make check-headers SKIP_HEADER_CHECK=1 happy.
Signed-off-by:
On my Debian 7 system, this gives annoying warnings when the output
of git svn commands are redirected:
Unable to get Terminal Size. The TIOCGWINSZ ioctl didn't work.
The COLUMNS and LINES environment variables didn't work. The
resize program didn't work.
Signed-off-by: Eric Wong
Eric Wong normalper...@yhbt.net wrote:
On my Debian 7 system, this gives annoying warnings when the output
s/gives/fixes/
--
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
Junio C Hamano gits...@pobox.com wrote:
On Sat, Sep 13, 2014 at 7:00 PM, Perry Hutchison per...@pluto.rain.com
wrote:
David Aguilar dav...@gmail.com wrote:
Add a #ifndef guard to ensure that common-cmds.h can only
be included by help.c.
... If these definitions are intended to be
On Fri, Sep 12, 2014 at 11:26:43AM -0300, Jonh Wendell wrote:
It will print just a + sign appended to the found tag, if there
are commits between the tag and the supplied commit.
It's useful when you just need a simple output to know if the
supplied commit is an exact match or not.
Seems
Hi Junio, a couple of small changes and fixes. Most of these should be
suitable for maint, too.
The following changes since commit ce1d3a93a6405b8a0313491df3099919ed3d150f:
Update draft release notes to 2.2 (2014-09-11 11:19:47 -0700)
are available in the git repository at:
On Fri, Sep 12, 2014 at 11:26:44AM -0300, Jonh Wendell wrote:
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -54,6 +54,12 @@ OPTIONS
abbreviated object name, use n digits, or as many digits
as needed to form a unique object name. An n of 0
dak@lola:/usr/local/tmp/lilypond$ ../git/git branch --merged --verbose
fatal: malformed object name --verbose
dak@lola:/usr/local/tmp/lilypond$ ../git/git branch --verbose --merged
* (detached from 5b2267a) 1c23f39 Merge branch 'issue4097' into HEAD
issue3468cf033e Issue 346:
Ensure that rev-parse --verify --quiet is silent when asked
about deleted reflog entries.
Signed-off-by: David Aguilar dav...@gmail.com
---
This verifies and depends on refs: make rev-parse --quiet actually quiet.
t/t1503-rev-parse-verify.sh | 9 +
1 file changed, 9 insertions(+)
diff
On Sun, Sep 14, 2014 at 12:55:41AM -0700, Perry Hutchison wrote:
Junio C Hamano gits...@pobox.com wrote:
On Sat, Sep 13, 2014 at 7:00 PM, Perry Hutchison per...@pluto.rain.com
wrote:
David Aguilar dav...@gmail.com wrote:
Add a #ifndef guard to ensure that common-cmds.h can only
be
On 12.09.14 20:19, Rom Walton wrote:
Try:
git checkout -f master
git pull origin
I committed fixes for that stuff this morning.
- Rom
It seems as if we added CRLF's to the repo:
od -c html/languages/translations/hu.po | grep \\\r
0577300# # \r \n # P r i v
On Sun, Sep 14, 2014 at 4:18 AM, Jeff King p...@peff.net wrote:
On Fri, Sep 12, 2014 at 11:26:43AM -0300, Jonh Wendell wrote:
It will print just a + sign appended to the found tag, if there
are commits between the tag and the supplied commit.
It's useful when you just need a simple output to
On 09/14/2014 10:51 AM, Torsten Bögershausen wrote:
It may be that there is a bug in the tools you are using.
I use git 2.1.0
--
Toralf
pgp key: 0076 E94E
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info
When cloning a repository that contains submodules and specifying the
`--depth` option to the 'git clone' command, the top level repository will be
cloned with the specified depth, but all submodules within the
repository will be cloned in their entirety.
Modified 'git clone' to pass the
Currently when specifying the `--depth` option to the 'submodule add'
command, it can only create a shallow submodule clone of the currently
active branch from the cloned repository. If a branch is specified using
the `--branch` option, and the `--depth` option is also specified, the
'submodule
On 09/14/2014 10:51 AM, Torsten Bögershausen wrote:
It may be that there is a bug in the tools you are using.
I use git 2.1.0
The question was how the commit had been produced:
Rom, what are you using ?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
Am 14.09.2014 um 08:38 schrieb Michael Haggerty:
On 09/14/2014 08:27 AM, Michael Haggerty wrote:
On 09/13/2014 09:41 AM, Johannes Sixt wrote:
Am 06.09.2014 um 09:50 schrieb Michael Haggerty:
It's bad manners. Especially since, if unlink_or_warn() failed, the
memory wasn't restored to its
Hi David,
On 09/14/2014 10:30 AM, David Aguilar wrote:
Ensure that rev-parse --verify --quiet is silent when asked
about deleted reflog entries.
Signed-off-by: David Aguilar dav...@gmail.com
---
This verifies and depends on refs: make rev-parse --quiet actually quiet.
The macro ALLOC_GROW manages several aspects of dynamic memory
allocations for arrays: It performs overprovisioning in order to avoid
reallocations in future calls, updates the allocation size variable,
multiplies the item size and thus allows users to simply specify the
item count, performs the
Signed-off-by: Rene Scharfe l@web.de
---
attr.c | 3 +--
builtin/apply.c| 2 +-
builtin/for-each-ref.c | 9 +++--
builtin/index-pack.c | 4 +---
builtin/log.c | 2 +-
builtin/merge.c| 2 +-
builtin/mv.c | 8
Am 13.09.2014 um 22:19 schrieb Jeff King:
Since git update-server-info may be called automatically
as part of a push or a gc --auto, we should be robust
against two processes trying to update it simultaneously.
However, we currently use a fixed tempfile, which means that
two simultaneous
On Sun, Sep 14, 2014 at 06:20:57PM +0200, Fabian Ruch wrote:
Hi David,
On 09/14/2014 10:30 AM, David Aguilar wrote:
Ensure that rev-parse --verify --quiet is silent when asked
about deleted reflog entries.
Signed-off-by: David Aguilar dav...@gmail.com
---
This verifies and depends
Ensure that rev-parse --verify --quiet is silent when asked
about deleted reflog entries.
Helped-by: Fabian Ruch baf...@gmail.com
Signed-off-by: David Aguilar dav...@gmail.com
---
Changes since last time:
Use git branch test instead of low-level plumbing commands.
Capture both stdout and stderr
Use `test_must_be_be_empty file` instead of `test -z $(cat file)`.
Suggested-by: Fabian Ruch baf...@gmail.com
Signed-off-by: David Aguilar dav...@gmail.com
---
t/t1503-rev-parse-verify.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t1503-rev-parse-verify.sh
Signed-off-by: Matthias Ruester matthias.rues...@gmail.com
---
builtin/log.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index e4d8122..e713618 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -38,8 +38,8 @@ static const char
When gitk contains some changed parameter, and there is existing
instance of gitk where the parameter is still old, it is reverted to
that old value when the instance exits.
Instead, store a parameter in config only it is has been modified in the
exiting instance. Otherwise, preserve the value
Signed-off-by: Max Kirillov m...@max630.net
---
gitk | 88
1 file changed, 20 insertions(+), 68 deletions(-)
diff --git a/gitk b/gitk
index c8df35d..bc57c11 100755
--- a/gitk
+++ b/gitk
@@ -2772,23 +2772,11 @@ proc doprogupdate
Changes since v1:
* Add value check to config_variable_change_cb
* Squash 2/3 and 3/3 and the value check into one commit. There is no really
reasons to divide them except following the real coding history
* Describle the previous undesirable behavior in commit message
* Synchronize writing of
If several gitk instances are closed simultaneously, safestuff procedure
can run at the same time, resulting in a conflict which may cause losing
of some of the instance's changes, failing the saving operation or even
corrupting the configuration file. This can happen, for example, at user
session
Signed-off-by: Matthias Ruester matthias.rues...@gmail.com
---
builtin/log.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index e713618..5621475 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -78,7 +78,7 @@ static int
Signed-off-by: Matthias Ruester matthias.rues...@gmail.com
---
rerere.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rerere.h b/rerere.h
index 4aa06c9..2956c2e 100644
--- a/rerere.h
+++ b/rerere.h
@@ -24,6 +24,6 @@ extern void rerere_clear(struct string_list *);
extern
On Sun, Sep 14, 2014 at 6:38 AM, Cole Minnaar cole.minn...@gmail.com wrote:
Currently when specifying the `--depth` option to the 'submodule add'
command, it can only create a shallow submodule clone of the currently
active branch from the cloned repository. If a branch is specified using
the
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C Hamano gits...@pobox.com
---
t/t7513-interpret-trailers.sh | 726 ++
1 file changed, 726 insertions(+)
create mode 100755 t/t7513-interpret-trailers.sh
diff --git
And add a few other tests for some special cases.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C Hamano gits...@pobox.com
---
t/t7513-interpret-trailers.sh | 125 ++
1 file changed, 125 insertions(+)
diff --git
This patch adds the git interpret-trailers command.
This command uses the previously added process_trailers()
function in trailer.c.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C Hamano gits...@pobox.com
---
.gitignore | 1 +
Makefile
This patch series implements a new command:
git interpret-trailers
and an infrastructure to process trailers that can be reused,
for example in commit.c.
1) Rationale
This command should help with RFC 822 style headers, called
trailers, that are found at the end of commit messages.
Read trailers from a file or from stdin, parse the trailers and then
put the result into a doubly linked list.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C Hamano gits...@pobox.com
---
trailer.c | 123
We will use a doubly linked list to store all information
about trailers and their configuration.
This way we can easily remove or add trailers to or from
trailer lists while traversing the lists in either direction.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C
Parse the trailer command line arguments and put
the result into an arg_tok doubly linked list.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C Hamano gits...@pobox.com
---
trailer.c | 125 ++
1 file
While at it add git-interpret-trailers to command-list.txt.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C Hamano gits...@pobox.com
---
Documentation/git-interpret-trailers.txt | 313 +++
command-list.txt | 1 +
This patch adds the process_trailers() function that
calls all the previously added processing functions
and then prints the results on the standard output.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C Hamano gits...@pobox.com
---
trailer.c | 81
Implement the logic to process trailers from the input message
and from arguments.
At the beginning trailers from the input message are in their
own in_tok doubly linked list, and trailers from arguments
are in their own arg_tok doubly linked list.
The lists are traversed and when an arg_tok
Let the user specify a command that will give on its standard output
the value to use for the specified trailer.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C Hamano gits...@pobox.com
---
trailer.c | 85
Read the configuration to get trailer information, and then process
it and store it in a doubly linked list.
The config information is stored in the list whose first item is
pointed to by:
static struct trailer_item *first_conf_item;
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
49 matches
Mail list logo
