On 02/26/2014 11:52 AM, Jeff King wrote:
> On Wed, Feb 26, 2014 at 09:04:30AM +0100, Michael Haggerty wrote:
>
>> It would be nice to support more flexibility in the todo-list commands
>> by allowing the commands to take options. Maybe
>>
>> * Convert a commit into a merge commit:
>>
>> pic
On 02/26/2014 08:48 PM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> See my branch on GitHub [1] or read the appended text below.
>
> Very nice.
>
>> ## Introduction
>>
>> It is strongly recommended that students who want to apply to the Git
>> project for the Summer of Code 2014 shoul
On 27/02/14 04:54, Robert Dailey wrote:
> On Wed, Feb 26, 2014 at 3:26 AM, Jeff King wrote:
>> On Mon, Feb 24, 2014 at 01:34:34PM -0600, Robert Dailey wrote:
>>
>>> So I set GIT_PAGER to 'echo custom pager' as you instructed, and I
>>> noticed that wasn't being printed when I ran my git log alias.
Before cdab485 (upload-pack: delegate rev walking in shallow fetch to
pack-objects - 2013-08-16) upload-pack does not write to the source
repository. cdab485 starts to write $GIT_DIR/shallow_XX if it's a
shallow fetch, so the source repo must be writable.
Fall back to $TMPDIR if $GIT_DIR/shall
On Wed, Feb 26, 2014 at 6:19 PM, Duy Nguyen wrote:
> On Thu, Feb 27, 2014 at 3:06 AM, Eric Sunshine
> wrote:
>>> + len = strlen(path);
>>> + if (!len || is_dir_sep(path[len - 1]))
>>> + die(_("'--to' argument '%s' cannot end with a slash"),
>>> path);
>>
>> What is the
On Wed, Feb 26, 2014 at 09:54:39AM -0600, Robert Dailey wrote:
> > That _should_ turn on the pager, but I think it does not due to a bug
> > with setup_pager and aliases. Something like the patch below would make
> > it work (but if you are having to use "-p" manually, there is something
> > to fi
From: Scott J. Goldman
In commit ee27ca4, we started restricting remote git-archive
invocations to only accessing reachable commits. This
matches what upload-pack allows, but does restrict some
useful cases (e.g., HEAD:foo). We loosened this in 0f544ee,
which allows `foo:bar` as long as `foo` is
On Thu, Feb 27, 2014 at 6:58 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> Note that logs/refs/.tmp-renamed-log is used to prepare new reflog
>> entry and it's supposed to be on the same filesystem as the target
>> reflog file. This is not guaranteed true for logs/HEAD when it's
On Thu, Feb 27, 2014 at 7:22 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> Signed-off-by: Nguyễn Thái Ngọc Duy
>> ---
>
> It is a good thing to do to read config from the real repository we
> are borrowing from when we have .git/commondir, but it makes me
> wonder if we should s
Thomas Rast writes:
> diff --git a/log-tree.c b/log-tree.c
> index 30b3063..9b831e9 100644
> --- a/log-tree.c
> +++ b/log-tree.c
> @@ -11,6 +11,8 @@
> #include "gpg-interface.h"
> #include "sequencer.h"
> #include "line-log.h"
> +#include "cache-tree.h"
> +#include "merge-recursive.h"
>
> s
Nguyễn Thái Ngọc Duy writes:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
It is a good thing to do to read config from the real repository we
are borrowing from when we have .git/commondir, but it makes me
wonder if we should signal some kind of error if we find .git/config
in such a borrowing
Junio C Hamano writes:
> David Kastrup writes:
>
>> All that verbosity...
>>
>> $ git stash pop
>> Auto-merging foo.txt
>> CONFLICT (content): Merge conflict in foo.txt
>> Cowardly refusing to drop stash
>> $
>
> Actually, modulo "Cowardly", that may be the most harmless phrasing,
> as apply_sta
Nguyễn Thái Ngọc Duy writes:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
Nice.
--
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
Nguyễn Thái Ngọc Duy writes:
> If the file "$GIT_DIR/commondir" exists, it contains the value of
> $GIT_COMMON_DIR.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> Documentation/gitrepository-layout.txt | 4
> setup.c| 38
> ---
On Wed, Feb 26, 2014 at 3:57 PM, Matthieu Moy
wrote:
> If you were to design "git reset"'s interface from scratch, your
> proposal would make sense. But we're talking about a change, and you
> can't expect that users never use the current behavior. At the very
> least, there should be a warning te
Nguyễn Thái Ngọc Duy writes:
> If $GIT_COMMON_DIR is set, $GIT_OBJECT_DIRECTORY should be
> $GIT_COMMON_DIR/objects, not $GIT_DIR/objects. Just let rev-parse
> --git-path handle it.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> git-sh-setup.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 dele
Nguyễn Thái Ngọc Duy writes:
> Note that logs/refs/.tmp-renamed-log is used to prepare new reflog
> entry and it's supposed to be on the same filesystem as the target
> reflog file. This is not guaranteed true for logs/HEAD when it's
> mapped to repos/xx/logs/HEAD because the user can put "repos
On Wed, Feb 26, 2014 at 3:48 PM, Jonathan Nieder wrote:
> I really don't like the idea of making "git reset" modal, though. I'd
> rather that reset --mixed print some advice about how to recover from
> the mistake, which would also have the advantage of allowing scripts
> that for whatever reason
On Thu, Feb 27, 2014 at 3:06 AM, Eric Sunshine wrote:
>> + len = strlen(path);
>> + if (!len || is_dir_sep(path[len - 1]))
>> + die(_("'--to' argument '%s' cannot end with a slash"), path);
>
> What is the purpose of this restriction?
Laziness on my part :) Because the f
On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder wrote:
> Seems reasonable, but I worry about the command growing too noisy.
>
> Could this be guarded by an advice. setting? (See advice.*
> in git-config(1) for what I mean.)
Ah, good idea. This seems to belong to advice.resolveConflict. I'll
add
On Wed, Feb 26, 2014 at 3:37 PM, Junio C Hamano wrote:
> I see that you are trying to match the phrasing used in the other
> side of this if/else (which is outside the context of the posted
> patch). Over there we say "... to conclude merge" while the new
> text says "... to conclude THE merge".
David Kastrup writes:
> All that verbosity...
>
> $ git stash pop
> Auto-merging foo.txt
> CONFLICT (content): Merge conflict in foo.txt
> Cowardly refusing to drop stash.
> $
Actually, modulo "Cowardly", that may be the most harmless phrasing,
as apply_stash may try to signal an error for reaso
Hello,
Last week I ran across a potential bug with branch names on case
insensitive file systems, the complete scenario can be found here:
https://groups.google.com/forum/#!topic/msysgit/ugKL-sVMiqI
The tldr is because refs are stored as plain text files except when
packed into packed-refs, Git
Andrew Wong writes:
> On Wed, Feb 26, 2014 at 1:21 PM, Matthieu Moy
> wrote:
>> But this breaks backward compatibility.
>>
>> I sometimes run "git reset" during a merge to only reset the index and
>> then examine the changes introduced by the merge. With your changes,
>> someone doing so would a
Matthieu Moy writes:
> Andrew Wong writes:
>
>> If the user wants to do "git reset" during a merge, the user most likely
>> wants to do a "git reset --merge". This is especially true during a
>> merge conflict and the user had local changes, because "git reset" would
>> leave the merged changes
Andrew Wong wrote:
> Yeah, this breaks compatibility, but like I said, during a merge, I don't
> see a good reason to do "git reset --mixed", and not "git reset --merge".
Yeah, in principle if it had a different behavior, then plain "git
reset" could be useful during a merge, but as is, I tend to
Andrew Wong wrote:
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
> fclose(fp);
> rerere(allow_rerere_auto);
> printf(_("Automatic merge failed; "
> - "fix conflicts and then commit the res
Andrew Wong writes:
> Signed-off-by: Andrew Wong
> ---
> wt-status.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/wt-status.c b/wt-status.c
> index 4e55810..6e1ad7d 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -899,7 +899,7 @@ static void show_merge_in_progres
Hi,
Andrew Wong wrote:
> [Subject: wt-status: Make conflict hint message more consistent with other
> hints]
Thanks for working on this.
Could you include a little more detail? What other hints is this
making the message more consistent with?
Ideally the commit message would include a quick
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> I'd however have to say that even "please resolve the conflicts
>> manually" is over-assuming.
>
> I understand your point, but in a short hint message, I still find it
> reasonable. Fixing conflicts is the natural way to go after a "stash
> pop
On Wed, Feb 26, 2014 at 11:13 AM, Leo R. Lundgren wrote:
> I'm installing git 1.9.0 from source, on a freshly installed SLES 11 SP3. The
> git binaries work fine to compile and install, but `make doc` fails on some
> XML parsing errors.
>
> The system is fully updated with the latest stable pack
Jeff King writes:
> On Mon, Feb 24, 2014 at 11:10:49AM -0800, Junio C Hamano wrote:
>
>> > The best name I could come up with is "--pack-keep-objects", since that
>> > is literally what it is doing. I'm not wild about the name because it is
>> > easy to read "keep" as a verb (and "pack" as a noun
Hi,
Andrew Wong wrote:
> The first two patches are just about rewording a message, and adding messages
> to tell users to use "git merge --abort" to abort a merge.
Sounds like a good idea. I look forward to reading the patches.
> We could stop here and hope that the users would read the messag
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> I'd however have to say that even "please resolve the conflicts
>> manually" is over-assuming.
>
> I understand your point, but in a short hint message, I still find it
> reasonable. Fixing conflicts is the natural way to go after a "stash
> pop
On Wed, Feb 26, 2014 at 1:21 PM, Matthieu Moy
wrote:
> But this breaks backward compatibility.
>
> I sometimes run "git reset" during a merge to only reset the index and
> then examine the changes introduced by the merge. With your changes,
> someone doing so would abort the merge and discard the
Junio C Hamano writes:
> I'd however have to say that even "please resolve the conflicts
> manually" is over-assuming.
I understand your point, but in a short hint message, I still find it
reasonable. Fixing conflicts is the natural way to go after a "stash
pop", and the user who do not want to
On Tue, Feb 18, 2014 at 8:40 AM, Nguyễn Thái Ngọc Duy wrote:
> "git checkout --to" sets up a new working directory with a .git file
> pointing to $GIT_DIR/repos/. It then executes "git checkout" again
> on the new worktree with the same arguments except "--to" is taken
> out. The second checkout e
Jacopo Notarstefano writes:
> Does this make sense? Did I overlook some details?
How does this solve the labels shown in "git bisect visualize"?
--
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:/
Jeff King writes:
> On Wed, Feb 26, 2014 at 09:04:30AM +0100, Michael Haggerty wrote:
>
>> It would be nice to support more flexibility in the todo-list commands
>> by allowing the commands to take options. Maybe
>>
>> * Convert a commit into a merge commit:
>>
>> pick -p c0ffeee -p e1ee
Michael Haggerty writes:
> See my branch on GitHub [1] or read the appended text below.
Very nice.
> ## Introduction
>
> It is strongly recommended that students who want to apply to the Git
> project for the Summer of Code 2014 should submit a small code-related
> patch to the Git project as p
On Wed, Feb 26, 2014 at 5:55 AM, Duy Nguyen wrote:
> On Wed, Feb 26, 2014 at 8:24 AM, Eric Sunshine
> wrote:
>>> +'GIT_COMMON_DIR'::
>>> + If this variable is set to a path, non-worktree files that are
>>> + normally in $GIT_DIR will be taken from this path
>>> + instead. Workt
From: "Robert Dailey"
Oddly I'm not able to find any instructions on how to build Git for
Windows. I've done a clone of the repository here:
https://github.com/msysgit/git
I did attempt to try doing it myself. I installed 'make' and mingw-gcc
in Cygwin and attempted 'make' from the git directo
Matthieu Moy writes:
> Omar Othman writes:
>
>> Though I don't know why you think this is important:
>>> Now, the real question is: when would Git stop showing this advice. I
>>> don't see a real way to answer this, and I'd rather avoid doing just a
>>> guess.
>> If it is really annoying for the
Thank you for your remarks. I'll try to fix my patch and send it again.
--
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
Refactor binary search in "commit_graft_pos" function: use
generic "sha1_pos" function.
Signed-off-by: Dmitry S. Dolzhenko
---
commit.c | 24 +---
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/commit.c b/commit.c
index 6bf4fe0..6ceee6a 100644
--- a/commit.c
+
Oddly I'm not able to find any instructions on how to build Git for
Windows. I've done a clone of the repository here:
https://github.com/msysgit/git
I did attempt to try doing it myself. I installed 'make' and mingw-gcc
in Cygwin and attempted 'make' from the git directory but it fails
immediate
Andrew Wong writes:
> If the user wants to do "git reset" during a merge, the user most likely
> wants to do a "git reset --merge". This is especially true during a
> merge conflict and the user had local changes, because "git reset" would
> leave the merged changes mixed in with the local change
Users may not be aware that they need to use "git merge --abort" or "git reset
--merge" to properly abort a merge conflict. They are likely to just use "git
reset", because that "usually" cleans up the repo. But in the case where the
user had local changes, "git reset" would leave the repo in a mes
Signed-off-by: Andrew Wong
---
wt-status.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wt-status.c b/wt-status.c
index 4e55810..6e1ad7d 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -899,7 +899,7 @@ static void show_merge_in_progress(struct wt_status *s,
st
If the user wants to do "git reset" during a merge, the user most likely
wants to do a "git reset --merge". This is especially true during a
merge conflict and the user had local changes, because "git reset" would
leave the merged changes mixed in with the local changes. This makes
"git reset" a li
Signed-off-by: Andrew Wong
---
builtin/merge.c | 3 ++-
wt-status.c | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index e576a7f..07af427 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -909,7 +909,8 @@ static int suggest_conflic
On Wed, Feb 26, 2014 at 11:12 AM, Philip Oakley wrote:
> From: "Duy Nguyen"
>> On Wed, Feb 26, 2014 at 8:24 AM, Eric Sunshine
>> wrote:
+'GIT_COMMON_DIR'::
+ If this variable is set to a path, non-worktree files that are
+ normally in $GIT_DIR will be taken from t
On 2014-02-25 16.41, Jeff King wrote:
> I'm pleased to announce that Git has been accepted to this year's Google
> Summer of Code.
I'm not sure if this is the right way to propose mini projects,
but in case the answer is not no, may I suggest one:
Motivation, the problem:
Since commit c28facd216b5
On Wed, Feb 26, 2014 at 3:30 AM, Jeff King wrote:
> On Wed, Feb 26, 2014 at 12:24:13PM +0100, Vicent Martí wrote:
>
>> > One thing I noticed after tg/index-v4-format is both libgit2 and jgit
>> > do not seem to support index v4. So we could add "index v4 support on
>> > libgit2" to the idea page.
Hi,
I am Faiz Kothari, I am a GSoC aspirant and want to contribute to git.
I am submitting the patch in reponse to Microproject 1,
rewrite git-compat-util.h:skip_prefix() as a loop.
Signed-off-by: Faiz Kothari
---
git-compat-util.h | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
di
Copying the patch from the email text results in corrupted patch,
something isn't quite right with it so it won't let me apply it.
Can you attach it as an actual file so I can try again? Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...
Hi,
I'm installing git 1.9.0 from source, on a freshly installed SLES 11 SP3. The
git binaries work fine to compile and install, but `make doc` fails on some XML
parsing errors.
The system is fully updated with the latest stable packages in the SLES 11 SP3
distribution. What I've done is:
- E
From: "Duy Nguyen"
On Wed, Feb 26, 2014 at 8:24 AM, Eric Sunshine
wrote:
+'GIT_COMMON_DIR'::
+ If this variable is set to a path, non-worktree files that
are
+ normally in $GIT_DIR will be taken from this path
+ instead. Worktree-specific files such as HEAD or index are
+
On Wed, Feb 26, 2014 at 3:26 AM, Jeff King wrote:
> On Mon, Feb 24, 2014 at 01:34:34PM -0600, Robert Dailey wrote:
>
>> So I set GIT_PAGER to 'echo custom pager' as you instructed, and I
>> noticed that wasn't being printed when I ran my git log alias. So what
>> I did after that was set GIT_TRACE
On Tue, Feb 25, 2014 at 11:12:10AM -0800, Junio C Hamano wrote:
> So, I tend to agree with you, while I do understand where "I want to
> know about what is in stash" is coming from (and that is why we do
> have "git stash list" command).
One thing that would be nice is if there was built-in "git s
On Wed, Feb 26, 2014 at 6:52 PM, Jeff King wrote:
> I'd worry a little that it is not a summer's worth of work, but I
> suspect there are other parts of rebase--interactive that could use
> attention once the student is familiar with the code.
It might be worthwhile to check for prior projects th
This allows skipping interactively editting the p4 changelist before
submit. This is useful for pushing series of patches to p4 quickly.
This was already possible through a config option.
Signed-off-by: Crestez Dan Leonard
---
Documentation/git-p4.txt | 4
git-p4.py| 11 +
On Wed, Feb 26, 2014 at 12:14:11PM +0100, Michael Haggerty wrote:
> > [1] The one feature I would like in this vein is that editing the title
> > in the instruction-sheet would modify the commit message of the
> > relevant commit. For some reason I try to do this every few weeks,
> > b
On Wed, Feb 26, 2014 at 6:08 PM, Jeff King wrote:
> But before thinking about that, I'd want to know why
> glibc behaves as it does.
Pure guess. It may be because it targets more than software version.
In strverscmp man page, the example is "jan1, jan10, jan2...".
versionsort() in glibc might be
On Wed, Feb 26, 2014 at 12:24:13PM +0100, Vicent Martí wrote:
> > One thing I noticed after tg/index-v4-format is both libgit2 and jgit
> > do not seem to support index v4. So we could add "index v4 support on
> > libgit2" to the idea page. It's a relatively small task though once
> > you get a ha
On Wed, Feb 26, 2014 at 12:25:36PM +0100, Vicent Martí wrote:
> On Wed, Feb 26, 2014 at 11:41 AM, Michael Haggerty
> wrote:
> > Since time is short, I already started on this. I wrote a first draft
> > of an introduction for the students. I also started looking for
> > microprojects. I starte
On Wed, Feb 26, 2014 at 11:41 AM, Michael Haggerty wrote:
> Since time is short, I already started on this. I wrote a first draft
> of an introduction for the students. I also started looking for
> microprojects. I started going through our source files alphabetically,
> and have already found
On Wed, Feb 26, 2014 at 12:16 PM, Duy Nguyen wrote:
> On Tue, Feb 25, 2014 at 10:41 PM, Jeff King wrote:
>> I'm pleased to announce that Git has been accepted to this year's Google
>> Summer of Code.
>>
>> Student proposals will start coming in on March 22. In the meantime
>> students will be rea
On Wed, Feb 26, 2014 at 06:11:54PM +0700, Duy Nguyen wrote:
> On Wed, Feb 26, 2014 at 6:08 PM, Jeff King wrote:
> > I'd worry slightly, though, that there are other schemes where that
> > behaves poorly. Should we optimize for git's version numbering, or for
> > what most other projects want? The
On Tue, Feb 25, 2014 at 10:41 PM, Jeff King wrote:
> I'm pleased to announce that Git has been accepted to this year's Google
> Summer of Code.
>
> Student proposals will start coming in on March 22. In the meantime
> students will be reading our Ideas page[1] and enquiring about the
> program on
On 02/26/2014 11:52 AM, Jeff King wrote:
> On Wed, Feb 26, 2014 at 09:04:30AM +0100, Michael Haggerty wrote:
>
>> It would be nice to support more flexibility in the todo-list commands
>> by allowing the commands to take options. Maybe
>>
>> * Convert a commit into a merge commit:
>>
>> pic
On Wed, Feb 26, 2014 at 6:08 PM, Jeff King wrote:
> I'd worry slightly, though, that there are other schemes where that
> behaves poorly. Should we optimize for git's version numbering, or for
> what most other projects want? There could even be room for two types of
> version-compare. But before
On Wed, Feb 26, 2014 at 06:03:40PM +0700, Duy Nguyen wrote:
> > Cool. I think doing this makes the most sense, as we do not have to
> > worry about build-time config (and I do not see any particular reason
> > why we would want to use the system strverscmp on glibc systems).
>
> Another reason I
On Wed, Feb 26, 2014 at 11:41:21AM +0100, Michael Haggerty wrote:
> > Yes, though I think it makes sense to put them on a separate page. We
> > should probably write up some notes for students, too: how to get in
> > touch with us, what do we expect of them in the pre-proposal period,
> > what wou
On Wed, Feb 26, 2014 at 4:05 PM, Jeff King wrote:
> On Tue, Feb 25, 2014 at 07:22:15PM +0700, Nguyễn Thái Ngọc Duy wrote:
>
>> versioncmp() is copied from string/strverscmp.c in glibc commit
>> ee9247c38a8def24a59eb5cfb7196a98bef8cfdc, reformatted to Git coding
>> style. The implementation is unde
On Wed, Feb 26, 2014 at 8:24 AM, Eric Sunshine wrote:
>> +'GIT_COMMON_DIR'::
>> + If this variable is set to a path, non-worktree files that are
>> + normally in $GIT_DIR will be taken from this path
>> + instead. Worktree-specific files such as HEAD or index are
>> + taken
On Wed, Feb 26, 2014 at 5:07 PM, Dmitry S. Dolzhenko
wrote:
> Refactor binary search in "commit_graft_pos" function: use
> generic "sha1_pos" function.
For fun, try to break your changes deliberately then run "make test"
and see if the failed tests can lead you back to this function. I hear
some
On Wed, Feb 26, 2014 at 09:04:30AM +0100, Michael Haggerty wrote:
> It would be nice to support more flexibility in the todo-list commands
> by allowing the commands to take options. Maybe
>
> * Convert a commit into a merge commit:
>
> pick -p c0ffeee -p e1ee712 deadbab The oneline of th
li...@haller-berlin.de (Stefan Haller) writes:
> Your intention was clearly to drop the stash, it just wasn't dropped
> because of the conflict. Dropping it automatically once the conflict
> is resolved would be nice.
Your intention when you ran "git stash pop", yes. Your intention when
you ran "
On Wed, Feb 26, 2014 at 02:07:47PM +0400, Dmitry S. Dolzhenko wrote:
> Refactor binary search in "commit_graft_pos" function: use
> generic "sha1_pos" function.
Sounds sensible.
A few administrative points for your patch:
- we usually try to send patches inline, rather than as attachments.
On 02/26/2014 11:23 AM, Jeff King wrote:
> On Tue, Feb 25, 2014 at 06:15:28PM +0100, Michael Haggerty wrote:
>> Requiring students to submit a reasonable patch and follow up on review
>> comments seems like it would be a good way to filter out non-serious
>> students. (I hesitate to require that t
Junio C Hamano wrote:
> Stephen Leake writes:
>
> >> Dropping the stash on a "git add" operation would be really, really
> >> weird...
> >
> > Why? That is when the merge conflicts are resolved, which is what
> > logically indicates that the stash is no longer needed,...
>
> Not necessarily.
On Tue, Feb 25, 2014 at 06:15:28PM +0100, Michael Haggerty wrote:
> > We didn't discuss earlier whether we would have any specific
> > requirements for students during the proposal period (e.g., having a
> > patch accepted). It would be good to put together rules (or barring any
> > specific requi
On Mon, Feb 24, 2014 at 11:10:49AM -0800, Junio C Hamano wrote:
> > The best name I could come up with is "--pack-keep-objects", since that
> > is literally what it is doing. I'm not wild about the name because it is
> > easy to read "keep" as a verb (and "pack" as a noun). I think it's OK,
> > bu
Refactor binary search in "commit_graft_pos" function: use
generic "sha1_pos" function.
Signed-off-by: Dmitry S. Dolzhenko
---
commit.c | 24 +---
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/commit.c b/commit.c
index 6bf4fe0..8edaeb7 100644
--- a/commit.c
+
On Mon, Feb 24, 2014 at 01:34:34PM -0600, Robert Dailey wrote:
> So I set GIT_PAGER to 'echo custom pager' as you instructed, and I
> noticed that wasn't being printed when I ran my git log alias. So what
> I did after that was set GIT_TRACE=1 and here is the output I see
> before my logs start pr
On Tue, Feb 25, 2014 at 07:22:15PM +0700, Nguyễn Thái Ngọc Duy wrote:
> versioncmp() is copied from string/strverscmp.c in glibc commit
> ee9247c38a8def24a59eb5cfb7196a98bef8cfdc, reformatted to Git coding
> style. The implementation is under LGPL-2.1 and according to [1] I can
> relicense it to G
Hey everyone,
my name is Jacopo, a student developer from Italy, and I'm interested
in applying to this years' Google Summer of Code. I set my eyes on the
project called "git-bisect improvements", in particular the subtask
about swapping the "good" and "bad" labels when looking for a
bug-fixing re
Omar Othman writes:
> Though I don't know why you think this is important:
>> Now, the real question is: when would Git stop showing this advice. I
>> don't see a real way to answer this, and I'd rather avoid doing just a
>> guess.
> If it is really annoying for the user, we can just have a
> con
I just submitted the idea below as a pull request [1] to the GSoC ideas
page, but I'd like to get some mailing list feedback first that the idea
is sensible...
And, is there anybody else willing to volunteer as a mentor for this
project? (There should be at least two.)
Michael
[1] https://githu
90 matches
Mail list logo
