From: Steven Grimm <koreth@midwinter.com>
To: Junio C Hamano <junkio@cox.net>
Cc: Jakub Narebski <jnareb@gmail.com>, git@vger.kernel.org
Subject: Re: GIT vs Other: Need argument
Date: Fri, 20 Apr 2007 09:42:22 -0700 [thread overview]
Message-ID: <4628ED6E.6060101@midwinter.com> (raw)
In-Reply-To: <7vzm531ly3.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
> How do you propose to detect that? We do not record the
> conflicted semi-merged state we leave the user to sort out
> anywhere else, and I do not think we would want to stash away a
> hidden duplicates of all unmerged files somewhere only for this
> application. That feels too wasteful and messy. You also need
> to worry about how to garbage collect such copies if you go that
> route.
>
We wouldn't need to store duplicates. Just the SHA1s of the semi-merged
files would suffice. Actually, just the modification times would
probably suffice, but the hashes are cheap to compute and slightly more
robust. We could put those in a single file (the same place we'd record
the fact that the user is in the middle of a conflicted pull) which is
removed by --continue or --abort.
Alternately, we could rerun the merge that produced the semi-merged
files in the first place; presumably it will produce exactly the same
results it did the first time and we can compare that against the
working copy. But I like storing the hashes better since it's cheaper
and less convoluted.
> By the way, I've been wondering if giving "git add" an ability
> to do "git commit -a" without actual committing.
>
> $ edit edit edit
> $ git add -u
>
> would run "git add" for all modified (and deleted) files.
>
I'm not sure I'd ever use this, personally. Pretty much the only time I
find the "add everything" functionality useful is when I'm about to
commit, and commit -a covers that case fine. But other people might find
it helpful.
-Steve
next prev parent reply other threads:[~2007-04-20 16:42 UTC|newest]
Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-17 9:02 GIT vs Other: Need argument Pietro Mascagni
2007-04-17 9:13 ` Matthieu Moy
2007-04-17 10:26 ` Andy Parkins
2007-04-17 14:32 ` Alex Riesen
2007-04-17 10:37 ` Martin Langhoff
2007-04-17 15:28 ` Linus Torvalds
2007-04-17 17:07 ` Matthieu Moy
2007-04-17 10:33 ` Martin Langhoff
2007-04-17 14:39 ` Alex Riesen
2007-04-25 8:58 ` Dana How
2007-04-25 10:35 ` Alex Riesen
2007-04-17 10:45 ` Tomash Brechko
2007-04-17 15:41 ` Guilhem Bonnefille
2007-04-17 17:18 ` Andy Parkins
2007-04-17 17:30 ` Shawn O. Pearce
2007-04-17 19:36 ` Marcin Kasperski
2007-04-18 10:05 ` Johannes Schindelin
2007-04-18 16:07 ` Linus Torvalds
2007-04-18 16:31 ` Nicolas Pitre
2007-04-18 16:49 ` Bill Lear
2007-04-18 17:43 ` Matthieu Moy
2007-04-18 17:50 ` Nicolas Pitre
2007-04-19 13:16 ` Matthieu Moy
2007-04-19 18:44 ` Petr Baudis
2007-04-20 9:04 ` Matthieu Moy
2007-04-18 20:57 ` Theodore Tso
2007-04-18 20:08 ` Guilhem Bonnefille
2007-04-18 20:19 ` Linus Torvalds
2007-04-18 21:45 ` Daniel Barkalow
2007-04-18 21:21 ` Michael K. Edwards
2007-04-19 8:37 ` Johannes Schindelin
2007-04-19 13:29 ` Matthieu Moy
2007-04-19 9:24 ` Johannes Schindelin
2007-04-19 12:21 ` Alex Riesen
2007-04-19 12:22 ` Christian MICHON
2007-04-19 12:37 ` Johannes Schindelin
2007-04-19 12:54 ` Christian MICHON
2007-04-19 16:43 ` Linus Torvalds
2007-04-19 17:49 ` Marcin Kasperski
2007-04-19 20:57 ` Linus Torvalds
2007-04-23 18:54 ` Carl Worth
2007-04-23 19:52 ` Josef Weidendorfer
2007-04-23 22:12 ` Carl Worth
2007-04-23 22:23 ` Junio C Hamano
2007-04-23 22:58 ` Carl Worth
2007-04-23 23:24 ` Linus Torvalds
2007-04-23 23:55 ` Brian Gernhardt
2007-04-24 1:31 ` Daniel Barkalow
2007-04-24 5:15 ` Junio C Hamano
2007-04-24 14:23 ` J. Bruce Fields
2007-04-24 15:01 ` Linus Torvalds
2007-04-30 4:31 ` J. Bruce Fields
2007-04-25 13:12 ` Making git disappear when talking about my code (was: Re: GIT vs Other: Need argument) Carl Worth
2007-04-25 14:09 ` Carl Worth
2007-04-25 14:55 ` Linus Torvalds
2007-04-25 16:28 ` Carl Worth
2007-04-25 18:07 ` Nicolas Pitre
2007-04-25 19:03 ` Carl Worth
2007-04-25 19:17 ` Making git disappear when talking about my code Junio C Hamano
2007-04-25 19:22 ` Nicolas Pitre
2007-04-25 20:26 ` Carl Worth
2007-04-25 20:23 ` Making git disappear when talking about my code (was: Re: GIT vs Other: Need argument) Nicolas Pitre
2007-04-25 14:51 ` Linus Torvalds
2007-04-25 19:44 ` Daniel Barkalow
2007-04-25 19:56 ` Making git disappear when talking about my code Junio C Hamano
2007-04-25 20:29 ` Linus Torvalds
2007-04-25 20:32 ` Nicolas Pitre
2007-04-25 21:38 ` Daniel Barkalow
2007-04-25 20:29 ` Making git disappear when talking about my code (was: Re: GIT vs Other: Need argument) Carl Worth
2007-04-25 22:39 ` Daniel Barkalow
2007-04-25 20:31 ` Nicolas Pitre
2007-04-23 23:22 ` GIT vs Other: Need argument Junio C Hamano
2007-04-19 20:49 ` Johannes Schindelin
2007-04-20 15:54 ` History cleanup/rewriting script for git Jan Harkes
2007-04-20 18:39 ` Johannes Schindelin
2007-04-20 18:44 ` Petr Baudis
2007-04-20 20:36 ` Jan Harkes
2007-04-19 12:15 ` GIT vs Other: Need argument Marcin Kasperski
2007-04-19 12:33 ` Johannes Schindelin
2007-04-19 12:42 ` Marcin Kasperski
2007-04-19 13:36 ` Johannes Schindelin
2007-04-19 14:27 ` J. Bruce Fields
2007-04-19 12:45 ` Theodore Tso
2007-04-19 12:46 ` [ANNOUNCE] Cogito is for sale Petr Baudis
2007-04-19 13:32 ` Matthieu Moy
2007-04-19 20:23 ` Junio C Hamano
2007-04-19 20:42 ` Johannes Schindelin
[not found] ` <1176984208.30690.18.camel@cauchy.softax.local>
2007-04-19 12:28 ` GIT vs Other: Need argument Johannes Schindelin
2007-04-19 12:37 ` Marcin Kasperski
2007-04-19 13:32 ` Johannes Schindelin
[not found] ` <200704172239.20124.andyparkins@gmail.com>
2007-04-19 11:59 ` Marcin Kasperski
2007-04-19 12:48 ` Alex Riesen
2007-04-19 12:57 ` Andy Parkins
2007-04-20 6:22 ` Shawn O. Pearce
2007-04-20 13:03 ` Eric Blake
2007-04-18 12:40 ` Guilhem Bonnefille
2007-04-18 13:26 ` Andy Parkins
2007-04-18 17:08 ` Steven Grimm
2007-04-19 0:33 ` Jakub Narebski
2007-04-19 1:24 ` Steven Grimm
2007-04-19 2:08 ` Jakub Narebski
2007-04-19 8:48 ` Johannes Schindelin
2007-04-19 8:57 ` Julian Phillips
2007-04-19 19:03 ` Steven Grimm
2007-04-19 21:00 ` Johannes Schindelin
2007-04-19 2:11 ` Junio C Hamano
2007-04-19 6:02 ` Junio C Hamano
2007-04-19 18:18 ` Steven Grimm
2007-04-19 23:30 ` Junio C Hamano
2007-04-20 5:32 ` Shawn O. Pearce
2007-04-20 9:04 ` Jakub Narebski
2007-04-20 10:18 ` Karl Hasselström
2007-04-20 10:39 ` Junio C Hamano
2007-04-20 13:57 ` Petr Baudis
2007-04-20 8:36 ` Junio C Hamano
2007-04-20 16:42 ` Steven Grimm [this message]
2007-04-18 20:54 ` Yann Dirson
2007-04-18 3:09 ` Sam Vilain
2007-04-18 20:49 ` Yann Dirson
2007-04-25 8:55 ` Dana How
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4628ED6E.6060101@midwinter.com \
--to=koreth@midwinter.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).