Hi!
I've discovered that if you have two non-rewinding branches that you
merge between you can get the wrong tag as closest tag if the
COMMITTER_DATE of any of the commits after the branch split is before
the date of the branch split. You can end up in this state simply by
having a committer doing
From: Caio Marcelo de Oliveira Filho
In projects that use Signed-off-by, it's convenient to include that line
in the commit by default. The commit.signoff config option allows to add
that line in all commits automatically.
Document that this config option can be overriden by using
--no-signoff.
In projects that use Signed-off-by, it's convenient to include that line
in the commit by default. The commit.signoff config option allows to add
that line in all commits automatically.
Document that this config option can be overriden by using
--no-signoff.
Signed-off-by: Caio Marcelo de Oliveir
On 06/25, cmarc...@gmail.com wrote:
> From: Caio Marcelo de Oliveira Filho
>
> In projects that use Signed-off-by, it's convenient to include that line
> in the commit by default. The commit.signoff config option allows to add
> that line in all commits automatically.
>
> Document that this conf
Caio Marcelo de Oliveira Filho writes:
> +test_expect_success 'commit.signoff config option' '
> +git config commit.signoff true &&
> +echo "yet another content *narf*" >> foo &&
> +echo "zort" | git commit -F - foo &&
> +git cat-file commit HEAD | sed "1,/^\$/d" >
On Thu, Jun 25, 2015 at 5:46 AM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> t/t6301-for-each-ref-filter.sh | 19 +++
>
> t6301 is already used in mh/reporting-broken-refs-from-for-each-ref
> topic. Please renumber.
>
Will do :) Thanks
--
Regards,
Karthik Nayak
--
To un
On Thu, Jun 25, 2015 at 9:32 AM, Caio Marcelo de Oliveira Filho
wrote:
> In projects that use Signed-off-by, it's convenient to include that line
> in the commit by default. The commit.signoff config option allows to add
> that line in all commits automatically.
You can use a commit template.
Or
v5 of this patch series can be found here :
http://article.gmane.org/gmane.comp.version-control.git/272590
This is a continuation of my GSoC project to unify git tag -l, git
branch -l and for-each-ref. Continued from this patch series :
http://thread.gmane.org/gmane.comp.version-control.git/271563
Add 'parse_opt_merge_filter()' to parse '--merged' and '--no-merged'
options and write macros for the same.
This is copied from 'builtin/branch.c' which will eventually be removed
when we port 'branch.c' to use ref-filter APIs.
Based-on-patch-by: Jeff King
Mentored-by: Christian Couder
Mentored
Add the '--points-at' option provided by 'ref-filter'. The
option lets the user to pick only refs which point to a particular
commit.
Add documentation and tests for the same.
Based-on-patch-by: Jeff King
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
In 'branch -l' we have '--merged' option which only lists refs (branches)
merged into the named commit and '--no-merged' option which only lists
refs (branches) not merged into the named commit. Implement these two
options in ref-filter.{c,h} so that other commands can benefit from this.
Based-on-
Rename 'parse_opt_points_at()' to 'parse_opt_object_name()' and
move it from 'tag.c' to 'parse-options'. This now acts as a common
parse_opt function which accepts an objectname and stores it into
a sha1_array.
Based-on-patch-by: Jeff King
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
In 'tag -l' we have '--points-at' option which lets users
list only tags which point to a particular commit. Implement
this option in 'ref-filter.{c,h}' so that other commands can
benefit from this.
This is duplicated from tag.c, we will eventually remove that
when we port tag.c to use ref-filter
Add a test suite for testing the ref-filter APIs used
by for-each-ref. We just intialize the test suite for now.
More tests will be added in the following patches as more
options are added to for-each-ref.
Based-on-patch-by: Jeff King
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Sign
Add the '--merged' and '--no-merged' options provided by 'ref-filter'.
The '--merged' option lets the user to only list refs merged into the
named commit. The '--no-merged' option lets the user to only list refs
not merged into the named commit.
Add documentation and tests for the same.
Based-on-
Add a macro for using the '--contains' option in parse-options.h
also include an optional '--with' option macro which performs the
same action as '--contains'.
Make tag.c and branch.c use this new macro.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
'tag -l' and 'branch -l' have two different ways of finding
out if a certain ref contains a commit. Implement both these
methods in ref-filter and give the caller of ref-filter API
the option to pick which implementation to be used.
'branch -l' uses 'is_descendant_of()' from commit.c which is
left
Add the '--contains' option provided by 'ref-filter'. The '--contains'
option lists only refs which contain the mentioned commit (HEAD if no
commit is explicitly given).
Add documentation and tests for the same.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Naya
Rename parse_opt_with_commit() to parse_opt_commits() to show
that it can be used to obtain a list of commits and is not
constricted to usage of '--contains' option.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
builtin/branch.c | 4 ++--
builtin/ta
On 23/06/15 19:49, Josh Hagins wrote:
If neither git-submodule nor git-subtree is palatable to you, here are
a couple of alternatives you might try:
* https://github.com/ingydotnet/git-subrepo
* https://github.com/tdd/git-stree
You could also use Android's "repo" tool:
https://code.goog
This is part of the GSoC project to unify the commands `git tag -l`,
`git branch -l`
and `git for-each-ref`.
This is a follow up to
http://article.gmane.org/gmane.comp.version-control.git/272641 which
is still in the 6th iteration.
This ports over tag.c to use ref-filter APIs and adds --format,
-
On Wed, Jun 24, 2015 at 10:15:08AM -0700, Junio C Hamano wrote:
> > I agree that would be better. I originally just blocked all use of
> > git-repack, but at the last minute softened it to just "repack -d". I'm
> > not sure if that would actually help anyone in practice. Sure, doing
> > "git repac
Hi,
On 2015-06-25 03:01, Stefan Beller wrote:
>> * pt/pull-builtin (2015-06-18) 19 commits
>> - pull: remove redirection to git-pull.sh
>> - pull --rebase: error on no merge candidate cases
>> - pull --rebase: exit early when the working directory is dirty
>> - pull: configure --rebase via bra
That "someday" in the comment happened two years later in
b65982b (Optimize "diff-index --cached" using cache-tree - 2009-05-20)
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/blame.c | 5 -
1 file changed, 5 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c
index b3e948e..b077bb
Running 2.4.4
*** Dates do not respect LC_TIME
$ date
Thu 25 Jun 2015 13:02:48 CEST
$ git log --pretty=fuller --date=local | head -6 | grep -i date
AuthorDate: Mon Feb 16 16:47:08 2015
CommitDate: Mon Feb 16 16:47:08 2015
$ locale -ck LC_TIME | grep fmt
d_t_fmt="%a %d %b %Y %r %Z"
d_fmt="%d-%m-%Y
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.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
ref-filter.c | 20
In 'tag.c' we can print N lines from the annotation of the tag
using the '-n' 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
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
-
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
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
ref-filter.c | 2 ++
ref-filter.h | 1 +
2 files ch
Add support for %(refname:lalignX) where X is a number.
This will print a shortened refname aligned to the left
followed by spaces for a total length of X characters.
If X is less than the shortened refname size, the entire
shortened refname is printed.
Mentored-by: Christian Couder
Mentored-by:
Since 'ref-filter' only has an option to match path names.
Add an option for regular pattern matching.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
builtin/for-each-ref.c | 1 +
ref-filter.c | 30 --
ref-filter.
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
'ref-filter' to filter out tags based on the opti
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
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
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. As this is a temporary step, most of the cod
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 commit.
If no object is provided it assumes
On Wed, Jun 24, 2015 at 11:59 PM, Junio C Hamano wrote:
> Paul Tan writes:
>
>> 3. I'm over-thinking this and you just want the "struct strbufs" in the
>>struct am_state to be switched to "char*"s?
>
> Yes, everybody interacts with am_state, and these fields are
> supposed to be constant duri
On Thu, Jun 25, 2015 at 12:05 AM, Junio C Hamano wrote:
> Internal "diff-index --cached" is used for another reason you did
> not mention (and scripted Porcelains literally use that externally
> for the same reason). When we start a mergy operation, we say it is
> OK if the working tree has local
On Thu, Jun 25, 2015 at 01:19:01PM +0200, H.Merijn Brand wrote:
> *** Dates do not respect LC_TIME
Right, we use our own routines for formatting the dates, and not
strftime. And it probably should stay that way in general, as git's
output is often meant to be parsed.
That being said, I do not th
On Thu, 25 Jun 2015 08:44:45 -0400, Jeff King wrote:
> On Thu, Jun 25, 2015 at 01:19:01PM +0200, H.Merijn Brand wrote:
>
> > *** Dates do not respect LC_TIME
>
> Right, we use our own routines for formatting the dates, and not
> strftime. And it probably should stay that way in general, as git'
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
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
Duy Nguyen writes:
> I think it's clear that you need to revert that commit. I didn't see
> this at all when I made the commit.
I didn't either, and no other reviewers did. But now we know it was
not sufficient, so let's see...
>> Perhaps a good and safe way forward to resurrect what d95d728a
>
Johannes Schindelin writes:
> - I *think* that the current `recreate_opt()` is fine, but if it
> is used more, we will have to quote the arguments to guard against
> spaces and quotes and whatnot
I admit that that was the reaction I had when I saw it for the first
time, until I realized how it i
David Turner writes:
> This set of patches is a preamble to pluggable ref backends. The
> intent is to use the ref infrastructure for special refs like
> CHERRY_PICK_HEAD where possible, and to use git plumbing commands to
> access refs and reflogs instead of directly writing files to the .git
>
On Wed, Jun 24, 2015 at 11:10 PM, Johannes Schindelin
wrote:
> Hi Paul,
>
> On 2015-06-18 13:25, Paul Tan wrote:
>
>> diff --git a/builtin/am.c b/builtin/am.c
>> index e9a3687..7b97ea8 100644
>> --- a/builtin/am.c
>> +++ b/builtin/am.c
>> @@ -121,6 +121,96 @@ static void am_destroy(const struct am
This is a weird one..
When standing in a folder inside a linked working copy, the
typo-correction breaks all commands.
Repro:
~/git $ git --version
git version 2.4.4.600.g6397abd
~/git $ git init bar
Initialized empty Git repository in ~/git/bar/.git/
~/git $ cd bar
~/git/bar (master #) $ git com
In projects that use Signed-off-by, it's convenient to include that line
in the commit message by default. The commit.signoff config option
allows to add that line in all commits automatically.
Document that this config option can be overriden by using
--no-signoff.
Signed-off-by: Caio Marcelo de
Caio Marcelo de Oliveira Filho writes:
> In projects that use Signed-off-by, it's convenient to include that line
> in the commit message by default. The commit.signoff config option
Hmm, I do not recall seeing v1 but that is OK.
The following immediately comes to mind.
http://thread.gmane.org
> In both tests, you should probably use 'test_config' instead of 'git
> config [...] git config --unset', it takes care of it for you (also
> should prevent the case where the config is not unset when your test
> fails in the middle).
Posted a v2 with this improvement and the bash completion.
Tha
On Thu, Jun 25, 2015 at 5:43 AM, Christian Couder
wrote:
> You can use a commit template.
>
> Or you can use the "commit-msg" hook. For example with commands like:
>
> grep "^Signed-off-by:" "$1" ||
> echo "Signed-off-by: $(git config user.name) <$(git config user.email)>"
> >>"$1"
>
> If you hav
On 25/06, Junio C Hamano wrote:
Caio Marcelo de Oliveira Filho writes:
Hmm, I do not recall seeing v1 but that is OK.
The following immediately comes to mind.
http://thread.gmane.org/gmane.comp.version-control.git/51754/focus=51780
To be honest I'm not sure I buy that since we have `git comm
Philip Oakley writes:
> Hopefully it's not too late in the cycle for a review of this contrib/compat
> item.
Has this been discussed in the Windows land and folks are all happy
with this change? If so the only thing we would need review on the
main list is the top-level change outside compat/ a
Philip Oakley writes:
> Add the Microsoft .manifest pattern, and correct the generic 'Debug'
> and 'Release' directory patterns which were mechanically adjusted way
> back in c591d5f (gitignore: root most patterns at the top-level directory,
> 2009-10-26) to allow multi-level projects within the
On Wed, Jun 24, 2015 at 10:59 PM, Johannes Schindelin
wrote:
>> diff --git a/builtin/am.c b/builtin/am.c
>> index dbc8836..af68c51 100644
>> --- a/builtin/am.c
>> +++ b/builtin/am.c
>> @@ -6,6 +6,158 @@
>> #include "cache.h"
>> #include "builtin.h"
>> #include "exec_cmd.h"
>> +#include "parse-o
Hi,
> Hmm, I do not recall seeing v1 but that is OK.
http://thread.gmane.org/gmane.comp.version-control.git/272635
http://thread.gmane.org/gmane.comp.version-control.git/272636
> The following immediately comes to mind.
>
> http://thread.gmane.org/gmane.comp.version-control.git/51754/focus=5178
Philip Oakley writes:
> A 'make -n' dry-run is used as part of the /compat/vcbuild and
> /contrib/buildsystems code. The commit ee9be06 (perl: detect new files
> in MakeMaker builds, 2012-07-27) was not aware of that dry-run usage
> and thus would not execute the target.
>
> Add a comment to the
On 2015-06-22 18.11, Junio C Hamano wrote:
> Torsten Bögershausen writes:
>
>> eol=lf or eol=crlf are the only useful settings.
>> Everything else is ignored because it does not make sense.
>>
>> See convert.c:
>> static enum eol git_path_check_eol()
>
> That makes me wonder...
>
> The original
Hi all,
it turns out that recent versions of git (i. e. git version 2.2.0 or
later, resp. anything which includes commit 4d0d8975 "Make sure
fsck_commit_buffer() does not run out of the buffer") throws errors on
our git repository git://git.denx.de/u-boot:
-> git fsck --full
Checking object dire
Caio Marcelo de Oliveira Filho writes:
> A similar concern probably applies to format.signOff option. Would
> be sufficient to add a note about conscious act (like
> format.signOff has) to the config description?
I am generally in negative on automating this. This is not just you
but makes ever
David Turner writes:
> Add err argument to log_ref_setup that can explain the reason for a
> failure. This then eliminates the need to manage errno through this
> function since we can just add strerror(errno) to the err string when
> meaningful. No callers relied on errno from this function for
David Turner writes:
> Subject: Re: [PATCH 2/6] cherry-pick: Use refs infrastructure for
> CHERRY_PICK_HEAD
> Also use refs infrastructure for REVERT_HEAD. These refs
> need to go through the refs backend, since some code
> assumes that they can be read as refs.
cherry-pick: treat CHER
On 2015-06-25 16.50, Caio Marcelo de Oliveira Filho wrote:
> +test_expect_success 'commit.signoff config option' '
> + test_config commit.signoff true &&
> + echo "yet another content *narf*" >> foo &&
Minor nit:
The > or >> should be written without a space, like this:
>>foo
--
To unsub
David Turner writes:
> This ref needs to go through the refs backend, since some code assumes
> that it can be written and read as a ref.
And BISECT_HEAD should no longer be a ref because...?
>
> Signed-off-by: David Turner
> ---
> contrib/completion/git-completion.bash | 2 +-
> git-bisect.s
On Thu, Jun 25, 2015 at 02:56:59PM +0200, H.Merijn Brand wrote:
> > That being said, I do not think it would be wrong to have a date-mode
> > that just showed strftime("%c"), or some other arbitrary strftime
> > string. You could then set log.date as appropriate for human
> > consumption.
>
> Ye
This is more readable, and won't break if we ever change the
order of the date_mode enum.
Signed-off-by: Jeff King
---
builtin/show-branch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 323f857..d784613 100644
--- a/built
David Turner writes:
> In a moment, we will use this to add reflog creation commands to
> git-reflog.
>
> Signed-off-by: David Turner
> ---
The title is misleading, if this is merely renaming. I first
thought with this change the current callers of log_ref_setup()
would get a different/updated
In preparation for adding date modes that may carry extra
information beyond the mode itself, this patch converts the
date_mode enum into a struct.
Most of the conversion is fairly straightforward; we pass
the struct as a pointer and dereference the type field where
necessary. Locations that decla
This feeds the format directly to strftime. Besides being a
little more flexible, the main advantage is that your system
strftime may know more about your locale's preferred format
(e.g., how to spell the days of the week).
Signed-off-by: Jeff King
---
Documentation/rev-list-options.txt | 5 +++
On Thu, Jun 25, 2015 at 12:55:02PM -0400, Jeff King wrote:
> In preparation for adding date modes that may carry extra
> information beyond the mode itself, this patch converts the
> date_mode enum into a struct.
>
> Most of the conversion is fairly straightforward; we pass
> the struct as a point
David Turner writes:
> These are necessary because ref backends manage reflogs.
Because?
Because with core.logAllRefUpdates set to false, creating or
updating a ref would not log what is done to it, unless a
reflog already exists for the ref. There are cases where
On Thu, Jun 25, 2015 at 06:03:28PM +0100, John Keeping wrote:
> > Ideally we could say:
> >
> > show_date(t, tz, &{ DATE_NORMAL });
> >
> > but of course C does not allow that.
>
> Yes it does, e.g. in 6.5.2.5 of C11, example 3 shows:
Well, yes. But we generally restrict ourselves to C89 her
Wolfgang Denk writes:
> Apparently for some reason the tags LABEL_2006_03_12_0025,
> LABEL_2006_04_18_1106, and LABEL_2006_05_19_1133 are missing newlines,
> which was undetected so far, but now is raised as an error.
>
> Question is: how can we fix that?
>
> Is there a tool to "auto-repair" suc
Wolfgang Denk writes:
> it turns out that recent versions of git (i. e. git version 2.2.0 or
> later, resp. anything which includes commit 4d0d8975 "Make sure
> fsck_commit_buffer() does not run out of the buffer") throws errors on
> our git repository git://git.denx.de/u-boot:
>
> -> git fsck -
Hi Junio,
On 2015-06-25 15:14, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
>> - I *think* that the current `recreate_opt()` is fine, but if it
>> is used more, we will have to quote the arguments to guard against
>> spaces and quotes and whatnot
>
> I admit that that was the reaction
Junio C Hamano writes:
> Now, going back to 4/6, I think create_reflog() function as an
> external API has a few problems.
>
> * Its name does not tell us what should happen when a reflog
>already exists for the refname the caller asked to "create"
>reflog for. I understand that this on
This version takes into account Junio's remark on the previous series,
and I did a much more thourough review of the whole, which led to a
few fixes (one forgotten strcmp(..., "bad") in addition to the other
noted by Junio), some style fixes, and some simplifications (the file
TERMS_DEFINED of PATC
From: Antoine Delaite
We create a file BISECT_TERMS in the repository .git to be read during a
bisection. The fonctions to be changed if we add new terms are quite
few.
In git-bisect.sh :
check_and_set_terms
bisect_voc
Co-authored-by: Louis Stuber
Tweaked-by: Matthieu Moy
Signe
From: Antoine Delaite
Signed-off-by: Antoine Delaite
Signed-off-by: Matthieu Moy
---
bisect.c| 2 +-
t/t6030-bisect-porcelain.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bisect.c b/bisect.c
index 03d5cd9..5b8357d 100644
--- a/bisect.c
+++ b/bis
From: Antoine Delaite
When not looking for a regression during a bisect but for a fix or a
change in another given property, it can be confusing to use 'good'
and 'bad'.
This patch introduce `git bisect new` and `git bisect old` as an
alternative to 'bad' and good': the commits which have a cert
From: Antoine Delaite
To add new tags like old/new and have keywords less confusing, the
first step is to avoid hardcoding the keywords.
The default mode is still bad/good.
Signed-off-by: Antoine Delaite
Signed-off-by: Louis Stuber
Signed-off-by: Valentin Duperray
Signed-off-by: Franck Jonas
From: Antoine Delaite
Introduction of the git bisect terms command. The user can set his own
terms. It will work exactly like before. The terms must be set before the
start.
Signed-off-by: Antoine Delaite
Signed-off-by: Louis Stuber
Signed-off-by: Matthieu Moy
---
Documentation/git-bisect.tx
Junio C Hamano writes:
> [commit]
> signoff = "I certify that all my work is licenseable under DCO"
I like this one.
The paranoid version would be
signoff = "I certify that all my work in /home/my/projects/foo are ..."
to avoid mistakenly have the config option applied to the wrong re
From: "Junio C Hamano"
Philip Oakley writes:
Hopefully it's not too late in the cycle for a review of this
contrib/compat
item.
Has this been discussed in the Windows land and folks are all happy
with this change? If so the only thing we would need review on the
main list is the top-level
From: "Junio C Hamano"
Philip Oakley writes:
Add the Microsoft .manifest pattern, and correct the generic 'Debug'
and 'Release' directory patterns which were mechanically adjusted way
back in c591d5f (gitignore: root most patterns at the top-level
directory,
2009-10-26) to allow multi-level
From: "Junio C Hamano"
Philip Oakley writes:
A 'make -n' dry-run is used as part of the /compat/vcbuild and
/contrib/buildsystems code. The commit ee9be06 (perl: detect new
files
in MakeMaker builds, 2012-07-27) was not aware of that dry-run usage
and thus would not execute the target.
Add
Dear Junio,
thanks for the fast replies.
In message you wrote:
>
> > Question is: how can we fix that?
>
> It could be that 4d0d8975 is buggy and barking at a non breakage.
>
> If there is no message in the tag, i.e.
>
> -- 8< --
> object 84ef51a632063e8cb57b2e9a4252497512831ffe
>
The latest maintenance release Git v2.4.5 is now available at
the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.4.5'
tag and the 'maint' branch that the tag points at:
url = https://kernel
An early preview release Git v2.5.0-rc0 is now available for
testing at the usual places. It is comprised of 492 non-merge
commits since v2.4.0, contributed by 54 people, 17 of which are
new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following
"Philip Oakley" writes:
> From: "Junio C Hamano"
>>
>> I am not sure what this patch is trying to achieve.
>
> It was probably a bit of 'don't mess with working code', given that
> I'd used the NO_PERL solution, rather 'document the issue'
Then this part applies, I think.
>> If you are not
"Philip Oakley" writes:
>> Debug/
>> Release/
>>
>> suffice?
>>
> Probably. I was thinking of the 'at any level' aspect...
Yeah, that is exactly the difference between rooted "/Debug/" and
"Debug/" ;-).
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
Wolfgang Denk writes:
> Dear Junio,
>
> thanks for the fast replies.
>
> In message you wrote:
>>
>> > Question is: how can we fix that?
>>
>> It could be that 4d0d8975 is buggy and barking at a non breakage.
>>
>> If there is no message in the tag, i.e.
>>
>> -- 8< --
>> object 84ef
On Thu, 2015-06-25 at 09:52 -0700, Junio C Hamano wrote:
> David Turner writes:
>
> > This ref needs to go through the refs backend, since some code assumes
> > that it can be written and read as a ref.
>
> And BISECT_HEAD should no longer be a ref because...?
I can't remember now why I did thi
On Thu, 2015-06-25 at 11:35 -0700, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > Now, going back to 4/6, I think create_reflog() function as an
> > external API has a few problems.
> >
> > * Its name does not tell us what should happen when a reflog
> >already exists for the refname t
This ref needs to go through the refs backend, since some code assumes
that it can be written and read as a ref.
Signed-off-by: David Turner
---
contrib/completion/git-completion.bash | 2 +-
git-bisect.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff
Add an err argument to log_ref_setup that can explain the reason
for a failure. This then eliminates the need to manage errno through
this function since we can just add strerror(errno) to the err string
when meaningful. No callers relied on errno from this function for
anything else than the error
Make log_ref_setup private, and add public safe_create_reflog which
calls log_ref_setup.
In a moment, we will use safe_create_reflog to add reflog creation
commands to git-reflog.
Signed-off-by: David Turner
---
builtin/checkout.c | 4 +---
refs.c | 11 +++
refs.h
Instead of directly writing to and reading from files in
$GIT_DIR, use ref API to interact with CHERRY_PICK_HEAD
and REVERT_HEAD.
Signed-off-by: David Turner
---
branch.c | 4 ++--
builtin/commit.c | 6 +++---
builtin/merge.c | 2 +-
co
This is in support of alternate ref backends which don't necessarily
store reflogs as files.
Signed-off-by: David Turner
---
git-stash.sh | 4 ++--
refs.c | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index 8e9e2cd..27155bc 100755
--- a/g
These are necessary because ref backends manage reflogs. In a moment,
we will use these functions to make git stash work with alternate
ref backends.
Signed-off-by: David Turner
---
builtin/reflog.c | 79 +++-
1 file changed, 78 insertions(+),
Wolfgang Denk writes:
> Hm... it seems I cannot even easily delte these tags:
>
> -> git tag -d LABEL_2006_03_12_0025
> Deleted tag 'LABEL_2006_03_12_0025' (was eb394f5)
> -> git fsck --full
> Checking object directories: 100% (256/256), done.
> Checking object directories: 100% (256/256), done.
David Turner writes:
> This ref needs to go through the refs backend, since some code assumes
> that it can be written and read as a ref.
And the reason why BISECT_HEAD cannot be treated as a ref, but must
be treated as a file under $GIT_DIR, is...?
>
> Signed-off-by: David Turner
> ---
> con
David Turner writes:
> Make log_ref_setup private, and add public safe_create_reflog which
> calls log_ref_setup.
>
> In a moment, we will use safe_create_reflog to add reflog creation
> commands to git-reflog.
>
> Signed-off-by: David Turner
> ---
> builtin/checkout.c | 4 +---
> refs.c
1 - 100 of 129 matches
Mail list logo
