On do, 2016-03-31 at 06:33 +, Peter Olsson wrote:
> I'm not sure where we should report this?
While the git-for-windows maintainer does read this list, git-for
-windows specific issues should be reported in its issue tracker on
GitHub.
It looks like this issue has been reported already:
https
Zachary Turner google.com> writes:
>
> Hi, just recently I installed the latest build of Windows 10 of my
> machine. This is my second Win10 machine. On the other I am using git
> 2.7.0.windows.1 and everything is working just fine.
>
> On the second machine I am using git 2.8.0.windows.1 and v
Zachary Turner google.com> writes:
> Has anyone seen anything like this before, or have any ideas how I might
> better diagnose this?
Not before, but I can confirm this issue on Win10, and reportedly on Win7 as
well. Actually I thought this was a Git for Windows specific issue, so I
reported it
On Wed, 2016-03-30 at 08:37 +0200, Michael Haggerty wrote:
> On 03/29/2016 10:12 PM, David Turner wrote:
> > On Sun, 2016-03-27 at 07:22 +0200, Michael Haggerty wrote:
> > > On 03/24/2016 07:47 AM, David Turner wrote:
> > > > [...]
> > > > I incorporated your changes into the lmdb backend. To make
Jeff King writes:
> On Wed, Mar 30, 2016 at 02:07:14PM -0700, Junio C Hamano wrote:
>
>> This is a tangent, but am I the only one who finds that the naming
>> of functions in config-get API is confusing? Just wondering if we
>> should rename the ones that keeps the memory ownership to the config
Make commit_patch_id() available to other builtins.
Helped-by: Junio C Hamano
Signed-off-by: Xiaolong Ye
---
patch-ids.c | 2 +-
patch-ids.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/patch-ids.c b/patch-ids.c
index b7b3e5a..a4d0016 100644
--- a/patch-ids.c
+++ b/patc
We can set format.base=auto to record the base commit info automatically,
it is equivalent to set --base=auto in cmdline.
The format.base has lower priority than command line option, so if user
set format.base=auto and pass the command line option in the meantime,
base_commit will be the one passe
Introduce --base=auto to record the base commit info automatically, the
base_commit
will be the merge base of tip commit of the upstream branch and revision-range
specified in cmdline.
Helped-by: Junio C Hamano
Helped-by: Wu Fengguang
Signed-off-by: Xiaolong Ye
---
Documentation/git-format-pa
V3 mainly improves the implementation according to Junio's comments,
Changes vs v2 include:
- Remove the unnecessary output line "** base-commit-info **".
- Improve the traverse logic to handle not only linear topology, but more
general cases, it will start revision walk by setting the star
Maintainers or third party testers may want to know the exact base tree
the patch series applies to. Teach git format-patch a '--base' option to
record the base tree info and append this information at the end of the
_first_ message (either the cover letter or the first patch in the series).
Helpe
On Wed, Mar 30, 2016 at 02:07:14PM -0700, Junio C Hamano wrote:
> This is a tangent, but am I the only one who finds that the naming
> of functions in config-get API is confusing? Just wondering if we
> should rename the ones that keeps the memory ownership to the config
> subsystem with s/get/pe
On Wed, Mar 30, 2016 at 5:17 PM, Stefan Beller wrote:
> The calling shell code makes sure that `path` is non null and non empty.
> (side note: it cannot be null as just three lines before it is passed
> to safe_create_leading_directories_const which would crash as you feed
> it null).
>
So we're
As submodules have working directory and their git directory far apart
relative_path(gitdir, work_dir) will not produce a relative path when
git_dir is absolute. When the gitdir is absolute, we need to convert
the workdir to an absolute path as well to compute the relative path.
(e.g. gitdir=/home
Just a few lines after the deleted code we call
safe_create_leading_directories_const(path + "/.git")
so the check is done twice without action in between.
Remove the first check.
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 4
1 file changed, 4 deletions(-)
diff --gi
The calling shell code makes sure that `path` is non null and non empty.
(side note: it cannot be null as just three lines before it is passed
to safe_create_leading_directories_const which would crash as you feed
it null).
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 5 +
This was reported as a regression at $gmane/290280. The root cause for
that bug is in using recursive submodules as their relative path handling
seems to be broken in ee8838d (2015-09-08, submodule: rewrite
`module_clone` shell function in C).
Signed-off-by: Stefan Beller
---
t/t7400-submodule-b
It took me longer than expected to fix this bug.
It comes with a test and minor refactoring and applies on top of
origin/sb/submodule-helper, such that it can be merged into 2.7, 2.8 as well
as master.
Patch 1 is a test which fails; it has a similar layout as the
real failing repository Norio Nom
Hi, just recently I installed the latest build of Windows 10 of my
machine. This is my second Win10 machine. On the other I am using git
2.7.0.windows.1 and everything is working just fine.
On the second machine I am using git 2.8.0.windows.1 and vim does not
work. I sent a bug report to b...@vim.
On Wed, Mar 30, 2016 at 03:27:05PM -0700, Junio C Hamano wrote:
Marios Titas writes:
- && !(ident_config_given & IDENT_NAME_GIVEN))
- die("user.useConfigOnly set but no name given");
+ && !(ident_config_given & I
Marios Titas writes:
> - && !(ident_config_given & IDENT_NAME_GIVEN))
> - die("user.useConfigOnly set but no name given");
> + && !(ident_config_given & IDENT_NAME_GIVEN)) {
> + fputs(env_hint,
Karthik Nayak writes:
> I kinda waited before sending this, since there was lot of discussions
> happening regarding to GSOC16, didn't want to clutter the mailing list.
>
> This is part of unification of the commands 'git tag -l, git branch -l
> and git for-each-ref'. This ports over branch.c to
Karthik Nayak writes:
> The "%(symref)" atom doesn't work when used with the ':short' modifier
> because we strictly match only 'symref' for setting the 'need_symref'
> indicator. Fix this by using comparing with valid_atom rather than used_atom.
>
> Add tests for %(symref) and %(symref:short) wh
Karthik Nayak writes:
> -static char *get_head_description(void)
> -{
> - struct strbuf desc = STRBUF_INIT;
> - struct wt_status_state state;
> - memset(&state, 0, sizeof(state));
> - wt_status_get_state(&state, 1);
> - if (state.rebase_in_progress ||
> - state.rebase_
Karthik Nayak writes:
> Ensure that each 'atom_value' has a reference to its corresponding
> 'used_atom'. This let's us use values within 'used_atom' in the
> 'handler' function.
>
> Hence we can get the %(align) atom's parameters directly from the
> 'used_atom' therefore removing the necessity o
Karthik Nayak writes:
> +static struct ref_msg {
> + const char *gone;
> + const char *ahead;
> + const char *behind;
> + const char *ahead_behind;
> +} msgs = {
> + "gone",
> + "ahead %d",
> + "behind %d",
> + "ahead %d, behind %d"
> +};
> +
> +void setup_ref_filt
On Wed, Mar 30, 2016 at 2:07 PM, Junio C Hamano wrote:
> Eric Sunshine writes:
>
>>> diff --git a/builtin/notes.c b/builtin/notes.c
>>> @@ -744,13 +744,14 @@ static int merge_commit(struct notes_merge_options *o)
>>> static int git_config_get_notes_strategy(const char *key,
>>>
Eric Sunshine writes:
>> diff --git a/builtin/notes.c b/builtin/notes.c
>> @@ -744,13 +744,14 @@ static int merge_commit(struct notes_merge_options *o)
>> static int git_config_get_notes_strategy(const char *key,
>> enum notes_merge_strategy *strategy)
>>
SZEDER Gábor writes:
> 'git for-each-ref's manpage says that '--contains' only lists tags,
> but it lists all kinds of refs.
>
> Signed-off-by: SZEDER Gábor
> ---
Thanks; will apply on top of 4a71109a (for-each-ref: add
'--contains' option, 2015-07-07) so that we can eventually
include it in 2.
Stefan Beller writes:
> On Wed, Mar 30, 2016 at 9:05 AM, Stefan Beller wrote:
>> On Wed, Mar 30, 2016 at 2:03 AM, Norio Nomura wrote:
>>> Hi,
>>>
>>> `git submodule update --init --recursive` stores `gitdir` in full path into
>>> `.git` of nested submodules.
>>> So, working directory is not po
SZEDER Gábor writes:
> Fill the hashmap with source entries in reverse order to restore the
> original exact rename detection behavior.
Thanks for digging out and fixing this unintended regression that
happened long time ago. Will queue.
>
> Reported-by: Bill Okara
> Signed-off-by: SZEDER Gáb
On Wed, Mar 30, 2016 at 3:00 PM, Mehul Jain wrote:
> On Wed, Mar 30, 2016 at 2:46 AM, Eric Sunshine
> wrote:
>> With the exception of the missing --rebase argument, this is exactly
>> the same code as in test_rebase_autostash(), right? Rather than
>> repeating this code yet again, it might be ni
Stefan Beller writes:
> The `prefix` was put in front of the display path unconditionally.
> This is wrong as any relative path computation would need to be at
> the front, so include the prefix into the display path.
>
> The new test replicates the previous test with the difference of executing
On Wed, Mar 30, 2016 at 12:31 PM, Jacob Keller wrote:
>
> If unsure, say Y.
> +
> +config RMI4_I2C
> + tristate "RMI4 I2C Support"
> + depends on RMI4_CORE && I2C
> + help
> + Say Y here if you want to support RMI4 devices connected to an I2C
> + bus.
>
On Wed, Mar 30, 2016 at 12:14 PM, Jacob Keller wrote:
> I ran this on a few of my local projects and it doesn't seem to
> produce any false positives so far. Everything looks good. Of course
> this is with just traditional C code. I am currently trying to run
> this against the history of Linux as
The env_hint message applies perfectly to the case when
user.useConfigOnly is set and at least one of the user.name and the
user.email are not provided. Additionally, use a more descriptive error
message when that happens.
Signed-off-by: Marios Titas
---
ident.c | 12
1 file changed
If user.useConfigOnly is set, it does not make sense to try to
auto-detect the name and/or the email. So it's better to do the
useConfigOnly checks first.
Signed-off-by: Marios Titas
---
ident.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ident.c b/ident.c
in
Jeff King writes:
> On Tue, Mar 29, 2016 at 04:15:08PM -0700, Junio C Hamano wrote:
>
>> diff --git a/Documentation/pretty-options.txt
>> b/Documentation/pretty-options.txt
>> index 4fb5c76..23967b6 100644
>> --- a/Documentation/pretty-options.txt
>> +++ b/Documentation/pretty-options.txt
>> @@
On Tue, Mar 29, 2016 at 11:05 PM, Jacob Keller wrote:
> On Tue, Mar 29, 2016 at 9:55 PM, Jeff King wrote:
>> One thing I like to do when playing with new diff ideas is to pipe all
>> of "log -p" for a real project through it and see what differences it
>> produces.
>>
>
> Great idea!
>
>> Below i
Hi Eric,
Thanks for the reviews on this series.
On Wed, Mar 30, 2016 at 2:46 AM, Eric Sunshine wrote:
> With the exception of the missing --rebase argument, this is exactly
> the same code as in test_rebase_autostash(), right? Rather than
> repeating this code yet again, it might be nice to augm
Eric Sunshine writes:
> On Tue, Mar 29, 2016 at 7:15 PM, Junio C Hamano wrote:
>> From: Linus Torvalds
>>
>> A commit log message sometimes tries to line things up using tabs,
>> assuming fixed-width font with the standard 8-place tab settings.
>> Viewing such a commit however does not work wel
Sven Strickroth writes:
> diff --git a/compat/mingw.h b/compat/mingw.h
> index 6b6d695..137f42e 100644
> --- a/compat/mingw.h
> +++ b/compat/mingw.h
> @@ -415,7 +415,7 @@ int mingw_offset_1st_component(const char *path);
> extern void build_libgit_environment(void);
> extern const char *program
[please don't top-post]
On Tue, Mar 29, 2016 at 11:11 PM, Zhang Lei wrote:
> Thanks for the review.
> Sorry for the patch churn, I wasn't quite familiar with working with
> mailing list.
No need to apologize. Reviewers understand what it is like being a
newcomer and provide additional review com
7/7 needs to be amended with something like this,
and the documentation needs an update.
In any case, the user can normalize the repo like this:
$ echo "* text=auto" >>.gitattributes
$ rm .git/index # Remove the index to force Git to
$ git reset # re-scan the working directory
$ git st
On Wed, Mar 30, 2016 at 1:05 PM, Stefan Beller wrote:
> In successful operation `write_pack_data` will close the `bundle_fd`,
> but when we exit early, we need to take care of the file descriptor
> as well as the lock file ourselves. The lock file may be deleted at the
> end of running the program
On Wed, Mar 30, 2016 at 10:32:40AM -0700, Stefan Beller wrote:
> > I'm OK with all of these as-is, though I did mention a nit in the third
> > one. I also like Junio's rewrite instead of using strbuf_list_free.
>
> I'm fine using the rewritten version instead of using strbuf_list_free. :)
> On th
On Wed, Mar 30, 2016 at 1:05 PM, Stefan Beller wrote:
> `split` is of type `struct strbuf **`, which we have a dedicated free
> function for, which takes care of freeing all related memory.
I think it's important to explain that 'split' and each split[]
element were being leaked (despite the exis
On Wed, Mar 30, 2016 at 1:05 PM, Stefan Beller wrote:
> `value` is just a temporary scratchpad, so we need to make sure it doesn't
> leak. It is xstrdup'd in `git_config_get_string` and
> `parse_notes_merge_strategy` just compares the string against predefined
> values, so no need to keep it aroun
On Wed, Mar 30, 2016 at 10:25 AM, Jeff King wrote:
> On Wed, Mar 30, 2016 at 10:05:14AM -0700, Stefan Beller wrote:
>
>> v2:
>> Thanks Eric, Jeff, Junio for discussion, I picked up all hints and here
>> is a v2.
>>
>> * drop the overallocation patches (1&2)
>> * use git_config_get_string instead o
On Wed, Mar 30, 2016 at 10:05:14AM -0700, Stefan Beller wrote:
> v2:
> Thanks Eric, Jeff, Junio for discussion, I picked up all hints and here
> is a v2.
>
> * drop the overallocation patches (1&2)
> * use git_config_get_string instead of its _const equivalent, such that
> we don't need a cast
On Wed, Mar 30, 2016 at 9:05 AM, Stefan Beller wrote:
> On Wed, Mar 30, 2016 at 2:03 AM, Norio Nomura wrote:
>> Hi,
>>
>> `git submodule update --init --recursive` stores `gitdir` in full path into
>> `.git` of nested submodules.
>> So, working directory is not portable to another directory.
>
>
On Wed, Mar 30, 2016 at 10:05:17AM -0700, Stefan Beller wrote:
> diff --git a/bundle.c b/bundle.c
> index 506ac49..fbc8593 100644
> --- a/bundle.c
> +++ b/bundle.c
> @@ -407,6 +407,7 @@ int create_bundle(struct bundle_header *header, const
> char *path,
> int bundle_to_stdout;
> int r
On Wed, Mar 30, 2016 at 10:06:41AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Tue, Mar 29, 2016 at 09:30:38PM -0400, Eric Sunshine wrote:
> >
> >> The implementation of strbuf_list_free() is this:
> >>
> >> struct strbuf **s = sbs;
> >> while (*s) {
> >> strbuf_re
Jeff King writes:
>> +if (compute_and_write_prerequisites(bundle_fd, &revs, argc, argv)) {
>> +if (!bundle_to_stdout)
>> +close(bundle_fd);
>> return -1;
>> +}
>
> Makes sense. Should we also be rolling back the lock file? It happens
> automati
Jeff King writes:
> I don't think this is wrong, but would it perhaps be simpler to call
> git_config_get_value() in the first place, which does not make a copy of
> the string?
Yup, I agree.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@
Stefan Beller writes:
> On Tue, Mar 29, 2016 at 5:57 PM, Eric Sunshine
> wrote:
>> On Tue, Mar 29, 2016 at 8:38 PM, Stefan Beller wrote:
>>> `strlen` returns the length of a string without the terminating null byte.
>>> To make sure enough memory is allocated we need to pass `strlen(..) + 1`
>
Duy Nguyen writes:
> But your suggestion is good and I can't think of any better. We could
> introduce pathspec as ftiler after "--", but it does not look elegant,
> and it overlaps with --include/--exclude.
I was imagining that we would allow the magic pathspec syntax used
in --include/--exclud
`value` is just a temporary scratchpad, so we need to make sure it doesn't
leak. It is xstrdup'd in `git_config_get_string` and
`parse_notes_merge_strategy` just compares the string against predefined
values, so no need to keep it around longer. Make `value` non-const to
avoid the cast in the free.
`split` is of type `struct strbuf **`, which we have a dedicated free
function for, which takes care of freeing all related memory.
Helped-by: Eric Sunshine
Signed-off-by: Stefan Beller
---
wt-status.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/wt-status.c b/wt-statu
In successful operation `write_pack_data` will close the `bundle_fd`,
but when we exit early, we need to take care of the file descriptor
as well as the lock file ourselves. The lock file may be deleted at the
end of running the program, but we are in library code, so we should
not rely on that.
H
No need to keep it open any further.
Signed-off-by: Stefan Beller
---
credential-cache.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/credential-cache.c b/credential-cache.c
index f4afdc6..86e21de 100644
--- a/credential-cache.c
+++ b/credential-cache.c
@@ -32,6 +32,7 @@ static int send_r
v2:
Thanks Eric, Jeff, Junio for discussion, I picked up all hints and here
is a v2.
* drop the overallocation patches (1&2)
* use git_config_get_string instead of its _const equivalent, such that
we don't need a cast when freeing in git_config_get_notes_strategy
* Use strbuf_list_free instead o
Jeff King writes:
> On Tue, Mar 29, 2016 at 09:30:38PM -0400, Eric Sunshine wrote:
>
>> The implementation of strbuf_list_free() is this:
>>
>> struct strbuf **s = sbs;
>> while (*s) {
>> strbuf_release(*s);
>> free(*s++);
>> }
>> free(sbs);
>>
>> which means tha
Anatoly Borodin writes:
> It's not like `git diff X^2 X` is a big problem, but too much of a
> copypaste.
Brace expansion helps a bit: git diff X{^2,}
Andreas.
--
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for someth
On Tue, Mar 29, 2016 at 5:57 PM, Eric Sunshine wrote:
> On Tue, Mar 29, 2016 at 8:38 PM, Stefan Beller wrote:
>> `strlen` returns the length of a string without the terminating null byte.
>> To make sure enough memory is allocated we need to pass `strlen(..) + 1`
>> to the allocation function.
>>
On Wed, Mar 30, 2016 at 2:03 AM, Norio Nomura wrote:
> Hi,
>
> `git submodule update --init --recursive` stores `gitdir` in full path into
> `.git` of nested submodules.
> So, working directory is not portable to another directory.
Are you reporting a regression bug? (Is that a new thing or has
Updated the warning messages, and added warnings for two more commands
(`checkout --` and `stash clear`). The list is now:
$ git rebase
$ git reset --hard
$ git clean -f
$ git gc --prune=now --aggressive
$ git push -f
$ git push remote [+/:]
$ git branch -D
$ git checkout [-p] [] --
$ git stash c
On Wed, Mar 30, 2016 at 9:29 AM, Chhatoi Pritam Baral
wrote:
> Forgot to mention in the previous message, this is a microproject
> for my GSoC '16 application.
>
> (Is that redundant to mention after v1 and v2? )
Readers of v1 knew this since you mentioned with that version, at least.
--
To unsub
Conceptually 'git clone' should behave as if the following commands
were run:
git init
git config ... # set default configuration and origin remote
git fetch
git checkout # unless '--bare' is given
However, that initial 'git fetch' behaves differently from any
subsequent fetches, becaus
'git for-each-ref's manpage says that '--contains' only lists tags,
but it lists all kinds of refs.
Signed-off-by: SZEDER Gábor
---
Documentation/git-for-each-ref.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-for-each-ref.txt
b/Documentation/git-for-e
Forgot to mention in the previous message, this is a microproject
for my GSoC '16 application.
(Is that redundant to mention after v1 and v2? )
On 03/26/2016 10:07 PM, Chhatoi Pritam Baral wrote:
> Previously a TODO; add a test for git-checkout skipping a
> file with the skip-worktree bit set.
>
Hi!
Jeff King wrote:
> For the first one, showing all diffs is what I want. For the second, it
> only makes sense to for the first parent case, as following other
> parents would zig-zag through history.
Lucky you! :) You probably don't need to inspect 9 month old ex-svn
branches with sync (i.e.
Hi,
On Wed, 30 Mar 2016, Ævar Arnfjörð Bjarmason wrote:
> Correct me if I'm wrong but don't we basically have 4 kinds of users
> using git-send-email:
>
> 1) Those who get it from a binary Windows package (is it even packaged there?)
It is. And reportedly working fine. But in the pre-MSYS2 time
Hi Sven,
On Wed, 30 Mar 2016, Sven Strickroth wrote:
> VS2010 comes with stdint.h [1]
> VS2013 comes with inttypes.h [2]
>
> [1] https://stackoverflow.com/a/2628014/3906760
> [2]
> https://blogs.msdn.microsoft.com/vcblog/2013/07/19/c99-library-support-in-visual-studio-2013/
>
> Signed-off-by:
On 3/30/2016 13:37, Sven Strickroth wrote:
VS2010 comes with stdint.h [1]
VS2013 comes with inttypes.h [2]
[1] https://stackoverflow.com/a/2628014/3906760
[2]
https://blogs.msdn.microsoft.com/vcblog/2013/07/19/c99-library-support-in-visual-studio-2013/
Signed-off-by: Sven Strickroth
ACK.
VS2010 comes with stdint.h [1]
VS2013 comes with inttypes.h [2]
[1] https://stackoverflow.com/a/2628014/3906760
[2]
https://blogs.msdn.microsoft.com/vcblog/2013/07/19/c99-library-support-in-visual-studio-2013/
Signed-off-by: Sven Strickroth
---
compat/mingw.h | 2 +-
compat/vc
To allow column display, we will need to first render the output in a
string list to allow print_columns() to compute the proper size of
each column before starting the actual output. Introduce the function
format_ref_array_item() that does the formatting of a ref_array_item
to an strbuf.
show_ref
Introduce setup_ref_filter_porcelain_msg() so that the messages used in
the atom %(upstream:track) can be translated if needed. This is needed
as we port branch.c to use ref-filter's printing API's.
Written-by: Matthieu Moy
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by:
The "%(symref)" atom doesn't work when used with the ':short' modifier
because we strictly match only 'symref' for setting the 'need_symref'
indicator. Fix this by using comparing with valid_atom rather than used_atom.
Add tests for %(symref) and %(symref:short) while we're here.
Helped-by: Junio
Introduce refname_atom_parser() which will parse the '%(refname)' atom
and store information into the 'used_atom' structure based on the
modifiers used along with the atom.
Signed-off-by: Karthik Nayak
---
ref-filter.c | 70 +---
1 file cha
Call ref-filter's setup_ref_filter_porcelain_msg() to enable
translated messages for the %(upstream:tack) atom. Although branch.c
doesn't currently use ref-filter's printing API's, this will ensure
that when it does in the future patches, we do not need to worry about
translation.
Written-by: Matt
Implement the '--format' option provided by 'ref-filter'. This lets the
user list branches as per desired format similar to the implementation
in 'git for-each-ref'.
Add tests and documentation for the same.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
-
Port branch.c to use ref-filter APIs for printing. This clears out
most of the code used in branch.c for printing and replaces them with
calls made to the ref-filter library.
Introduce build_format() which gets the format required for printing
of refs. Make amendments to print_ref_list() to reflec
I kinda waited before sending this, since there was lot of discussions
happening regarding to GSOC16, didn't want to clutter the mailing list.
This is part of unification of the commands 'git tag -l, git branch -l
and git for-each-ref'. This ports over branch.c to use ref-filter's
printing options
Add the options `:dir` and `:base` to the %(refname) atom. The `:dir`
option gives the directory (the part after $GIT_DIR/) of the ref without
the refname. The `:base` option gives the base directory of the given
ref (i.e. the directory following $GIT_DIR/refs/).
Add tests and documentation for th
Borrowing from branch.c's implementation print "[gone]" whenever an
unknown upstream ref is encountered instead of just ignoring it.
This makes sure that when branch.c is ported over to using ref-filter
APIs for printing, this feature is not lost.
Make changes to t/t6300-for-each-ref.sh and
Docum
Move the implementation of get_head_description() from branch.c to
ref-filter. This gives a description of the HEAD ref if called. This
is used as the refname for the HEAD ref whenever the
FILTER_REFS_DETACHED_HEAD option is used. Make it public because we
need it to calculate the length of the HE
Implement %(if:equals=) wherein the if condition is only
satisfied if the value obtained between the %(if:...) and %(then) atom
is the same as the given ''.
Similarly, implement (if:notequals=) wherein the if condition
is only satisfied if the value obtained between the %(if:...) and
%(then) atom
Add support for %(upstream:track,nobracket) which will print the
tracking information without the brackets (i.e. "ahead N, behind M").
This is needed when we port branch.c to use ref-filter's printing APIs.
Add test and documentation for the same.
Mentored-by: Christian Couder
Mentored-by: Matth
Add support for %(objectname:short=) which would print the
abbreviated unique objectname of given length. When no length is
specified, the length is 'DEFAULT_ABBREV'. The minimum length is
'MINIMUM_ABBREV'. The length may be exceeded to ensure that the provided
object name is unique.
Add tests and
Introduce symref_atom_parser() which will parse the '%(symref)' atom and
store information into the 'used_atom' structure based on the modifiers
used along with the atom.
Signed-off-by: Karthik Nayak
---
ref-filter.c | 25 +++--
1 file changed, 23 insertions(+), 2 deletions(-
Implement %(if), %(then) and %(else) atoms. Used as
%(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If the
format string between %(if) and %(then) expands to an empty string, or
to only whitespaces, then the whole %(if)...%(end) expands to the string
following %(then). Otherwise, it
Ensure that each 'atom_value' has a reference to its corresponding
'used_atom'. This let's us use values within 'used_atom' in the
'handler' function.
Hence we can get the %(align) atom's parameters directly from the
'used_atom' therefore removing the necessity of passing %(align) atom's
parameter
On Thu, Mar 24, 2016 at 11:50 PM, Junio C Hamano wrote:
> So a better alternative may be to conditionally disable the "Paths
> outside are not touched regardless of --include" logic, i.e. we
> exclude paths outside by default just as before, but if there is at
> least one explicit "--include" give
> -Ursprüngliche Nachricht-
> Von: Jeff King [mailto:p...@peff.net]
> Gesendet: Dienstag, 29. März 2016 22:14
> An: Florian Manschwetus
> Cc: Chris Packham; Konstantin Khomoutov; git@vger.kernel.org
> Betreff: Re: [PATCH] Fix http-backend reading till EOF, ignoring
> CONTENT_LENGTH, violati
Hi,
`git submodule update --init --recursive` stores `gitdir` in full path into
`.git` of nested submodules.
So, working directory is not portable to another directory.
On following example, `Carthage/Checkouts/Quick/Externals/Nimble/` is nested
submodule and `Carthage/Checkouts/Quick/Externals
On 3/29/2016 19:23, Sven Strickroth wrote:
> --- a/compat/mingw.h
> +++ b/compat/mingw.h
> @@ -415,7 +415,7 @@ int mingw_offset_1st_component(const char *path);
> extern void build_libgit_environment(void);
> extern const char *program_data_config(void);
> #define git_program_data_config pro
If the two paths 'dir/A/file' and 'dir/B/file' have identical content
and the parent directory is renamed, e.g. 'git mv dir other-dir', then
diffcore reports the following exact renames:
renamed:dir/B/file -> other-dir/A/file
renamed:dir/A/file -> other-dir/B/file
While technicall
Hi Elena,
I thought a bit more about your proposal. The Outreachy internship is scheduled
for 3 months and I think you would be able to come up with a "Git remote
whitelist/blacklist" implementation that the Git list considers to accept
within a month. In that case it would be good if you would
On Wed, Mar 30, 2016 at 9:49 AM, Johannes Schindelin
wrote:
>> > #ifndef SNPRINTF_SIZE_CORR
>> > -#if defined(WIN32) && (!defined(__GNUC__) || __GNUC__ < 4)
>> > +#if defined(WIN32) && (!defined(__GNUC__) || __GNUC__ < 4) &&
>> > (!defined(_MSC_VER) || _MSC_VER < 1900)
>> > #define SNPRINTF_SI
Hi Sven & Sebastian,
On Tue, 29 Mar 2016, Sebastian Schuberth wrote:
> On Tue, Mar 29, 2016 at 9:13 PM, Sven Strickroth wrote:
ACK on the patch.
> > diff --git a/compat/snprintf.c b/compat/snprintf.c
> > index 42ea1ac..0b11688 100644
> > --- a/compat/snprintf.c
> > +++ b/compat/snprintf.c
> >
100 matches
Mail list logo