On Sat, Jul 18, 2015 at 12:03 AM, Junio C Hamano gits...@pobox.com wrote:
The other one is more heavy. Do we even want to have and expose
GIT_COMMON_DIR environment variable?
The primary reason why we added GIT_DIR, GIT_OBJECT_DIRECTORY
etc. in the early days of Git was because we didn't
On Sat, Jul 18, 2015 at 4:24 AM, Philip Oakley philipoak...@iee.org wrote:
From: Junio C Hamano gits...@pobox.com
As the nature of the conflict marker line determies if there should
should be a?
i.e. s/a /be a /below
Also: s/determies/determines/
--
To unsubscribe from this list: send
On Fri, Jul 17, 2015 at 6:24 PM, Junio C Hamano gits...@pobox.com wrote:
This gives a thin abstraction between the conflict ID that is a hash
value obtained by inspecting the conflicts and the name of the
directory under $GIT_DIR/rr-cache/, in which the previous resolution
is recorded to be
Hi Junio,
On 2015-07-17 23:39, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
On 2015-07-17 19:09, Charles Bailey wrote:
From: Charles Bailey cbaile...@bloomberg.net
According to POSIX specification uname must return -1 on failure and a
non-negative value on
On Fri, Jul 17, 2015 at 05:19:27PM -0400, David Turner wrote:
Don't update files in the worktree from cache entries which are
flagged with CE_WT_REMOVE.
When a user does a sparse checkout, git removes files that are marked
with CE_WT_REMOVE (because they are out-of-scope for the sparse
From: Junio C Hamano gits...@pobox.com
As the nature of the conflict marker line determies if there should
should be a?
i.e. s/a /be a /below
a SP and label after it, the caller shouldn't have to pass the
parameter redundantly.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
On 18.07.15 14:23, Paul Mackerras wrote:
On Fri, Jul 17, 2015 at 08:30:24AM -0700, Junio C Hamano wrote:
Paul Mackerras pau...@samba.org writes:
We have an item in the preferences menu to control the SHA1 length
that is automatically selected when going to a new commit. It's
stored in the
On Tue, Jul 14, 2015 at 09:54:10AM -0700, Stefan Beller wrote:
So what I meant to suggest, was to only allocate the memory if we really need
it
by moving the allocation further down.
static int clean_index(const unsigned char *head, const unsigned char *remote)
{
struct lock_file
On Fri, Jul 17, 2015 at 08:30:24AM -0700, Junio C Hamano wrote:
Paul Mackerras pau...@samba.org writes:
We have an item in the preferences menu to control the SHA1 length
that is automatically selected when going to a new commit. It's
stored in the variable $autosellen. That seems like
When referring to earlier commits in commit messages or other text, one
of the established formats is
abbrev-sha (summary, author-date)
Add a Copy commit summary command to the context menu that puts this
text for the currently selected commit on the clipboard. This makes it
easy for our
Thanks for the comments Junio/Jacob! Actually, the script was written
by someone before i came and the tag check was also done by my
colleague recently. I was also trying to implement the tag check
(using refs/tags which i did saw in few links online) but since my
colleague implemented this 'git
Gaurav Chhabra varuag.chha...@gmail.com writes:
@Junio: From the example you gave, i could conclude the following:
1) : gitster garbage/master; git commit --allow-empty -m third
[master d1f1360] third
: gitster garbage/master; git describe --exact-match HEAD ;# third
fatal: no tag
On Sat, Jul 18, 2015 at 1:08 PM, Gaurav Chhabra
varuag.chha...@gmail.com wrote:
Thanks for the comments Junio/Jacob! Actually, the script was written
by someone before i came and the tag check was also done by my
colleague recently. I was also trying to implement the tag check
(using refs/tags
Hi git list,
I think it would be useful if git-quiltimport.sh recognized a flag to
tell it to add a QuiltFilename: or PatchFilename: trailer to each
imported commit, which would show the filename of the patch that that
commit was imported from.
This would make it much easier (reliably possible,
Duy Nguyen pclo...@gmail.com writes:
Thank you both for catching this. Just a small suggestion. Perhaps we
should do this instead. apply_sparse_checkout() is the function where
all action manipulation (add, delete, update files..) for sparse
checkout occurs and it should not ask to delete and
From: Karthik Nayak karthik@gmail.com
Make 'tag.c' use 'ref-filter' APIs for iterating through refs sorting
and printing of refs. This removes most of the code used in 'tag.c'
replacing it with calls to the 'ref-filter' library.
Make 'tag.c' use the 'filter_refs()' function provided by
From: Karthik Nayak karthik@gmail.com
Using 'ref-filter' APIs implement the '--merged' and '--no-merged'
options into 'tag.c'. The '--merged' option lets the user to only
list tags merged into the named commit. The '--no-merged' option
lets the user to only list tags not merged into the named
From: Karthik Nayak karthik@gmail.com
Implement the '--format' option provided by 'ref-filter'.
This lets the user list tags as per desired format similar
to the implementation in 'git for-each-ref'.
Add tests and documentation for the same.
Mentored-by: Christian Couder
Duy Nguyen pclo...@gmail.com writes:
The flexibility here is not about extending this feature per se but
maybe trying out an entirely different setup. Yes a bunch of safety
nets are thrown out of the window if you try it. I guess I still had
the 2005 mindset when I designed this. If there is
Hi all,
I just uploaded the 5th release candidate for the upcoming Git for
Windows 2.x release. Please find the download link here:
https://git-for-windows.github.io/#download
Apart from synchronizing with Git 2.4.6, this version brings the following
fixes:
* Git for Windows handles
The space following the last / in a sed command caused Solaris'
xpg4/sed to fail, claiming the program was garbled and exit with
status 2:
% echo 'foo' | /usr/xpg4/bin/sed -e 's/foo/bar/ '
sed: command garbled: s/foo/bar/
% echo $?
2
Fix this by simply removing the unnecessary space.
It seems that xpg4/tr mishandles some strings involving [ not followed
by a character class:
% echo '[::1]' | /usr/xpg4/bin/tr -d '[]'
[::1
% echo '[::1]' | /usr/xpg4/bin/tr -d '['
usr/xpg4/bin/tr: Bad string.
This was breaking two tests. To fix the issue, use the octal
representations of [ and
From: Karthik Nayak karthik@gmail.com
Make 'tag.c' use 'ref-filter' data structures and make changes to
support the new data structures. This is a part of the process
of porting 'tag.c' to use 'ref-filter' APIs.
This is a temporary step before porting 'tag.c' to use 'ref-filter'
completely.
From: Karthik Nayak karthik@gmail.com
Since 'ref-filter' only has an option to match path names add an
option for plain fnmatch pattern-matching.
This is to support the pattern matching options which are used in `git
tag -l` and `git branch -l` where we can match patterns like `git tag
-l
From: Karthik Nayak karthik@gmail.com
In 'tag.c' we can print N lines from the annotation of the tag using
the '-nnum' option. Copy code from 'tag.c' to 'ref-filter' and
modify 'ref-filter' to support printing of N lines from the annotation
of tags.
Mentored-by: Christian Couder
From: Karthik Nayak karthik@gmail.com
Add an option in 'filter_refs()' to use 'for_each_tag_ref()'
and filter refs. This type checking is done by adding a
'FILTER_REFS_TAGS' in 'ref-filter.h'
Mentored-by: Christian Couder christian.cou...@gmail.com
Mentored-by: Matthieu Moy
From: Karthik Nayak karthik@gmail.com
Add a new atom align and support %(align:X) where X is a number.
This will align the preceeding atom value to the left followed by
spaces for a total length of X characters. If X is less than the item
size, the entire atom value is printed.
Helped-by:
This is part of my GSoC project to unify git tag -l, git branch -l,
git for-each-ref.
This patch series is continued from: Git (next)
https://github.com/git/git/commit/bf5418f49ff0cebc6e5ce04ad1417e1a47c81b61
Version 2 can be found here:
From: Karthik Nayak karthik@gmail.com
Add support to sort by version using the v:refname and
version:refname option. This is achieved by using the
'version_cmp()' function as the comparing function for qsort.
This option is included to support sorting by versions in `git tag -l`
which will
On Sat, Jul 18, 2015 at 10:10 PM, Michael Haggerty mhag...@alum.mit.edu wrote:
The latter doesn't exist.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/config.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/config.txt
On Sat, Jul 18, 2015 at 10:10 PM, Michael Haggerty mhag...@alum.mit.edu wrote:
So remove it from the BUGS section.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/git-worktree.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/Documentation/git-worktree.txt
On Sat, Jul 18, 2015 at 10:10 PM, Michael Haggerty mhag...@alum.mit.edu wrote:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 7f65dbb..10bc351 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
On Sat, Jul 18, 2015 at 11:21 AM, Ben Walton bdwal...@gmail.com wrote:
The space following the last / in a sed command caused Solaris'
xpg4/sed to fail, claiming the program was garbled and exit with
status 2:
% echo 'foo' | /usr/xpg4/bin/sed -e 's/foo/bar/ '
sed: command garbled: s/foo/bar/
On Sat, Jul 18, 2015 at 10:10 PM, Michael Haggerty mhag...@alum.mit.edu wrote:
The manpage referred to file lock in a couple of places. The file is
actually called locked.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
diff --git a/Documentation/git-worktree.txt
On Sat, Jul 18, 2015 at 11:21 AM, Ben Walton bdwal...@gmail.com wrote:
It seems that xpg4/tr mishandles some strings involving [ not followed
by a character class:
% echo '[::1]' | /usr/xpg4/bin/tr -d '[]'
[::1
% echo '[::1]' | /usr/xpg4/bin/tr -d '['
usr/xpg4/bin/tr: Bad string.
I suppose
On Sat, Jul 18, 2015 at 11:31 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Sat, Jul 18, 2015 at 11:21 AM, Ben Walton bdwal...@gmail.com wrote:
It seems that xpg4/tr mishandles some strings involving [ not followed
by a character class:
% echo '[::1]' | /usr/xpg4/bin/tr -d '[]'
[::1
%
Sometimes linked working trees were called linked working
directories or linked worktrees. Always refer to them as linked
working trees for consistency.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/git-worktree.txt | 10 +-
The manpage referred to file lock in a couple of places. The file is
actually called locked.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/git-worktree.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-worktree.txt
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/git-worktree.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index c8dd0e5..707dfd0 100644
--- a/Documentation/git-worktree.txt
+++
On Sat, Jul 18, 2015 at 10:10 PM, Michael Haggerty mhag...@alum.mit.edu wrote:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index c8dd0e5..707dfd0 100644
--- a/Documentation/git-worktree.txt
+++
I haven't been following the discussion of this feature on the mailing
list, so I apologize if these changes overlap with any in-flight
patches, and these changes should definitely be checked over by
somebody more familiar with the feature. These patches mostly fix what
seem like inconsistencies
So remove it from the BUGS section.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/git-worktree.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 6cb3877..d5aeda0 100644
---
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/config.txt | 8
Documentation/git-worktree.txt | 2 +-
Documentation/gitrepository-layout.txt | 18 +-
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git
The latter doesn't exist.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/config.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3e37b93..7f65dbb 100644
--- a/Documentation/config.txt
+++
On Sat, Jul 18, 2015 at 10:10 PM, Michael Haggerty mhag...@alum.mit.edu wrote:
I haven't been following the discussion of this feature on the mailing
list, so I apologize if these changes overlap with any in-flight
patches, and these changes should definitely be checked over by
somebody more
On Sat, Jul 18, 2015 at 10:10 PM, Michael Haggerty mhag...@alum.mit.edu wrote:
Sometimes linked working trees were called linked working
directories or linked worktrees. Always refer to them as linked
working trees for consistency.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
46 matches
Mail list logo
