mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-13 20:53:02 +01:00
Code Activity
git/builtin/merge-index.c

111 lines
2.2 KiB
C
Raw Normal View History

Fix sparse warnings Fix warnings from 'make check'. - These files don't include 'builtin.h' causing sparse to complain that cmd_* isn't declared: builtin/clone.c:364, builtin/fetch-pack.c:797, builtin/fmt-merge-msg.c:34, builtin/hash-object.c:78, builtin/merge-index.c:69, builtin/merge-recursive.c:22 builtin/merge-tree.c:341, builtin/mktag.c:156, builtin/notes.c:426 builtin/notes.c:822, builtin/pack-redundant.c:596, builtin/pack-refs.c:10, builtin/patch-id.c:60, builtin/patch-id.c:149, builtin/remote.c:1512, builtin/remote-ext.c:240, builtin/remote-fd.c:53, builtin/reset.c:236, builtin/send-pack.c:384, builtin/unpack-file.c:25, builtin/var.c:75 - These files have symbols which should be marked static since they're only file scope: submodule.c:12, diff.c:631, replace_object.c:92, submodule.c:13, submodule.c:14, trace.c:78, transport.c:195, transport-helper.c:79, unpack-trees.c:19, url.c:3, url.c:18, url.c:104, url.c:117, url.c:123, url.c:129, url.c:136, thread-utils.c:21, thread-utils.c:48 - These files redeclare symbols to be different types: builtin/index-pack.c:210, parse-options.c:564, parse-options.c:571, usage.c:49, usage.c:58, usage.c:63, usage.c:72 - These files use a literal integer 0 when they really should use a NULL pointer: daemon.c:663, fast-import.c:2942, imap-send.c:1072, notes-merge.c:362 While we're in the area, clean up some unused #includes in builtin files (mostly exec_cmd.h). Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-03-22 08:51:05 +01:00
#include "builtin.h"
Use run_command within merge-index Maybe unnecessary as the merge-index utility may go away in the future, but its currently here, its shorter to use run_command, and probably will help the MinGW port out. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-03-13 00:00:21 +01:00
#include "run-command.h"
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
remove unnecessary initializations [jc: I needed to hand merge the changes to the updated codebase, so the result needs to be checked.] Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-15 19:23:48 +02:00
static const char *pgm;
[PATCH] git-merge-cache -q doesn't complain about failing merge program git-merge-cache reporting failed merge program is undesirable for Cogito, since it emits its own more appropriate error message in that case. However, I want to show other possible git-merge-cache error messages. So -q will just silence this particular error. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-29 14:53:38 +02:00
static int one_shot, quiet;
Make merge-cache not fail immediatelly when the merge program fails, but go on and return error code at the end. It makes sense to try to merge everything, then let the user solve the commits at once.
2005-04-19 04:16:15 +02:00
static int err;
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
static int merge_entry(int pos, const char *path)
{
int found;
Simplify some instances of run_command() by using run_command_v_opt(). Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-06-08 22:34:29 +02:00
const char *arguments[] = { pgm, "", "", "", path, "", "", "", NULL };
char hexbuf[4][60];
char ownbuf[4][60];
War on whitespace This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-06-07 09:04:01 +02:00
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
if (pos >= active_nr)
'git foo' program identifies itself without dash in die() messages This is a mechanical conversion of all '*.c' files with: s/((?:die|error|warning)\("git)-(\S+:)/$1 $2/; The result was manually inspected and no false positive was found. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-31 18:39:19 +02:00
die("git merge-index: %s not in the cache", path);
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
found = 0;
do {
Convert "struct cache_entry *" to "const ..." wherever possible I attempted to make index_state->cache[] a "const struct cache_entry **" to find out how existing entries in index are modified and where. The question I have is what do we do if we really need to keep track of on-disk changes in the index. The result is - diff-lib.c: setting CE_UPTODATE - name-hash.c: setting CE_HASHED - preload-index.c, read-cache.c, unpack-trees.c and builtin/update-index: obvious - entry.c: write_entry() may refresh the checked out entry via fill_stat_cache_info(). This causes "non-const struct cache_entry *" in builtin/apply.c, builtin/checkout-index.c and builtin/checkout.c - builtin/ls-files.c: --with-tree changes stagemask and may set CE_UPDATE Of these, write_entry() and its call sites are probably most interesting because it modifies on-disk info. But this is stat info and can be retrieved via refresh, at least for porcelain commands. Other just uses ce_flags for local purposes. So, keeping track of "dirty" entries is just a matter of setting a flag in index modification functions exposed by read-cache.c. Except unpack-trees, the rest of the code base does not do anything funny behind read-cache's back. The actual patch is less valueable than the summary above. But if anyone wants to re-identify the above sites. Applying this patch, then this: diff --git a/cache.h b/cache.h index 430d021..1692891 100644 --- a/cache.h +++ b/cache.h @@ -267,7 +267,7 @@ static inline unsigned int canon_mode(unsigned int mode) #define cache_entry_size(len) (offsetof(struct cache_entry,name) + (len) + 1) struct index_state { - struct cache_entry **cache; + const struct cache_entry **cache; unsigned int version; unsigned int cache_nr, cache_alloc, cache_changed; struct string_list *resolve_undo; will help quickly identify them without bogus warnings. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-09 17:29:00 +02:00
const struct cache_entry *ce = active_cache[pos];
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
int stage = ce_stage(ce);
if (strcmp(ce->name, path))
break;
found++;
Change merge-cache and git-merge-one-file to use the SHA1 of the file instead of a checked-out temporary copy. If merging requires a checked-out-copy, we now do so with "unpack-file".
2005-04-18 23:17:58 +02:00
strcpy(hexbuf[stage], sha1_to_hex(ce->sha1));
Make on-disk index representation separate from in-core one This converts the index explicitly on read and write to its on-disk format, allowing the in-core format to contain more flags, and be simpler. In particular, the in-core format is now host-endian (as opposed to the on-disk one that is network endian in order to be able to be shared across machines) and as a result we can dispense with all the htonl/ntohl on accesses to the cache_entry fields. This will make it easier to make use of various temporary flags that do not exist in the on-disk format. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-01-15 01:03:17 +01:00
sprintf(ownbuf[stage], "%o", ce->ce_mode);
Change merge-cache and git-merge-one-file to use the SHA1 of the file instead of a checked-out temporary copy. If merging requires a checked-out-copy, we now do so with "unpack-file".
2005-04-18 23:17:58 +02:00
arguments[stage] = hexbuf[stage];
[PATCH] make file merging respect permissions 1) permissions aren't respected in the merge script (primarily because they're never passed in to it in the first place). Fix that and also check for permission conflicts in the merge 2) the delete of a file in both branches may indeed be just that, but it could also be the indicator of a rename conflict (file moved to different locations in both branches), so error out and ask the committer for guidance. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-24 05:50:10 +02:00
arguments[stage + 4] = ownbuf[stage];
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
} while (++pos < active_nr);
if (!found)
'git foo' program identifies itself without dash in die() messages This is a mechanical conversion of all '*.c' files with: s/((?:die|error|warning)\("git)-(\S+:)/$1 $2/; The result was manually inspected and no false positive was found. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-31 18:39:19 +02:00
die("git merge-index: %s not in the cache", path);
Simplify some instances of run_command() by using run_command_v_opt(). Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-06-08 22:34:29 +02:00
if (run_command_v_opt(arguments, 0)) {
if (one_shot)
err++;
else {
if (!quiet)
die("merge program failed");
exit(1);
}
}
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
return found;
}
Which merge_file() function do you mean? There are two different static functions and one global function, all of them called "merge_file()", with different signatures and purposes. Rename them all to reduce confusion in "git grep" output: * Rename the static one in merge-index to "merge_one_path(const char *path)" as that function is about asking an external command to resolve conflicts in one path. * Rename the global one in merge-file.c that is only used by merge-tree to "merge_blobs()", as the function takes three blobs and returns the merged result only in-core, without doing anything to the filesystem. * Rename the one in merge-recursive to "merge_one_file()", just to be fair. Also rename merge-file.[ch] to merge-blobs.[ch]. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-07 00:08:01 +01:00
static void merge_one_path(const char *path)
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
{
int pos = cache_name_pos(path, strlen(path));
/*
* If it already exists in the cache as stage0, it's
* already merged and there is nothing to do.
*/
if (pos < 0)
merge_entry(-pos-1, path);
}
static void merge_all(void)
{
int i;
for (i = 0; i < active_nr; i++) {
Convert "struct cache_entry *" to "const ..." wherever possible I attempted to make index_state->cache[] a "const struct cache_entry **" to find out how existing entries in index are modified and where. The question I have is what do we do if we really need to keep track of on-disk changes in the index. The result is - diff-lib.c: setting CE_UPTODATE - name-hash.c: setting CE_HASHED - preload-index.c, read-cache.c, unpack-trees.c and builtin/update-index: obvious - entry.c: write_entry() may refresh the checked out entry via fill_stat_cache_info(). This causes "non-const struct cache_entry *" in builtin/apply.c, builtin/checkout-index.c and builtin/checkout.c - builtin/ls-files.c: --with-tree changes stagemask and may set CE_UPDATE Of these, write_entry() and its call sites are probably most interesting because it modifies on-disk info. But this is stat info and can be retrieved via refresh, at least for porcelain commands. Other just uses ce_flags for local purposes. So, keeping track of "dirty" entries is just a matter of setting a flag in index modification functions exposed by read-cache.c. Except unpack-trees, the rest of the code base does not do anything funny behind read-cache's back. The actual patch is less valueable than the summary above. But if anyone wants to re-identify the above sites. Applying this patch, then this: diff --git a/cache.h b/cache.h index 430d021..1692891 100644 --- a/cache.h +++ b/cache.h @@ -267,7 +267,7 @@ static inline unsigned int canon_mode(unsigned int mode) #define cache_entry_size(len) (offsetof(struct cache_entry,name) + (len) + 1) struct index_state { - struct cache_entry **cache; + const struct cache_entry **cache; unsigned int version; unsigned int cache_nr, cache_alloc, cache_changed; struct string_list *resolve_undo; will help quickly identify them without bogus warnings. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-09 17:29:00 +02:00
const struct cache_entry *ce = active_cache[i];
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
if (!ce_stage(ce))
continue;
i += merge_entry(i, ce->name)-1;
}
}
make "merge-index" a built-in Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-22 16:29:21 +01:00
int cmd_merge_index(int argc, const char **argv, const char *prefix)
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
{
int i, force_file = 0;
Restore SIGCHLD to SIG_DFL where we care about waitpid(). It was reported that under one implementation of socks client "git clone" fails with "error: waitpid failed (No child processes)", because "git" is spawned after setting SIGCHLD to SIG_IGN. Arguably it may be a broken setting, but we should protect ourselves so that we can get reliable results from waitpid() for the children we care about. This patch resets SIGCHLD to SIG_DFL in three places: - connect.c::git_connect() - initiators of git native protocol transfer are covered with this. - daemon.c::main() - obviously. - merge-index.c::main() - obviously. There are other programs that do fork() but do not waitpid(): http-push, imap-send. upload-pack does not either, but in the case of that program, each of the forked halves runs exec() another program, so this change would not have much effect there. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-20 03:25:21 +02:00
/* Without this we cannot rely on waitpid() to tell
* what happened to our children.
*/
signal(SIGCHLD, SIG_DFL);
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
if (argc < 3)
Replace deprecated dashed git commands in usage Signed-off-by: Alexander Potashev <aspotashev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-04 19:39:27 +01:00
usage("git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
read_cache();
git-merge-cache -o does all the automerges in a single shot When you pass git-merge-cache the -o option, it tries to do all the automatic merges and possibly return error if any of them failed, instead of the default behaviour of failing immediately after the first failed automatic merge. Ported from the Cogito branch - Cogito needs this behaviour.
2005-05-11 04:44:59 +02:00
i = 1;
[PATCH] git-merge-cache -q doesn't complain about failing merge program git-merge-cache reporting failed merge program is undesirable for Cogito, since it emits its own more appropriate error message in that case. However, I want to show other possible git-merge-cache error messages. So -q will just silence this particular error. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-29 14:53:38 +02:00
if (!strcmp(argv[i], "-o")) {
git-merge-cache -o does all the automerges in a single shot When you pass git-merge-cache the -o option, it tries to do all the automatic merges and possibly return error if any of them failed, instead of the default behaviour of failing immediately after the first failed automatic merge. Ported from the Cogito branch - Cogito needs this behaviour.
2005-05-11 04:44:59 +02:00
one_shot = 1;
i++;
}
[PATCH] git-merge-cache -q doesn't complain about failing merge program git-merge-cache reporting failed merge program is undesirable for Cogito, since it emits its own more appropriate error message in that case. However, I want to show other possible git-merge-cache error messages. So -q will just silence this particular error. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-29 14:53:38 +02:00
if (!strcmp(argv[i], "-q")) {
quiet = 1;
i++;
}
git-merge-cache -o does all the automerges in a single shot When you pass git-merge-cache the -o option, it tries to do all the automatic merges and possibly return error if any of them failed, instead of the default behaviour of failing immediately after the first failed automatic merge. Ported from the Cogito branch - Cogito needs this behaviour.
2005-05-11 04:44:59 +02:00
pgm = argv[i++];
for (; i < argc; i++) {
make "merge-index" a built-in Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-22 16:29:21 +01:00
const char *arg = argv[i];
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
if (!force_file && *arg == '-') {
if (!strcmp(arg, "--")) {
force_file = 1;
continue;
}
if (!strcmp(arg, "-a")) {
merge_all();
continue;
}
'git foo' program identifies itself without dash in die() messages This is a mechanical conversion of all '*.c' files with: s/((?:die|error|warning)\("git)-(\S+:)/$1 $2/; The result was manually inspected and no false positive was found. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-31 18:39:19 +02:00
die("git merge-index: unknown option %s", arg);
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
}
Which merge_file() function do you mean? There are two different static functions and one global function, all of them called "merge_file()", with different signatures and purposes. Rename them all to reduce confusion in "git grep" output: * Rename the static one in merge-index to "merge_one_path(const char *path)" as that function is about asking an external command to resolve conflicts in one path. * Rename the global one in merge-file.c that is only used by merge-tree to "merge_blobs()", as the function takes three blobs and returns the merged result only in-core, without doing anything to the filesystem. * Rename the one in merge-recursive to "merge_one_file()", just to be fair. Also rename merge-file.[ch] to merge-blobs.[ch]. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-07 00:08:01 +01:00
merge_one_path(arg);
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
}
[PATCH] Fix git-merge-cache -q I'm totally stupid and got it backwards, sorry about that. git-merge-cache -q would mean it's noisy and quiet without any parameters. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-05 00:31:12 +02:00
if (err && !quiet)
Make merge-cache not fail immediatelly when the merge program fails, but go on and return error code at the end. It makes sense to try to merge everything, then let the user solve the commits at once.
2005-04-19 04:16:15 +02:00
die("merge program failed");
[PATCH] git-merge-cache -q doesn't complain about failing merge program git-merge-cache reporting failed merge program is undesirable for Cogito, since it emits its own more appropriate error message in that case. However, I want to show other possible git-merge-cache error messages. So -q will just silence this particular error. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-29 14:53:38 +02:00
return err;
Ass a "merge-cache" helper program to execute a merge on any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.
2005-04-18 04:52:54 +02:00
}
Copy permalink