cache.c: cache ls_cache output properly

[ps-cgit] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 8e76977cf42d737cc8500395262a1e4ff94d27e7..8a720801004cca005287c2f9457340da8703ef81 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -16,6 +16,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p
 {
        struct argv_array argv = ARGV_ARRAY_INIT;
        const char **nargv;
+       char *user_home, *xdg_home;
        int result;
        argv_array_push(&argv, "snapshot");
        argv_array_push(&argv, format);
@@ -38,7 +39,15 @@ static int write_archive_type(const char *format, const char *hex, const char *p
        /* argv_array guarantees a trailing NULL entry. */
        memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
 
+       user_home = getenv("HOME");
+       xdg_home = getenv("XDG_CONFIG_HOME");
+       unsetenv("HOME");
+       unsetenv("XDG_CONFIG_HOME");
        result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0);
+       if (user_home)
+               setenv("HOME", user_home, 1);
+       if (xdg_home)
+               setenv("XDG_CONFIG_HOME", xdg_home, 1);
        argv_array_clear(&argv);
        free(nargv);
        return result;
@@ -140,8 +149,8 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
  * repo_basename(), we strip the basename and any following '-' and '_'
  * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once
  * more. If this still isn't a valid commit object name, we check if pre-
- * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives
- * us something valid.
+ * pending a 'v' or a 'V' to the remaining snapshot name ("0.7.2" ->
+ * "v0.7.2") gives us something valid.
  */
 static const char *get_ref_from_filename(const char *url, const char *filename,
                                         const struct cgit_snapshot_format *format)
@@ -173,6 +182,10 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
        if (get_sha1(snapshot.buf, sha1) == 0)
                goto out;
 
+       strbuf_splice(&snapshot, 0, 1, "V", 1);
+       if (get_sha1(snapshot.buf, sha1) == 0)
+               goto out;
+
        result = 0;
        strbuf_release(&snapshot);