Re: [patch] possible memory leak in diff.c::diff_free_filepair()

2005-08-21 Thread Yasushi SHOJI
At Mon, 15 Aug 2005 21:32:12 -0700, Junio C Hamano wrote: Yasushi SHOJI [EMAIL PROTECTED] writes: parepare_temp_file() and diff_populate_filespec() has a lot in similarity. so it'd be nice to refactor some. and re-introduce diff_free_filespec_data() and call right after prep_temp_blob()

cg-update question.

2005-08-21 Thread Johnny Stenback
Hi all, I hope it's ok to ask cogito questions on this list... I just realized that if I've got an uncommitted local change in a tree and I update my tree with cg-update to merge in changes from a different tree... cg-update will pull the changes and do the merge. So that's all cool, but as

[ANNOUNCE] Stacked GIT 0.6

2005-08-21 Thread Catalin Marinas
Stacked GIT 0.6 release is available from http://www.procode.org/stgit/ StGIT is a Python application providing similar functionality to Quilt (i.e. pushing/popping patches to/from a stack) on top of GIT. These operations are performed using GIT commands and the patches are stored as GIT commit

[ANNOUNCE] qgit-0.93

2005-08-21 Thread Marco Costalba
Hi all, On SF there is an update of qgit, a git GUI viewer (and lately also committer and patch exchanger ;-) ) http://prdownloads.sourceforge.net/qgit/qgit-0.93.tar.bz2?download This time I have added the interfaces to import and export patches by git-format-patch-script and

[PATCH] sha1_name: do not accept .git/refs/snap/.

2005-08-21 Thread Junio C Hamano
I think Linus did a cut paste from an early JIT code while developing the current extended SHA1 notation, and left it there as a courtesy, but the directory does not deserve to be treated any more specially than, say, .git/refs/bisect. If the subdirectories under .git/refs proliferate, we may

[PATCH] Add a new extended SHA1 syntax name:num

2005-08-21 Thread Junio C Hamano
The new notation is a short-hand for name followed by num caret ('^') characters. E.g. master:4 is the fourth generation ancestor of the current master branch head, following the first parents; same as master but a bit more readable. This will be used in the updated git show-branch command.

[PATCH] Add 'git show-branch'.

2005-08-21 Thread Junio C Hamano
The 'git show-branches' command turns out to be reasonably useful, but painfully slow. So rewrite it in C, using ideas from merge-base while enhancing it a bit more. - Unlike show-branches, it can take --heads (show me all my heads), --tags (show me all my tags), or --all (both). - It can

git reset and newly created files.

2005-08-21 Thread Junio C Hamano
When you made a mistake and committed a set of incomplete changes, the git reset command comes handy. ... Edit, compile, and test. $ git commit -s -m 'The perfect change.' ... Test again, OOPS it fails --- it was not perfect. $ git reset HEAD^ foo: needs update bar: needs

Re: [PATCH] Add a new extended SHA1 syntax name:num

2005-08-21 Thread Junio C Hamano
Johannes Schindelin [EMAIL PROTECTED] writes: This might confuse some people with the src:dest notation of the renaming fetch... True. How about using a tilde '~'? - To unsubscribe from this list: send the line unsubscribe git in the body of a message to [EMAIL PROTECTED] More majordomo

1dfcfbce2d643b7c7b56dc828f36ced9de2bf9f2

2005-08-21 Thread Junio C Hamano
A couple of people noticed that the latest commit in the master branch seems, eh, odd. It was not a screw-up of any of the git tools, just me screwing up in an early morning/late night editing session when checking things in. $ git whatchanged -p --max-count=1 that commit shows the true

Re: git reset and newly created files.

2005-08-21 Thread Sam Ravnborg
So you would naturally be tempted to do this: ... Re-edit, compile, and test. This time it is perfect. $ git commit -a -C ORIG_HEAD Well, not really. You can lose any file newly created in ORIG_HEAD this way. Instead, you need to do this: ... Re-edit, compile, and

Re: Make git-ls-files work in subdirectories

2005-08-21 Thread Chris Wedgwood
On Sun, Aug 21, 2005 at 12:55:33PM -0700, Linus Torvalds wrote: - } else if (!strcmp(arg, -t)) { + continue; + } + if (!strcmp(arg, -t)) { tag_cached = H ; tag_unmerged = M ;

Re: [ANNOUNCE] (H)gct 0.2

2005-08-21 Thread Mark Williamson
Any chance a link to the (h)gct homepage could be added to the git homepage under porcelain? Cheers, Mark On Sunday 21 August 2005 15:58, Fredrik Kuivinen wrote: Version 0.2 of (H)gct, a GUI enabled commit tool, has been released and can be downloaded from

Re: Make git-ls-files work in subdirectories

2005-08-21 Thread YOSHIFUJI Hideaki / 吉藤英明
In article [EMAIL PROTECTED] (at Sun, 21 Aug 2005 16:17:52 -0700 (PDT)), Linus Torvalds [EMAIL PROTECTED] says: getopt() is too limited, and getopt_long() is very glibc-specific and thus inherently evil. And the complexity of doing autoconf or similar is worse than just doing it by hand.